apply_stash() and show_stash() each call rev-parse with
'--default refs/stash' as an argument. This option causes rev-parse to
operate on refs/stash if it is not able to successfully operate on any
element of the command line. This includes failure to supply a "valid"
revision. This has the effect of causing 'stash apply' and 'stash show'
to operate as if stash@{0} had been supplied when an invalid revision is
supplied.
e.g. 'git stash apply stahs@{1}' would fall back to
'git stash apply stash@{0}'
This patch modifies these two functions so that they avoid using the
--default option of rev-parse.
Signed-off-by: Brandon Casey <casey@xxxxxxxxxxxxxxx>
---
This should fix the case I mention above, but it does not fix the
case where a non-existent reflog entry is specified. In this case
the last entry will be selected.
$ git stash list
stash@{0}: WIP on master: c050772... small java change
stash@{1}: WIP on master: c050772... small java change
stash@{2}: WIP on master: c050772... small java change
stash@{3}: WIP on master: c050772... small java change
$ git stash apply stash@{10}
warning: Log for 'stash' only has 4 entries.
# On branch master
# Changed but not updated:
... etc.
stash@{3} was applied.
Luckily, the dangerous case has no effect.
$ git stash drop stash@{10}
Dropped stash@{10} (b7a2467e58109c92d799d059f508f35853d0bff7)
$ git stash list
stash@{0}: WIP on master: c050772... small java change
stash@{1}: WIP on master: c050772... small java change
stash@{2}: WIP on master: c050772... small java change
stash@{3}: WIP on master: c050772... small java change
-brandon
git-stash.sh | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index d799c76..6bd2572 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -144,7 +144,14 @@ show_stash () {
then
flags=--stat
fi
- s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@")
+
+ if test $# = 0
+ then
+ set x "$ref_stash@{0}"
+ shift
+ fi
+
+ s=$(git rev-parse --revs-only --no-flags "$@")
w_commit=$(git rev-parse --verify "$s") &&
b_commit=$(git rev-parse --verify "$s^") &&
@@ -163,13 +170,19 @@ apply_stash () {
shift
esac
+ if test $# = 0
+ then
+ set x "$ref_stash@{0}"
+ shift
+ fi
+
# current index state
c_tree=$(git write-tree) ||
die 'Cannot apply a stash in the middle of a merge'
# stash records the work tree, and is a merge between the
# base commit (first parent) and the index tree (second parent).
- s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@") &&
+ s=$(git rev-parse --revs-only --no-flags "$@") &&
w_tree=$(git rev-parse --verify "$s:") &&
b_tree=$(git rev-parse --verify "$s^1:") &&
i_tree=$(git rev-parse --verify "$s^2:") ||
--
1.6.0.1.244.gdc19
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
