Hi,
"git diff" ignores the GIT_EXTERNAL_DIFF variable in a particular situation: when there are conflicts after "git stash apply".
To reproduce:
- Set environment variable GIT_EXTERNAL_DIFF to point to the attached
script.
- Make a clean gnulib checkout, 1 day old.
- Add a entry to the top of the ChangeLog.
- $ git pull
fails due a conflict.
- $ git stash
- $ git pull
- $ git stash apply
- $ git-diff | cat
yields:
diff --cc ChangeLog
index 443ad76,991c26b..0000000--- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,6 +1,11 @@@ 2007-09-30 Bruno Haible <bruno@clisp.org> ++<<<<<<< Updated upstream:ChangeLog + * tests/test-getaddrinfo.c (AF_UNSPEC): Provide a fallback definition. + Needed on BeOS. ++======= + * Some other changes. ++>>>>>>> Stashed changes:ChangeLog 2007-09-30 Bruno Haible <bruno@clisp.org> The script has not been called (witness: the echo command at its line 2). Can it be called, like in the case of "git-diff --cached"? Bruno