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

Re: making "git stash" safer to use

From
JHJoachim B Haga <cjhaga@fys.uio.no>
Date
Oct 4, 2007, 08:40 UTC
Message-ID
<858x6jff2v.fsf@lupus.ig3.net>
In-Reply-To
<200710032331.41385.bruno@clisp.org>
Show 9 quoted lines
> Through a simple typo I lost modifications to 20 files:
>
>> >>>     $ git stash
>> >>>     $ git pull
>> >>>     $ git stash apply
>> >>>     $ git stash clean              # typo!
>> >>>     $ git stash clear              # fatal correction to typo!
>
> It is just too easy to lose your modifications by using "git stash".

What makes it most dangerous is that there is no differentiation between a name and a command in the same position. I'd argue that either the command should be mandatory:

git stash save mywork git stash apply mywork git stash clear mywork git stash mywork # error

(we can still keep today's shortcuts "git stash" and "git stash apply", but only for the un-named case),

or that the command should be of the option type:

git stash mywork git stash --apply mywork git stash --clear mywork

-j.
Previous: Junio C HamanoNext: David Kastrup
Message 4 of 15 in “Re: git: avoiding merges, rebasing”
  1. Eric BlakeOct 2, 2007
  2. making "git stash" safer to useBruno Haible, Oct 3, 2007
  3. Junio C HamanoOct 3, 2007
  4. Joachim B HagaOct 4, 2007
  5. David KastrupOct 4, 2007
  6. stash clear, was Re: git: avoiding merges, rebasingJohannes Schindelin, Oct 19, 2007
  7. Miles BaderOct 23, 2007
  8. Bruno HaibleOct 3, 2007
  9. Benoit SIGOUREOct 8, 2007
  10. Benoit SIGOUREOct 8, 2007
  11. Johannes SchindelinOct 9, 2007
  12. Benoit SIGOUREOct 9, 2007
  13. Bruno HaibleOct 9, 2007
  14. GNU-style ChangeLog merge driver for Git (was: Re: git: avoiding merges, rebasing)Benoit SIGOURE, Oct 9, 2007
  15. Bruno HaibleOct 9, 2007

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.