Merge branch 'da/rev-parse-verify-quiet'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2014 19:36:10 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2014 19:36:10 +0000 (12:36 -0700)
"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

1  2 
builtin/show-branch.c
git-stash.sh
refs.c
refs.h
Simple merge
diff --cc git-stash.sh
index 0158c7338685c8ccbc31766927f905b455a444c2,7ece0f1420e019b517088abdd828ff73c6b13ec0..d4cf818be9488f1b94fdf4766a8f73db6bfd1029
@@@ -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 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 &&
diff --cc refs.c
Simple merge
diff --cc refs.h
Simple merge