parse-remote: support default reflist in get_remote_merge_branch

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index a991564b95894f322ed4ac4a4a99ecd19a5fb817..75e12546400a24b8c06558b085be3465fbd15200 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -232,7 +232,13 @@ get_remote_refs_for_fetch () {
 get_remote_merge_branch () {
        case "$#" in
        0|1)
-           die "internal error: get-remote-merge-branch." ;;
+           origin="$1"
+           default=$(get_default_remote)
+           test -z "$origin" && origin=$default
+           curr_branch=$(git symbolic-ref -q HEAD)
+           [ "$origin" = "$default" ] &&
+           echo $(git for-each-ref --format='%(upstream)' $curr_branch)
+           ;;
        *)
            repo=$1
            shift