Merge branch 'master' of git://repo.or.cz/git/fastimport

[git.git] / git-parse-remote.sh

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 3e783b7b056de113584e526835a23fb05dfdcfce..5208ee6ce0bb07dd22ad5ca63ee469cb03011164 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -174,12 +174,8 @@ canon_refs_list_for_fetch () {
                else
                        for merge_branch in $merge_branches
                        do
-                           if  test "$remote" = "$merge_branch" ||
-                               test "$local" = "$merge_branch"
-                           then
-                                   dot_prefix=
-                                   break
-                           fi
+                           [ "$remote" = "$merge_branch" ] &&
+                           dot_prefix= && break
                        done
                fi
                case "$remote" in