GNU bug report logs - #35420
Support git in ediff-patch-file

Previous Next

Full log

Message #11 received at 35420 <at> debbugs.gnu.org (full text, mbox):

From: Robert Pluim <rpluim <at> gmail.com>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 35420 <at> debbugs.gnu.org, Juri Linkov <juri <at> linkov.net>
Subject: Re: bug#35420: Support git in ediff-patch-file
Date: Thu, 25 Apr 2019 09:53:16 +0200

>>>>> On Thu, 25 Apr 2019 09:14:21 +0300, Eli Zaretskii <eliz <at> gnu.org> said:

    >> From: Juri Linkov <juri <at> linkov.net> Date: Thu, 25 Apr 2019
    >> 00:38:43 +0300
    >> 
    >> + (when (and (string-match-p "^a/" base-dir1) + (string-match-p
    >> "^b/" base-dir2)) + (setq base-dir1 "a/" + base-dir2 "b/")))))

    Eli> I think I saw the file names begin with i/ and w/ instead of
    Eli> a/ and b/.  Not sure when/why this happens.

You get i/, w/ and/or c/ when you run 'git diff' inside your working
tree, depending on whether the changed file is in the 'i'ndex,
'w'orking tree, or 'c'ache (also known as the staging area). Things
like 'git format-patch' and 'git show' use a/ and b/ by default.

And of course, since this is git, you can tell it to use other
prefixes using '--src-prefix' and '--dst-prefix'.

Robert

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.