From: "Shawn O. Pearce" <spearce@spearce.org>
To: git@vger.kernel.org
Subject: git log --numstat disagrees with git apply --numstat
Date: Thu, 11 Dec 2008 15:53:37 -0800 [thread overview]
Message-ID: <20081211235337.GK32487@spearce.org> (raw)
I've found a case where git apply --numstat and git log --numstat
produce different results for the same commit.
In egit (git://repo.or.cz/egit.git/):
$ git log --numstat -1 --pretty=o 9bda5ece6806cd797416eaa47c
9bda5ece6806cd797416eaa47c7b927cc6e9c3b2 Teach RevWalk about ...
8 0 org.spearce.jgit/src/org/spearce/jgit/revwalk/DateRevQueue.java
69 13 org.spearce.jgit/src/org/spearce/jgit/revwalk/RevWalk.java
$ git log -p -1 --pretty=o 9bda5ece6806cd797416eaa47c | git apply --numstat
8 0 org.spearce.jgit/src/org/spearce/jgit/revwalk/DateRevQueue.java
68 12 org.spearce.jgit/src/org/spearce/jgit/revwalk/RevWalk.java
I found this because I was writing a unit test for JGit that ran
through the JGit project history and compared the output of git
log --numstat against the output of JGit's "git apply --numstat"
implementation, after scraping the "git log -p" output.
I can't quite figure out why log --numstat is coming up with a +1
difference here for both added and removed, but it is. I haven't
dug into the Git code yet to figure out why. FWIW, JGit produces
the same result as "git apply --numstat" (the 68/12).
At this point JGit was able to successfully read and match 715 of
1211 commits before it found this difference, so its also somewhat
rare to occur I think...
--
Shawn.
next reply other threads:[~2008-12-11 23:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-11 23:53 Shawn O. Pearce [this message]
2008-12-12 1:52 ` git log --numstat disagrees with git apply --numstat Jeff King
2008-12-12 2:08 ` Jeff King
2008-12-12 2:21 ` Jeff King
2008-12-15 9:57 ` Junio C Hamano
2008-12-15 20:32 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081211235337.GK32487@spearce.org \
--to=spearce@spearce.org \
--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.
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 NNTP newsgroup(s).