git-revert: Revert revert message to old behaviour

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 9b19a21667e5d8e000479b25d60cd620d6df4154..437b0c3b1bc522c4b5a4a3a656b97cb2009c43a0 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -9,6 +9,9 @@ get_data_source () {
        */*)
                echo ''
                ;;
+       .)
+               echo self
+               ;;
        *)
                if test "$(git-config --get "remote.$1.url")"
                then
@@ -31,6 +34,9 @@ get_remote_url () {
        '')
                echo "$1"
                ;;
+       self)
+               echo "$1"
+               ;;
        config)
                git-config --get "remote.$1.url"
                ;;
@@ -57,7 +63,7 @@ get_default_remote () {
 get_remote_default_refs_for_push () {
        data_source=$(get_data_source "$1")
        case "$data_source" in
-       '' | branches)
+       '' | branches | self)
                ;; # no default push mapping, just send matching refs.
        config)
                git-config --get-all "remote.$1.push" ;;
@@ -81,7 +87,8 @@ get_remote_default_refs_for_push () {
 # is to help prevent randomly "globbed" ref from being chosen as
 # a merge candidate
 expand_refs_wildcard () {
-       git fetch--tool expand-refs-wildcard "$ls_remote_result" "$@"
+       echo "$ls_remote_result" |
+       git fetch--tool expand-refs-wildcard "-" "$@"
 }
 
 # Subroutine to canonicalize remote:local notation.
@@ -162,6 +169,10 @@ get_remote_default_refs_for_fetch () {
        case "$data_source" in
        '')
                echo "HEAD:" ;;
+       self)
+               canon_refs_list_for_fetch -d "$1" \
+                       $(git-for-each-ref --format='%(refname):')
+               ;;
        config)
                canon_refs_list_for_fetch -d "$1" \
                        $(git-config --get-all "remote.$1.fetch") ;;
@@ -176,7 +187,7 @@ get_remote_default_refs_for_fetch () {
                                        }' "$GIT_DIR/remotes/$1")
                ;;
        *)
-               die "internal error: get-remote-default-ref-for-push $1" ;;
+               die "internal error: get-remote-default-ref-for-fetch $1" ;;
        esac
 }