mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/maint-pull-rebase'

Browse Source 
* sb/maint-pull-rebase:
  pull: support rebased upstream + fetch + pull --rebase
  t5520-pull: Test for rebased upstream + fetch + pull --rebase
This commit is contained in:
Junio C Hamano
2009-08-05 12:38:39 -07:00
parent 7d1b509812 d44e71261f
commit e3e9af5bae
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/t5520-pull.sh
View File

@ -117,6 +117,19 @@ test_expect_success '--rebase with rebased default upstream' '
'
test_expect_success 'rebased upstream + fetch + pull --rebase' '
git update-ref refs/remotes/me/copy copy-orig &&
git reset --hard to-rebase-orig &&
git checkout --track -b to-rebase3 me/copy &&
git reset --hard to-rebase-orig &&
git fetch &&
git pull --rebase &&
test "conflicting modification" = "$(cat file)" &&
test file = "$(cat file2)"
'
test_expect_success 'pull --rebase dies early with dirty working directory' '
git checkout to-rebase &&