From: Jon Seymour <jon.seymour@gmail.com>
To: robbat2@gentoo.org, git@vger.kernel.org, brian@gernhardtsoftware.com
Cc: Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH] stash show: fix breakage in 1.7.3
Date: Sat, 25 Sep 2010 12:54:33 +1000 [thread overview]
Message-ID: <1285383273-28378-1-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <robbat2-20100924T191752-102740530Z@orbis-terrarum.net>
The detached-stash series regressed support for
git stash show stash@{0}
due to a faulty assumption that
git rev-parse --no-revs stash@{0} would treat
stash@{0} as a revision reference and thus
not display it.
This patch restores the behaviour of git stash show
so that only flag like options are assigned
to the FLAGS variable and thus does not
depend git rev-parse behaviour so strongly.
It has been tested with Brandon Casey's improved t3903 tests.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
Apologies for the breakage.
Brandon: thanks for improving the tests.
git-stash.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 7ce818b..c2f1b2a 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -282,7 +282,7 @@ parse_flags_and_rev()
--)
:
;;
- *)
+ -*)
FLAGS="${FLAGS}${FLAGS:+ }$1"
;;
esac
--
1.7.2.12.g8788e.dirty
next prev parent reply other threads:[~2010-09-25 2:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 19:19 git-1.7.3 breakage: "git stash show xxx" doesn't show anything Robin H. Johnson
2010-09-24 20:01 ` Brandon Casey
2010-09-24 20:27 ` Brian Gernhardt
2010-09-24 20:40 ` [PATCH] t/t3903-stash: improve testing of git-stash show Brandon Casey
2010-09-24 20:43 ` Brian Gernhardt
2010-09-24 20:50 ` Brandon Casey
2010-09-24 21:49 ` Brian Gernhardt
2010-09-24 22:11 ` [PATCH] git-stash: fix flag parsing Brian Gernhardt
2010-09-24 22:15 ` Brian Gernhardt
2010-09-25 2:58 ` Jon Seymour
2010-09-27 4:36 ` Junio C Hamano
2010-09-27 15:32 ` [PATCH] stash: simplify parsing fixes Jon Seymour
2010-09-25 2:54 ` Jon Seymour [this message]
2010-09-25 3:32 ` [PATCH v1] stash show: fix breakage in 1.7.3 Jon Seymour
2010-09-25 4:45 ` Brian Gernhardt
2010-09-25 6:19 ` Jon Seymour
2010-09-25 7:15 ` Jon Seymour
2010-09-27 15:38 ` Jon Seymour
2010-09-25 7:19 ` [PATCH/RFC] rev-parse: stop interpreting flags as options to rev-parse once --flags is specified Jon Seymour
2010-09-25 7:19 ` Jon Seymour
2010-09-25 7:25 ` Jon Seymour
2010-09-26 7:11 ` Junio C Hamano
2010-09-26 14:39 ` Jon Seymour
2010-09-26 14:44 ` [PATCH v7 0/3] rev-parse: allow --flags to output rev-parse-like flags Jon Seymour
2010-09-26 14:44 ` [PATCH v7 1/3] rev-parse: update Documentation of --flags Jon Seymour
2010-09-26 14:44 ` [PATCH v7 2/3] rev-parse: add tests for git rev-parse --flags Jon Seymour
2010-09-26 14:44 ` [PATCH v7 3/3] rev-parse: stop interpreting flags as options to rev-parse once --flags is specified Jon Seymour
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285383273-28378-1-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=brian@gernhardtsoftware.com \
--cc=git@vger.kernel.org \
--cc=robbat2@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).