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

Re: Bug report: Undocumented interaction of --exit-code and --ignore-space-change for file move

From
René Scharfe <l.s.r@web.de>
Date
Sep 23, 2024, 18:08 UTC
Message-ID
<2c3472d4-ad40-4636-9840-51fa97bca02b@web.de>
In-Reply-To
<d8512f2b-400f-4daa-a59f-5d10d4fc3840@vectro.org>
Am 23.09.24 um 18:29 schrieb Ian Turner:
Show 33 quoted lines
> I noticed that there an undocumented interaction of the --exit-code
> and --ignore-space-change flags to git diff, when the diff only
> contains file moves. Specifically, --ignore-space-change will cause
> git diff to return a zero exit code in this situation.
>
> I am not sure if the problem is with the command behavior, or with
> the documentation.
>
> STEPS TO REPRODUCE:
>
> git init
> echo foo > a.txt
> git add a.txt
> git commit -m "A"
> git mv a.txt b.txt
> git commit -m "B"
> git diff --exit-code HEAD~1..HEAD # returns exit code 1
> git diff --exit-code --ignore-space-change HEAD~1..HEAD # returns exit status 0
>
> EXPECTED BEHAVIOR:
>
> Both of the last two commands above should return nonzero exit status.
>
> WORKAROUND:
>
> As one might expect --no-renames undoes this behavior, although it
> also changes the diff output if not using --quiet:
>
> git diff --exit-code --ignore-space-change --no-renames HEAD~1..HEAD # returns exit status 1
>
> OTHER INFO:
>
> Tested this on git 2.39.2 and git 2.41.0, both on Linux.
Thank you for the report!  It's a known bug in the code.

d7b97b7185 (diff: let external diffs report that changes are uninteresting, 2024-06-09) exposed it more widely, unfortunately, causing v2.46.0 and up to report the wrong exit code even without --ignore-space-change.

87cf96094a (diff: report copies and renames as changes in run_diff_cmd(), 2024-09-08) fixes it, but it's not in any release, yet.

René
Previous: Ian TurnerNext: Junio C Hamano
Message 2 of 3 in “Bug report: Undocumented interaction of --exit-code and --ignore-space-change for file move”
  1. Ian TurnerSep 23, 2024
  2. René ScharfeSep 23, 2024
  3. Junio C HamanoSep 23, 2024

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.