From: Junio C Hamano Date: Mon, 29 Sep 2014 19:36:10 +0000 (-0700) Subject: Merge branch 'da/rev-parse-verify-quiet' X-Git-Tag: v2.2.0-rc0~77 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/507fe835ed0753ff266fdb998853cc5dea3758c6 Merge branch 'da/rev-parse-verify-quiet' "rev-parse --verify --quiet $name" is meant to quietly exit with a non-zero status when $name is not a valid object name, but still gave error messages in some cases. * da/rev-parse-verify-quiet: stash: prefer --quiet over shell redirection of the standard error stream refs: make rev-parse --quiet actually quiet t1503: use test_must_be_empty Documentation: a note about stdout for git rev-parse --verify --quiet --- 507fe835ed0753ff266fdb998853cc5dea3758c6 diff --cc git-stash.sh index 0158c73386,7ece0f1420..d4cf818be9 --- a/git-stash.sh +++ b/git-stash.sh @@@ -392,12 -392,12 +392,12 @@@ parse_flags_and_rev( ;; esac - REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || { + REV=$(git rev-parse --symbolic --verify --quiet "$1") || { reference="$1" - die "$(eval_gettext "\$reference is not valid reference")" + die "$(eval_gettext "\$reference is not a valid reference")" } - i_commit=$(git rev-parse --quiet --verify "$REV^2" 2>/dev/null) && + i_commit=$(git rev-parse --verify --quiet "$REV^2") && set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) && s=$1 && w_commit=$1 &&