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

Re: [PATCH] git.el: Don't reset HEAD in git-amend-file.

From
AJAlexandre Julliard <julliard@winehq.org>
Date
Jun 26, 2008, 08:25 UTC
Message-ID
<87tzfg7gd5.fsf@wine.dyndns.org>
In-Reply-To
<m2myle77bb.fsf@nschum.de>
Nikolaj Schumacher <n_schumacher@web.de> writes:
Show 5 quoted lines
> The current implementation of git-amend-file is a little dangerous.
> While git --amend is atomic, git-amend-file is not.
>
> If the user calls it, but doesn't go through with the commit (due to
> error or choice), git --reset HEAD^ has been called anyway.

That's a feature, even if it's a little dangerous. You have to reset HEAD to be able to properly do diffs, refreshes, etc. Maybe there should be an easier way to redo the commit if you change your mind, but the command would be much less useful without the reset.

-- 
Alexandre Julliard
julliard@winehq.org
Previous: Nikolaj SchumacherNext: Nikolaj Schumacher
Message 2 of 3 in “git.el: Don't reset HEAD in git-amend-file.”
  1. git.el: Don't reset HEAD in git-amend-file.Nikolaj Schumacher, Jun 21, 2008
  2. Alexandre JulliardJun 26, 2008
  3. Nikolaj SchumacherJun 26, 2008

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.