git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [Possible bug] diff-tree --stat info does not count copies

From
Junio C Hamano <junkio@cox.net>
Date
Aug 17, 2006, 09:40 UTC
Message-ID
<7vveorsnt3.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<e5bfff550608170219q12fcb34ewf93a195eabe0b94a@mail.gmail.com>
"Marco Costalba" <mcostalba@gmail.com> writes:
Show 35 quoted lines
> While testing qgit with the new rename/copy support  I found this
> (possible) bug playing on git tree.
>
> $ git-diff-tree -r --stat 6973dca
> 6973dcaee76ef7b7bfcabd2f26e76205aae07858
>  Makefile                      |    2
> diff-files.c                  |  212 +----
> diff-lib.c                    | 1862 ++---------------------------------------
> diff.c                        | 1795 ++++++++++++++++++++++++++++++++++++++++
> diff.h                        |    7
> t/t1001-read-tree-m-2way.sh   |    2
> t/t1002-read-tree-m-u-2way.sh |    2
> 7 files changed, 1929 insertions(+), 1953 deletions(-)
>
> $ git-diff-tree -r --stat -C 6973dca
> 6973dcaee76ef7b7bfcabd2f26e76205aae07858
>  Makefile                      |    2
> diff-files.c                  |  212 +----
> diff-lib.c                    | 1862 ++---------------------------------------
> diff-lib.c => diff.c          |    0
> diff.h                        |    7
> t/t1001-read-tree-m-2way.sh   |    2
> t/t1002-read-tree-m-u-2way.sh |    2
> 7 files changed, 134 insertions(+), 1953 deletions(-)
>
> IMHO the bug is
>
>   "diff-lib.c => diff.c          |    0"
>
> instead of
>
>   "diff-lib.c => diff.c          |    1795"
>
> because, after the patch applied, in the repository we have
> 1953-1929=24 lines of code more, not 1953-134= 1819 less.
Interesting.  That's really a matter of taste and interpretation.

If it were a straight rename without changing a single line, then would you say 1795 lines were removed (from the LHS file) and 1795 lines were added (to the RHS file)?

I personally find that output would be useless and would prefer it to say "I renamed file A to file B. Content-wise, there were N lines added and M lines removed, compared to the straight rename case, by the way".

And that is what the current output does. I do not see why it should be different in the case of a copy instead of a rename.

Previous: Marco CostalbaNext: Marco Costalba
Message 2 of 4 in “[Possible bug] diff-tree --stat info does not count copies”
  1. Marco CostalbaAug 17, 2006
  2. Junio C HamanoAug 17, 2006
  3. Marco CostalbaAug 17, 2006
  4. Junio C HamanoAug 18, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.