From: Jakub Narebski <jnareb@gmail.com>
To: Dun Peal <dunpealer@gmail.com>
Cc: Git ML <git@vger.kernel.org>
Subject: Re: Correctly detecting modified paths in merge commits?
Date: Thu, 16 Dec 2010 10:33:38 -0800 (PST) [thread overview]
Message-ID: <m37hgdm84r.fsf@localhost.localdomain> (raw)
In-Reply-To: <AANLkTimsHZ543B7XWS6taa0w2Vc4huznx3UMs4Ejg3af@mail.gmail.com>
Dun Peal <dunpealer@gmail.com> writes:
> We wrote a post-receive hook that alerts users (via email) when
> specific paths are modified by their peers. The implementation is
> pretty simple: whenever a new commit is made, we ask git for the full
> list of files modified by that commit:
>
> git diff --name-only <COMMIT HASH>^!
>
> This works well for regular commits, but breaks for merge commits.
Note that <commit>^! is *range* specifier, and 'git diff' really takes
two *endpoints*.
>From git-diff(1) manpage.
For a more complete list of ways to spell <commit>, see "SPECIFYING
REVISIONS" section in gitrevisions(1). However, "diff" is about
comparing two _endpoints_, not ranges, and the range notations
("<commit>..<commit>" and "<commit>...<commit>") do not mean a
range as defined in the "SPECIFYING RANGES" section in gitrevisions(1).
<commit>^1 means include given commit but exclude all of its parents
(see gitrevisions(7)).
For a merge commit r1^! means r1 ^p1 ^p2 (where p1 and p2 are parents
of r1), which for git-diff probably means "git diff p1 r1".
> For example, suppose we have the following basic merge scenario:
>
> B
> / \
> A D
> \ /
> C
>
> Root A was branched to B and C, then merged into commit D.
>
> Problem is, the diff for D^! will include all the changes introduced by C.
See above.
Try
$ git diff-tree --name-only -c <COMMIT HADH>
instead. '-c' is to show merge commit as combined diff (noting changes
different from both parents). I'm not sure if this is what you want.
There is alwats '--cc' or '-m' instead of '-c'.
--
Jakub Narebski
Poland
ShadeHawk on #git
prev parent reply other threads:[~2010-12-16 18:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-16 16:54 Correctly detecting modified paths in merge commits? Dun Peal
2010-12-16 18:33 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m37hgdm84r.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=dunpealer@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).