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

Re: [RFC PATCH] am: do not do any reset on --abort

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 25, 2009, 11:49 UTC
Message-ID
<alpine.DEB.1.00.0905251348050.4288@intel-tinevez-2-302>
In-Reply-To
<20090525104308.GA26775@coredump.intra.peff.net>
Hi,
On Mon, 25 May 2009, Jeff King wrote:
Show 11 quoted lines
> We really have no idea what state the tree is in at this
> point, and whether the user might have done useful work on
> top of it. So let's err on the side of keeping the user's
> data intact.
> 
> The downside is that if they do have cruft to get rid of, or
> want to pretend as if earlier parts of the series that were
> applied did not exist, they must manually "git reset --hard"
> now.
> 
> Signed-off-by: Jeff King <peff@peff.net>
Hmm.  I think I would revert that patch after merging git.git right away.

Can you at least check for a dirty tree and reset --hard if it is clean? In the other case, you could still say "you seem to have modifications, bla bla bla"...

Ciao, Dscho

Previous: Jeff KingNext: Jeff King
Message 7 of 14 in “Bug: 'git am --abort' can silently reset the wrong branch”
  1. Eduardo HabkostMay 6, 2009
  2. Jeff KingMay 8, 2009
  3. Sverre RabbelierMay 8, 2009
  4. Junio C HamanoMay 8, 2009
  5. Jeff KingMay 8, 2009
  6. am: do not do any reset on --abortJeff King, May 25, 2009
  7. Johannes SchindelinMay 25, 2009
  8. Jeff KingMay 25, 2009
  9. Johannes SixtMay 25, 2009
  10. Avery PennarunMay 25, 2009
  11. Jeff KingMay 25, 2009
  12. Jeff KingMay 25, 2009
  13. Avery PennarunMay 25, 2009
  14. Junio C HamanoMay 25, 2009

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.