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

Re: [PATCH 0/1] Be careful about left-over files from git add --edit runs

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 15, 2019, 18:50 UTC
Message-ID
<xmqqef9dsqkh.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<pull.107.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 7 quoted lines
> J Wyman reported almost a year ago (and I fixed this issue in Git for
> Windows around that time) that the .git/ADD_EDIT.patch file might still lie
> around at the beginning of git add --edit from previous runs, and if the new
> patch is smaller than the old one, the resulting diff is obviously corrupt.
>
> This is yet another Git for Windows patch finally making it to the Git
> mailing list.
Good, finally ;-).  

I didn't realize that "add -e" codepath was so old until today to check with "git blame" to see how old this bug was (it predates the transition from builtin-foo.c to builtin/foo.c); it seems that it was from day one of the feature.

Show 12 quoted lines
>
> Johannes Schindelin (1):
>   add --edit: truncate the patch file
>
>  builtin/add.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
>
> base-commit: ecbdaf0899161c067986e9d9d564586d4b045d62
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-107%2Fdscho%2Fadd-e-truncate-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-107/dscho/add-e-truncate-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/107
Previous: Junio C HamanoNext: Johannes Schindelin
Message 4 of 5 in “Be careful about left-over files from git add --edit runs”
  1. 0/1 Be careful about left-over files from git add --edit runsJohannes Schindelin via GitGitGadget, Jan 15, 2019
  2. 1/1 add --edit: truncate the patch fileJohannes Schindelin via GitGitGadget, Jan 15, 2019
  3. Junio C HamanoJan 15, 2019
  4. Junio C HamanoJan 15, 2019
  5. Johannes SchindelinJan 16, 2019

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.