merge and reset: adjust for "reset --hard" messages

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 11c4aba24448492f1ba1836cded54170a5dde08c..f163821d033cc0dc81dcd7ce0af13a7e75986db1 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -132,21 +132,26 @@ canon_refs_list_for_fetch () {
        # or the first one otherwise; add prefix . to the rest
        # to prevent the secondary branches to be merged by default.
        merge_branches=
-       found_mergeref=
        curr_branch=
        if test "$1" = "-d"
        then
                shift ; remote="$1" ; shift
+               set x $(expand_refs_wildcard "$@")
+               shift
                if test "$remote" = "$(get_default_remote)"
                then
                        curr_branch=$(git-symbolic-ref HEAD | \
                            sed -e 's|^refs/heads/||')
                        merge_branches=$(git-repo-config \
-                           --get-all "branch.${curr_branch}.merge") ||
-                       merge_branches=.this.would.never.match.any.ref.
+                           --get-all "branch.${curr_branch}.merge")
+               fi
+               # If we are fetching only one branch, then first branch
+               # is the only thing that makes sense to merge anyway,
+               # so there is no point refusing that traditional rule.
+               if test $# != 1 && test "z$merge_branches" = z
+               then
+                       merge_branches=..this..would..never..match..
                fi
-               set x $(expand_refs_wildcard "$@")
-               shift
        fi
        for ref
        do
@@ -172,10 +177,6 @@ canon_refs_list_for_fetch () {
                            dot_prefix= && break
                        done
                fi
-               if test -z $dot_prefix
-               then
-                       found_mergeref=true
-               fi
                case "$remote" in
                '') remote=HEAD ;;
                refs/heads/* | refs/tags/* | refs/remotes/*) ;;
@@ -196,11 +197,6 @@ canon_refs_list_for_fetch () {
                fi
                echo "${dot_prefix}${force}${remote}:${local}"
        done
-       if test -z "$found_mergeref" -a "$curr_branch"
-       then
-               echo >&2 "Warning: No merge candidate found because value of config option
-         \"branch.${curr_branch}.merge\" does not match any remote branch fetched."
-       fi
 }
 
 # Returns list of src: (no store), or src:dst (store)