CODEWITHSUNDEEP
git
Uncommon
Uncommon

Reputation: 3383

stash@{1} is ambiguous?

I'm trying to get info about my stash, but git is telling me that stash@{0} and stash@{1} are ambiguous. git stash list works fine, and .git/logs/refs/stash seems to have the appropriate content (not that I'm an expert on git internals).

% git stash list
stash@{0}: On master: two
stash@{1}: On master: one
% git stash show stash@{1}
fatal: ambiguous argument 'stash@1': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions

Just plain git stash show works fine. So why are the names that git stash list gives me considered ambiguous?

Upvotes: 142

Views: 29071

Answers (5)

d.f
d.f

Reputation: 251

I had the same thing happen to me. The easiest way I found to fix it was:

$ git stash apply stash@"{2}"

I'm using a windows git shell.

Upvotes: 25

Jan Hudec
Jan Hudec

Reputation: 76236

Your shell is eating your curly brackets, so while you say stash@{1}, git sees stash@1, and that makes no sense to it. Quote the argument (use git stash apply "stash@{1}" or git stash apply stash@"{1}"; quoting either way will work) or reconfigure your shell to only expand curly brackets when there is a comma between them (zsh can be configured either way; bash only expands curly brackets with a comma or range between them while other shells may behave differently).

Upvotes: 272

Adriano
Adriano

Reputation: 487

Simply put stash id between simple quotes:

git stash apply 'stash@{1}'

Upvotes: 2

user3251328
user3251328

Reputation: 318

For zsh users:

$ git stash apply stash@'{'1'}'

Upvotes: 1

Sergey
Sergey

Reputation: 21171

If you have this error while working in Emacs with Magit on Windows (like me)
I hope this quick solution will help you:

(if (eq system-type 'windows-nt)
    (defadvice magit-run-git (before magit-run-git-win-curly-braces (&rest args) activate)
      "Escape {} on Windows"
      (setcar (nthcdr 2 args) 
              (replace-regexp-in-string "{\\([0-9]+\\)}" "\\\\{\\1\\\\}" (elt args 2)))
    )
  )

This will quote {} in a 3rd parameter in ("stash", "cmd", "stash@{0}") which is run by magit-run-git

Upvotes: 1

Related Questions