attr: "binary" attribute should choose built-in "binary" merge driver

gitster · gitster · commit 155a4b712efd · 2012-09-08T21:28:55.000-07:00
The built-in "binary" attribute macro expands to "-diff -text", so
that textual diff is not produced, and the contents will not go
through any CR/LF conversion ever.  During a merge, it should also
choose the "binary" low-level merge driver, but it didn't.

Make it expand to "-diff -merge -text".

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
@@ -904,7 +904,7 @@ file at the toplevel (i.e. not in any subdirectory).  The built-in
 macro attribute "binary" is equivalent to:
 
 ------------
-[attr]binary -diff -text
+[attr]binary -diff -merge -text
 ------------
 
 
diff --git a/attr.c b/attr.c
@@ -306,7 +306,7 @@ static void free_attr_elem(struct attr_stack *e)
 }
 
 static const char *builtin_attr[] = {
-	"[attr]binary -diff -text",
+	"[attr]binary -diff -merge -text",
 	NULL,
 };
 
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
@@ -54,7 +54,7 @@ test_expect_success 'recursive favouring ours' '
 '
 
 test_expect_success 'binary file with -Xours/-Xtheirs' '
-	echo "file -merge" >.gitattributes &&
+	echo file binary >.gitattributes &&
 
 	git reset --hard master &&
 	git merge -s recursive -X theirs side &&

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ static void free_attr_elem(struct attr_stack *e)`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`static const char *builtin_attr[] = {`
`309`		`- "[attr]binary -diff -text",`
	`309`	`+ "[attr]binary -diff -merge -text",`
`310`	`310`	`NULL,`
`311`	`311`	`};`
`312`	`312`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ test_expect_success 'recursive favouring ours' '`
`54`	`54`	`'`
`55`	`55`
`56`	`56`	`test_expect_success 'binary file with -Xours/-Xtheirs' '`
`57`		`- echo "file -merge" >.gitattributes &&`
	`57`	`+ echo file binary >.gitattributes &&`
`58`	`58`
`59`	`59`	`git reset --hard master &&`
`60`	`60`	`git merge -s recursive -X theirs side &&`