send-email: fix threaded mails without chain-reply-to

diff --git a/git-stash.sh b/git-stash.sh
index c0532e8751d361d2875f87a43ff5a519ea7e08ea..e6a586720978ec516d243590b0e403ed7ecfe36c 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -3,8 +3,8 @@
 
 dashless=$(basename "$0" | sed -e 's/-/ /')
 USAGE="list [<options>]
-   or: $dashless (show | drop | pop ) [<stash>]
-   or: $dashless apply [--index] [<stash>]
+   or: $dashless ( show | drop ) [<stash>]
+   or: $dashless ( pop | apply ) [--index] [<stash>]
    or: $dashless branch <branchname> [<stash>]
    or: $dashless [save [--keep-index] [<message>]]
    or: $dashless clear"
@@ -30,7 +30,7 @@ clear_stash () {
        then
                die "git stash clear with parameters is unimplemented"
        fi
-       if current=$(git rev-parse -q --verify $ref_stash)
+       if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
        then
                git update-ref -d $ref_stash $current
        fi
@@ -129,7 +129,7 @@ save_stash () {
 }
 
 have_stash () {
-       git rev-parse -q --verify $ref_stash >/dev/null
+       git rev-parse --verify $ref_stash >/dev/null 2>&1
 }
 
 list_stash () {
@@ -229,16 +229,16 @@ drop_stash () {
        fi
        # Verify supplied argument looks like a stash entry
        s=$(git rev-parse --verify "$@") &&
-       git rev-parse -q --verify "$s:"   > /dev/null &&
-       git rev-parse -q --verify "$s^1:" > /dev/null &&
-       git rev-parse -q --verify "$s^2:" > /dev/null ||
+       git rev-parse --verify "$s:"   > /dev/null 2>&1 &&
+       git rev-parse --verify "$s^1:" > /dev/null 2>&1 &&
+       git rev-parse --verify "$s^2:" > /dev/null 2>&1 ||
                die "$*: not a valid stashed state"
 
        git reflog delete --updateref --rewrite "$@" &&
                echo "Dropped $* ($s)" || die "$*: Could not drop stash entry"
 
        # clear_stash if we just dropped the last stash entry
-       git rev-parse -q --verify "$ref_stash@{0}" > /dev/null || clear_stash
+       git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash
 }
 
 apply_to_branch () {