From: Eli Barzilay <eli-oSK4jVRJLyZg9hUCZPvPmw@public.gmane.org>
To: git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
magit-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Subject: Bug in git-stash(.sh) ?
Date: Fri, 27 Apr 2012 18:57:36 -0400 [thread overview]
Message-ID: <20379.9312.943088.350379@winooski.ccs.neu.edu> (raw)
[Note: cross-posted to the magit list to see if anyone else has this
problem.]
For a while now I had a problem when I try to do stash operations via
magit -- for example, it shows this in the process buffer:
$ git --no-pager stash apply stash@{2012-04-27 08:53:30 -0400}
Too many revisions specified: stash@{2012-04-27 08:53:30 -0400}
I tracked this down to this part of the script:
REV=$(git rev-parse --no-flags --symbolic "$@") || exit 1
...
set -- $REV
where $REV has one symbolic name but the name has spaces in it. (This
was introduced two years ago, in ef76312.)
Removing the --symbolic flag could solve this but it looks like it's
needed for error reporting. Instead, I tweaked IFS so it's split
correctly and added some quotations later in the script where $1 and
$REV are used without quotes. (I also moved the "REV=..." line next
to the "set -- $REV", since the chunk of code between them isn't using
$REV.)
The following is the diff -- if it looks right I can send a properly
formatted patch.
-------------------------------------------------------------------------------
diff --git a/git-stash.sh b/git-stash.sh
index 4e2c7f8..10a264b 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -33,6 +33,8 @@ else
reset_color=
fi
+NEWLINE="
+"
no_changes () {
git diff-index --quiet --cached HEAD --ignore-submodules -- &&
git diff-files --quiet --ignore-submodules &&
@@ -327,8 +329,6 @@ parse_flags_and_rev()
i_tree=
u_tree=
- REV=$(git rev-parse --no-flags --symbolic "$@") || exit 1
-
FLAGS=
for opt
do
@@ -345,7 +345,9 @@ parse_flags_and_rev()
esac
done
- set -- $REV
+ REV=$(git rev-parse --no-flags --symbolic "$@") || exit 1
+
+ OIFS="$IFS"; IFS="$NEWLINE"; set -- $REV; IFS="$OIFS"
case $# in
0)
@@ -360,13 +362,13 @@ parse_flags_and_rev()
;;
esac
- REV=$(git rev-parse --quiet --symbolic --verify $1 2>/dev/null) || {
+ REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || {
reference="$1"
die "$(eval_gettext "\$reference is not valid reference")"
}
- i_commit=$(git rev-parse --quiet --verify $REV^2 2>/dev/null) &&
- set -- $(git rev-parse $REV $REV^1 $REV: $REV^1: $REV^2: 2>/dev/null) &&
+ i_commit=$(git rev-parse --quiet --verify "$REV^2" 2>/dev/null) &&
+ set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) &&
s=$1 &&
w_commit=$1 &&
b_commit=$2 &&
@@ -377,8 +379,8 @@ parse_flags_and_rev()
test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
IS_STASH_REF=t
- u_commit=$(git rev-parse --quiet --verify $REV^3 2>/dev/null) &&
- u_tree=$(git rev-parse $REV^3: 2>/dev/null)
+ u_commit=$(git rev-parse --quiet --verify "$REV^3" 2>/dev/null) &&
+ u_tree=$(git rev-parse "$REV^3:" 2>/dev/null)
}
is_stash_like()
-------------------------------------------------------------------------------
--
((lambda (x) (x x)) (lambda (x) (x x))) Eli Barzilay:
http://barzilay.org/ Maze is Life!
next reply other threads:[~2012-04-27 22:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 22:57 Eli Barzilay [this message]
2012-04-27 23:02 ` Bug in git-stash(.sh) ? Junio C Hamano
2012-04-28 0:16 ` Eli Barzilay
[not found] ` <CALO-gut4csy5wef4iGPGD5jVPc1f0iFBfS3MUWrOwc2yczdviw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
[not found] ` <m2pqasb8mr.fsf-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
[not found] ` <87wr4za9mr.fsf-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-04-28 23:59 ` Eli Barzilay
2012-04-29 22:01 ` Jeff King
[not found] ` <20120429220132.GB4491-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-04-29 22:26 ` Eli Barzilay
2012-05-01 13:42 ` Jeff King
[not found] ` <20120501134254.GA11900-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-03 18:44 ` [git] " Eli Barzilay
[not found] ` <20386.53745.200846.115335-a5nvgYPMCZcx/1z6v04GWfZ8FUJU4vz8@public.gmane.org>
2012-05-04 5:21 ` Jeff King
[not found] ` <20120504052106.GA15970-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-04 5:23 ` [PATCH 1/4] t1411: add more selector index/date tests Jeff King
2012-05-04 5:25 ` [PATCH 2/4] log: respect date_mode_explicit with --format:%gd Jeff King
2012-05-04 5:27 ` [PATCH 4/4] reflog-walk: always make HEAD@{0} show indexed selectors Jeff King
[not found] ` <20120504052725.GD16107-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-04 17:02 ` Junio C Hamano
[not found] ` <7v7gwrc212.fsf-s2KvWo2KEQL18tm6hw+yZpy9Z0UEorGK@public.gmane.org>
2012-05-07 21:37 ` Jeff King
[not found] ` <20120507213752.GA19911-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-10 15:37 ` Jeff King
[not found] ` <20120510153754.GA23941-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-10 16:39 ` Junio C Hamano
[not found] ` <7vd36cng6n.fsf-s2KvWo2KEQL18tm6hw+yZpy9Z0UEorGK@public.gmane.org>
2012-05-10 17:19 ` OT: gmane address mangling selectors Jeff King
[not found] ` <20120510171912.GA29972-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-10 17:35 ` Eli Barzilay
2012-05-04 18:57 ` [git] Re: Bug in git-stash(.sh) ? Eli Barzilay
[not found] ` <20388.9885.608325.489624-a5nvgYPMCZcx/1z6v04GWfZ8FUJU4vz8@public.gmane.org>
2012-05-04 22:36 ` Eli Barzilay
2012-05-04 5:26 ` [PATCH 3/4] reflog-walk: clean up "flag" field of commit_reflog struct Jeff King
2012-04-29 22:07 ` Bug in git-stash(.sh) ? Junio C Hamano
[not found] ` <7vlilexkcq.fsf-s2KvWo2KEQL18tm6hw+yZpy9Z0UEorGK@public.gmane.org>
2012-04-29 22:37 ` Eli Barzilay
2012-05-01 15:02 ` Jeff King
2012-04-28 7:47 ` Andreas Schwab
2012-04-28 20:23 ` Yann Hodique
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=20379.9312.943088.350379@winooski.ccs.neu.edu \
--to=eli-osk4jvrjlyzg9huczpvpmw@public.gmane.org \
--cc=git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=magit-/JYPxA39Uh5TLH3MbocFFw@public.gmane.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).