diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-05-21 12:32:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-22 23:05:11 -0700 |
| commit | f9189cf8f2427b10a40b5b3e530e2c893bc64ae9 (patch) | |
| tree | 613f4df13029d7c2b0f54a290969f79858438dbe | |
| parent | dee2775a29440ca8a52bb5bd09a6de6cd29f69cc (diff) | |
| download | git-f9189cf8f2427b10a40b5b3e530e2c893bc64ae9.tar.gz | |
pull --rebase: exit early when the working directory is dirty
When rebasing fails during "pull --rebase", you cannot just clean up the
working directory and call "pull --rebase" again, since the remote branch
was already fetched.
Therefore, die early when the working directory is dirty.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-pull.sh | 5 | ||||
| -rwxr-xr-x | t/t5520-pull.sh | 18 |
2 files changed, 23 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh index bf0c2985af..809e537a4d 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -107,6 +107,11 @@ error_on_no_merge_candidates () { } test true = "$rebase" && { + git update-index --refresh && + git diff-files --quiet && + git diff-index --cached --quiet HEAD -- || + die "refusing to pull with rebase: your working tree is not up-to-date" + . git-parse-remote && origin="$1" test -z "$origin" && origin=$(get_default_remote) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 9484129ca5..997b2db827 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -92,4 +92,22 @@ test_expect_success '--rebase with rebased upstream' ' ' +test_expect_success 'pull --rebase dies early with dirty working directory' ' + + git update-ref refs/remotes/me/copy copy^ && + COPY=$(git rev-parse --verify me/copy) && + git rebase --onto $COPY copy && + git config branch.to-rebase.remote me && + git config branch.to-rebase.merge refs/heads/copy && + git config branch.to-rebase.rebase true && + echo dirty >> file && + git add file && + test_must_fail git pull && + test $COPY = $(git rev-parse --verify me/copy) && + git checkout HEAD -- file && + git pull && + test $COPY != $(git rev-parse --verify me/copy) + +' + test_done |