Make git-rerere a builtin

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index e281b7c6ebd5515d74201869574eed6077f37c9d..f163821d033cc0dc81dcd7ce0af13a7e75986db1 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -99,25 +99,27 @@ get_remote_default_refs_for_push () {
 expand_refs_wildcard () {
        for ref
        do
+               lref=${ref#'+'}
                # a non glob pattern is given back as-is.
-               expr "z$ref" : 'zrefs/.*/\*:refs/.*/\*$' >/dev/null || {
+               expr "z$lref" : 'zrefs/.*/\*:refs/.*/\*$' >/dev/null || {
                        echo "$ref"
                        continue
                }
-               from=`expr "z$ref" : 'z\(refs/.*/\)\*:refs/.*/\*$'`
-               to=`expr "z$ref" : 'zrefs/.*/\*:\(refs/.*/\)\*$'`
+
+               from=`expr "z$lref" : 'z\(refs/.*/\)\*:refs/.*/\*$'`
+               to=`expr "z$lref" : 'zrefs/.*/\*:\(refs/.*/\)\*$'`
+               local_force=
+               test "z$lref" = "z$ref" || local_force='+'
                echo "$ls_remote_result" |
+               sed -e '/\^{}$/d' |
                (
                        IFS='   '
                        while read sha1 name
                        do
+                               # ignore the ones that do not start with $from
                                mapped=${name#"$from"}
-                               if test "z$name" != "z${name#'^{}'}" ||
-                                       test "z$name" = "z$mapped"
-                               then
-                                       continue
-                               fi
-                               echo "${name}:${to}${mapped}"
+                               test "z$name" = "z$mapped" && continue
+                               echo "${local_force}${name}:${to}${mapped}"
                        done
                )
        done
@@ -130,9 +132,12 @@ 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=
+       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 | \
@@ -140,8 +145,13 @@ canon_refs_list_for_fetch () {
                        merge_branches=$(git-repo-config \
                            --get-all "branch.${curr_branch}.merge")
                fi
-               set x $(expand_refs_wildcard "$@")
-               shift
+               # 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
        fi
        for ref
        do