attr: "binary" attribute should choose built-in "binary" merge driver
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 <gitster@pobox.com>
Junio C Hamano committed
Sep 8, 2012 at 21:28 UTC
155a4b712efd3d917c228d155ec57ec2c09d7ac0
3 files changed
+3
-3
Documentation/gitattributes.txt
+1
-1
@@ -904,7 +904,7 @@ file at the toplevel (i.e. not in any subdirectory). The built-in
904
macro attribute "binary" is equivalent to:
905
906
------------
907
-[attr]binary -diff -text
907
+[attr]binary -diff -merge -text
908
------------
909
910
attr.c
+1
-1
@@ -306,7 +306,7 @@ static void free_attr_elem(struct attr_stack *e)
306
}
307
308
static const char *builtin_attr[] = {
309
- "[attr]binary -diff -text",
309
+ "[attr]binary -diff -merge -text",
310
NULL,
311
};
312
t/t6037-merge-ours-theirs.sh
+1
-1
@@ -54,7 +54,7 @@ test_expect_success 'recursive favouring ours' '
54
'
55
56
test_expect_success 'binary file with -Xours/-Xtheirs' '
57
- echo "file -merge" >.gitattributes &&
57
+ echo file binary >.gitattributes &&
58
59
git reset --hard master &&
60
git merge -s recursive -X theirs side &&