Skip to contentSkip to conversation

GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts

PATCH Bruno Haible 2 participants 3 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

Hi,

"git diff --uncached" invokes the GIT_EXTERNAL_DIFF variable with just one argument (instead of 7 arguments, as documented) 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 --cached | cat
yields:
my-diff-for-git ChangeLog

ChangeLog +0 -0
diff --cc ChangeLog
index 443ad76,991c26b..0000000
@@@ -1,7 -1,6 +1,11 @@@
  2007-09-30  Bruno Haible  <[email protected]>
  
++<<<<<<< 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  <[email protected]>
  

As you can see from the output of the script's line 2, it was called with just one argument. This is not enough information for producing output in a different way than the built-in way - defeating the purpose of GIT_EXTERNAL_DIFF.

Can the GIT_EXTERNAL_DIFF invocation be done with 7 or more arguments? It'd be OK to extend the calling convention.

Bruno

#1 lore raw
Quoted 2 lines

"git diff --uncached" invokes the GIT_EXTERNAL_DIFF variable with just one argument (instead of 7 arguments, as documented) in a particular situation:

You are looking at an unmerged path.

'GIT_EXTERNAL_DIFF'::
When the environment variable 'GIT_EXTERNAL_DIFF' is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, 'GIT_EXTERNAL_DIFF' is called with 7 parameters:

...
+
For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, <path>.

The script needs to decide how it wants to present an unmerged path; the information on each unmerged stages can be read from the output of "ls-files -u $thatpath".

#2 lore raw
Quoted 3 lines · Junio C Hamano

The script needs to decide how it wants to present an unmerged path; the information on each unmerged stages can be read from the output of "ls-files -u $thatpath".

Thanks for this info. This, and "git cat-file", did the trick.

Bruno