From: Jeff King <peff@peff.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Graham Perks <gperks@ausperks.net>,
Git List <git@vger.kernel.org>
Subject: Re: Am able to delete a file with no trace in the log
Date: Wed, 3 Jun 2009 19:06:06 -0400 [thread overview]
Message-ID: <20090603230606.GA5462@coredump.intra.peff.net> (raw)
In-Reply-To: <alpine.LFD.2.01.0906031547480.4880@localhost.localdomain>
On Wed, Jun 03, 2009 at 03:56:01PM -0700, Linus Torvalds wrote:
> > Is there a way to say "show me everything that touched x, _including_
> > merges"?
>
> Well, that's the "--simplify-merges" part.
>
> It's just that our diff generation isn't very smart. We do show the
> commit, we just don't show a meaningful diff in that case.
No, --simplify-merges doesn't show the merge, unless I am doing
something very wrong. Try (and this is a simplified version of the
original example):
mkdir repo && cd repo && git init &&
echo content >base && git add base && git commit -m base &&
echo context >a.txt && git add a.txt && git commit -m 'master 1' &&
git checkout -b other HEAD^ &&
echo content >b.txt && git add b.txt && git commit -m 'other 1' &&
echo conflict >a.txt && git add a.txt && git commit -m 'other 2' &&
git checkout master &&
git merge other ;# conflicts
rm b.txt && git add b.txt &&
echo resolve >a.txt && git add a.txt &&
git commit -m merged
Now try running git log on that. I can see the merge diff if I use "-m",
which is obviously too verbose, but at least works. But if I give
"b.txt" as a path limiter, I can't get the merge commit to display at
all. Doing "git log -m --simplify-merges --stat -- b.txt" yields only
the commit "other 1" in which b.txt was added.
-Peff
next prev parent reply other threads:[~2009-06-03 23:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-02 19:33 Am able to delete a file with no trace in the log Graham Perks
2009-06-02 20:29 ` Tony Finch
2009-06-02 21:34 ` Jeff King
2009-06-02 21:55 ` Linus Torvalds
2009-06-03 0:47 ` Sitaram Chamarty
2009-06-03 1:20 ` Linus Torvalds
2009-06-03 1:34 ` Clean up and simplify rev_compare_tree() Linus Torvalds
2009-06-03 1:57 ` Am able to delete a file with no trace in the log Junio C Hamano
2009-06-03 3:03 ` Linus Torvalds
2009-06-03 21:18 ` Junio C Hamano
2009-06-03 21:26 ` Linus Torvalds
2009-06-03 21:33 ` Linus Torvalds
2009-06-03 21:59 ` Avery Pennarun
2009-06-03 22:02 ` Junio C Hamano
2009-06-03 22:17 ` Linus Torvalds
2009-06-03 22:38 ` Junio C Hamano
2009-06-03 22:44 ` Jeff King
2009-06-03 22:56 ` Linus Torvalds
2009-06-03 23:06 ` Jeff King [this message]
2009-06-03 23:27 ` Linus Torvalds
2009-06-03 23:37 ` Jeff King
2009-06-04 1:58 ` Linus Torvalds
2009-06-04 6:57 ` Junio C Hamano
2009-06-03 22:47 ` Linus Torvalds
2009-06-03 22:56 ` Junio C Hamano
2009-06-03 21:55 ` Junio C Hamano
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=20090603230606.GA5462@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gperks@ausperks.net \
--cc=torvalds@linux-foundation.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).