[PATCH v1] stash show: fix breakage in 1.7.3

From: Jon Seymour <jon.seymour@gmail.com>
Date: Sep 25, 2010, 03:32 UTC
Message-ID: <1285385521-17012-1-git-send-email-jon.seymour@gmail.com>
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 output it.

This patch restores the behaviour of git stash show so that git rev-parse is not used for parsing flags and only flag like options are assigned to the FLAGS variable.

It has been tested with Brandon Casey's improved t3903 tests.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 git-stash.sh |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

This revision further simplifies the parsing code by removing use of git rev-parse for FLAGS parsing altogether.

diff --git a/git-stash.sh b/git-stash.sh
index 7ce818b..8b18bb5 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -265,9 +265,6 @@ parse_flags_and_rev()
 	i_tree=
 
 	REV=$(git rev-parse --no-flags --symbolic "$@" 2>/dev/null)
-	FLAGS=$(git rev-parse --no-revs -- "$@" 2>/dev/null)
-
-	set -- $FLAGS
 
 	FLAGS=
 	while test $# -ne 0
@@ -282,7 +279,7 @@ parse_flags_and_rev()
 			--)
 				:
 			;;
-			*)
+			-*)
 				FLAGS="${FLAGS}${FLAGS:+ }$1"
 			;;
 		esac

-- 
1.7.2.14.g132f5.dirty