threads / patch / 8801

patchgit-stash: don't complain when listing in a repo with no stash

Subject: [PATCH] git-stash: don't complain when listing in a repo with no stash

## tl;dr

2 messages between Jul 2, 2007 and Jul 2, 2007. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Jeff King· Jul 2, 2007, 04:21 UTC · lore

Previously, the git-log invocation would complain if a repo had not had any stashes created in it yet:

$ git-init
$ git-stash
fatal: ambiguous argument 'refs/stash': unknown revision or
  path not in the working tree.
Use '--' to separate paths from revisions

Instead, we only call git-log if we actually have a refs/stash. We could alternatively create the ref when any stash command is called, but it's better for the 'list' command to not require write access to the repo.

Signed-off-by: Jeff King <peff@peff.net>
---
 git-stash.sh |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Show changes to git-stash.sh +5 −0

diff --git a/git-stash.sh b/git-stash.sh
index 7644bd5..18d3322 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -76,7 +76,12 @@ save_stash () {
 	printf >&2 'Saved WIP on %s\n' "$msg"
 }
 
+have_stash () {
+	git-rev-parse --verify $ref_stash >/dev/null 2>&1
+}
+
 list_stash () {
+	have_stash || return 0
 	git-log --pretty=oneline -g "$@" $ref_stash |
 	sed -n -e 's/^[.0-9a-f]* refs\///p'
 }

-- 
1.5.2.2.1452.g896f6

しらいしななこ· Jul 2, 2007, 05:02 UTC · re: Jeff King · lore

Re: [PATCH] git-stash: don't complain when listing in a repo with no stash

Quoting Jeff King <peff@peff.net>:

Show 15 quoted lines

> Previously, the git-log invocation would complain if a repo
> had not had any stashes created in it yet:
>
> $ git-init
> $ git-stash
> fatal: ambiguous argument 'refs/stash': unknown revision or
>   path not in the working tree.
> Use '--' to separate paths from revisions
>
> Instead, we only call git-log if we actually have a
> refs/stash. We could alternatively create the ref when any
> stash command is called, but it's better for the 'list'
> command to not require write access to the repo.
>
> Signed-off-by: Jeff King <peff@peff.net>

Thank you for correcting the bugs I introduced.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

----------------------------------------------------------------------
Finally - A spam blocker that actually works.
http://www.bluebottle.com