Fix overwriting of files when applying contextually independent diffs
[git/spearce.git] / t / t3400-rebase.sh
blobb9d3131cc2167df027d4d6eebc87ad51223c8f34
1 #!/bin/sh
3 # Copyright (c) 2005 Amos Waterland
6 test_description='git rebase should not destroy author information
8 This test runs git rebase and checks that the author information is not lost.
10 . ./test-lib.sh
12 export GIT_AUTHOR_EMAIL=bogus_email_address
14 test_expect_success \
15 'prepare repository with topic branch, then rebase against master' \
16 'echo First > A &&
17 git-update-index --add A &&
18 git-commit -m "Add A." &&
19 git checkout -b my-topic-branch &&
20 echo Second > B &&
21 git-update-index --add B &&
22 git-commit -m "Add B." &&
23 git checkout -f master &&
24 echo Third >> A &&
25 git-update-index A &&
26 git-commit -m "Modify A." &&
27 git checkout -f my-topic-branch &&
28 git rebase master'
30 test_expect_failure \
31 'the rebase operation should not have destroyed author information' \
32 'git log | grep "Author:" | grep "<>"'
34 test_done