Permalink
Browse files

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>
  • Loading branch information...
1 parent a944af1 commit 155a4b712efd3d917c228d155ec57ec2c09d7ac0 @gitster gitster committed Sep 9, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 Documentation/gitattributes.txt
  2. +1 −1 attr.c
  3. +1 −1 t/t6037-merge-ours-theirs.sh
@@ -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
------------
View
2 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,
};
@@ -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 &&

0 comments on commit 155a4b7

Please sign in to comment.