From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: j6t@kdbg.org, gitster@pobox.com, Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v6a 2/9] detached-stash: work around git rev-parse failure to detect bad log refs
Date: Sat, 21 Aug 2010 14:48:05 +1000 [thread overview]
Message-ID: <1282366085-11196-1-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1282363744-4924-3-git-send-email-jon.seymour@gmail.com>
| amended to include trailing } in 1/9
This commit is required because git rev-parse in 1.7.2 does not correctly
indicate invalid log references using a non-zero status code.
We use a proxy for the condition (non-empty error output) as
a substitute. This commit can be reverted when, and if, rev-parse
is fixed to indicate invalid log references with a status code.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
git-stash.sh | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 836d6e6..42b0da2 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -328,6 +328,15 @@ parse_flags_and_rev()
test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
IS_STASH_REF=t
+ if test "${REV}" != "${REV%{*\}}"
+ then
+ # maintainers: it would be better if git rev-parse indicated
+ # this condition with a non-zero status code but as of 1.7.2.1 it
+ # it did not. So, we use non-empty stderr output as a proxy for the
+ # condition of interest.
+ test -z "$(git rev-parse "$REV" 2>&1 >/dev/null)" || die "$REV does not exist in the stash log"
+ fi
+
}
is_stash_like()
--
1.7.2.2.178.g949b
next prev parent reply other threads:[~2010-08-21 4:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-21 4:08 [PATCH v6 0/9] detached-stash: regularise handling of stash arguments by git stash Jon Seymour
2010-08-21 4:08 ` [PATCH v6 1/9] detached-stash: introduce parse_flags_and_revs function Jon Seymour
2010-08-21 4:46 ` [PATCH v6a " Jon Seymour
2010-08-21 4:08 ` [PATCH v6 2/9] detached-stash: work around git rev-parse failure to detect bad log refs Jon Seymour
2010-08-21 4:48 ` Jon Seymour [this message]
2010-08-21 4:08 ` [PATCH v6 3/9] detached-stash: simplify stash_apply Jon Seymour
2010-08-21 4:08 ` [PATCH v6 4/9] detached-stash: simplify stash_drop Jon Seymour
2010-08-21 4:09 ` [PATCH v6 5/9] detached-stash: refactor git stash pop implementation Jon Seymour
2010-08-21 4:09 ` [PATCH v6 6/9] detached-stash: simplify git stash branch Jon Seymour
2010-08-21 4:09 ` [PATCH v6 7/9] detached-stash: simplify git stash show Jon Seymour
2010-08-21 4:09 ` [PATCH v6 8/9] detached-stash: tests of git stash with stash-like arguments Jon Seymour
2010-08-21 4:09 ` [PATCH v6 9/9] detached-stash: update Documentation 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=1282366085-11196-1-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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).