Merge branch 'jc/test-clone' into jc/clone

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index bc881cc5f9d932c40f10bf0448aafa3263724c35..11c4aba24448492f1ba1836cded54170a5dde08c 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -142,7 +142,8 @@ canon_refs_list_for_fetch () {
                        curr_branch=$(git-symbolic-ref HEAD | \
                            sed -e 's|^refs/heads/||')
                        merge_branches=$(git-repo-config \
-                           --get-all "branch.${curr_branch}.merge")
+                           --get-all "branch.${curr_branch}.merge") ||
+                       merge_branches=.this.would.never.match.any.ref.
                fi
                set x $(expand_refs_wildcard "$@")
                shift