Antoine Pelisse apeli...@gmail.com writes:
Indeed stat seems to be broken on master by commit 74faaa16 from Linus
Torvalds
There are three separated issues here:
- unmerged files are marked as interesting in stat and probably
shouldn't, with some patch like this:
]-is_interesting
(added + deleted == 0)) {
continue;
}
Cheers,
Antoine Pelisse
-- Forwarded message --
From: Junio C Hamano gits...@pobox.com
Date: Mon, Nov 26, 2012 at 4:28 AM
Subject: Re: [PATCH] diff: Fixes shortstat number of files
To: Antoine
There is a discrepancy between the last line of `git diff --stat`
and `git diff --shortstat` in case of a merge.
The unmerged files are actually counted twice, thus doubling the
value of file changed.
In fact, while stat decrements number of files when seeing an unmerged
file, shortstat doesn't.
There is a discrepancy between the last line of `git diff --stat`
and `git diff --shortstat` in case of a merge.
The unmerged files are actually counted twice, thus doubling the
value of file changed.
In fact, while stat decrements number of files when seeing an unmerged
file, shortstat doesn't.
There is a discrepancy between the last line of `git diff --stat`
and `git diff --shortstat` in case of a merge.
The unmerged files are actually counted twice, thus doubling the
value of file changed.
In fact, while stat decrements number of files when seeing an unmerged
file, shortstat doesn't.
5 matches
Mail list logo