Merge branch 'mz/pull-rebase-rebased'

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

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 375a0ba59e1e2491ddcd0f8970699b1f11981565..1cc2ba6e09614fa55ad205145a3bdacfb78bf283 100644 (file)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -66,7 +66,7 @@ get_remote_merge_branch () {
            origin="$1"
            default=$(get_default_remote)
            test -z "$origin" && origin=$default
-           curr_branch=$(git symbolic-ref -q HEAD)
+           curr_branch=$(git symbolic-ref -q HEAD) &&
            [ "$origin" = "$default" ] &&
            echo $(git for-each-ref --format='%(upstream)' $curr_branch)
            ;;