diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
| commit | 73fd7f3761eeef0e28bbf04727c8a1e751a9792e (patch) | |
| tree | ee4e1e60de8c67ac5d83148b3880f14bf2d2f024 | |
| parent | Merge branch 'mz/maint-rebase-stat-config' (diff) | |
| parent | Use reflog in 'pull --rebase . foo' (diff) | |
| download | git-73fd7f3761eeef0e28bbf04727c8a1e751a9792e.tar.gz git-73fd7f3761eeef0e28bbf04727c8a1e751a9792e.zip | |
Merge branch 'mz/pull-rebase-rebased'
* mz/pull-rebase-rebased:
Use reflog in 'pull --rebase . foo'
| -rw-r--r-- | git-parse-remote.sh | 10 | ||||
| -rwxr-xr-x | t/t5520-pull.sh | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 4da72aefbd..1cc2ba6e09 100644 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -89,7 +89,13 @@ get_remote_merge_branch () { refs/heads/*) remote=${remote#refs/heads/} ;; refs/* | tags/* | remotes/* ) remote= esac - - [ -n "$remote" ] && echo "refs/remotes/$repo/$remote" + [ -n "$remote" ] && case "$repo" in + .) + echo "refs/heads/$remote" + ;; + *) + echo "refs/remotes/$repo/$remote" + ;; + esac esac } diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 0b489f5b12..0470a81be0 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -222,4 +222,11 @@ test_expect_success 'git pull --rebase does not reapply old patches' ' ) ' +test_expect_success 'git pull --rebase against local branch' ' + git checkout -b copy2 to-rebase-orig && + git pull --rebase . to-rebase && + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" +' + test_done |