undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2012-09-08 21:28:55 -07:00
parent a944af1d86
commit 155a4b712e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/gitattributes.txt
View File

@ -904,7 +904,7 @@ file at the toplevel (i.e. not in any subdirectory). The built-in
macro attribute "binary" is equivalent to: macro attribute "binary" is equivalent to:
------------ ------------
[attr]binary -diff -text [attr]binary -diff -merge -text
------------ ------------

2
attr.c
View File

@ -306,7 +306,7 @@ static void free_attr_elem(struct attr_stack *e)
} }
static const char *builtin_attr[] = { static const char *builtin_attr[] = {
"[attr]binary -diff -text", "[attr]binary -diff -merge -text",
NULL, NULL,
}; };

2
t/t6037-merge-ours-theirs.sh
View File

@ -54,7 +54,7 @@ test_expect_success 'recursive favouring ours' '
' '
test_expect_success 'binary file with -Xours/-Xtheirs' ' test_expect_success 'binary file with -Xours/-Xtheirs' '
echo "file -merge" >.gitattributes && echo file binary >.gitattributes &&
git reset --hard master && git reset --hard master &&
git merge -s recursive -X theirs side && git merge -s recursive -X theirs side &&