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

Re: [PATCH v2] stash pop: remove 'apply' options during 'drop' invocation

From
Stephen Boyd <bebarino@gmail.com>
Date
Feb 15, 2010, 18:46 UTC
Message-ID
<4B79968B.7060606@gmail.com>
In-Reply-To
<2927b3dc67ab0b9067d4fe849e85654125706b91.1266249586.git.trast@student.ethz.ch>
On 02/15/2010 08:05 AM, Thomas Rast wrote:
Show 23 quoted lines
> The 'git stash pop' option parsing used to remove the first argument
> in --index mode.  At the time this was implemented, this first
> argument was always --index.  However, since the invention of the -q
> option in fcdd0e9 (stash: teach quiet option, 2009-06-17) you can
> cause an internal invocation of
>
>   git stash drop --index
>
> by running
>
>   git stash pop -q --index
>
> which then of course fails because drop doesn't know --index.
>
> To handle this, instead let 'git stash apply' decide what the future
> argument to 'drop' should be.
>
> Warning: this means that 'git stash apply' must parse all options that
> 'drop' can take, and deal with them in the same way.  This is
> currently true for its only option -q.
>
> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
>
Acked-by: Stephen Boyd <bebarino@gmail.com>
Previous: Thomas RastNext: Steve Folly
Message 6 of 8 in “git stash pop not reapplying deletions”
  1. Steve FollyFeb 14, 2010
  2. Thomas RastFeb 14, 2010
  3. Steve FollyFeb 15, 2010
  4. Thomas RastFeb 15, 2010
  5. stash pop: remove 'apply' options during 'drop' invocationThomas Rast, Feb 15, 2010
  6. Stephen BoydFeb 15, 2010
  7. Steve FollyFeb 15, 2010
  8. Junio C HamanoFeb 16, 2010

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.