-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* maint: test-lib: Remove 3 year old no-op --no-python option test-lib: Ignore --quiet under a TAP harness Documentation/rev-parse: quoting is required with --parseopt Documentation: reporting bugs Fix git rebase --continue to work with touched files Document ls-files -t as semi-obsolete.
- Loading branch information
Showing
6 changed files
with
69 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
#!/bin/sh | ||
|
||
test_description='git rebase --continue tests' | ||
|
||
. ./test-lib.sh | ||
|
||
. "$TEST_DIRECTORY"/lib-rebase.sh | ||
|
||
set_fake_editor | ||
|
||
test_expect_success 'setup' ' | ||
test_commit "commit-new-file-F1" F1 1 && | ||
test_commit "commit-new-file-F2" F2 2 && | ||
git checkout -b topic HEAD^ && | ||
test_commit "commit-new-file-F2-on-topic-branch" F2 22 && | ||
git checkout master | ||
' | ||
|
||
test_expect_success 'interactive rebase --continue works with touched file' ' | ||
rm -fr .git/rebase-* && | ||
git reset --hard && | ||
git checkout master && | ||
FAKE_LINES="edit 1" git rebase -i HEAD^ && | ||
test-chmtime =-60 F1 && | ||
git rebase --continue | ||
' | ||
|
||
test_expect_success 'non-interactive rebase --continue works with touched file' ' | ||
rm -fr .git/rebase-* && | ||
git reset --hard && | ||
git checkout master && | ||
test_must_fail git rebase --onto master master topic && | ||
echo "Resolved" >F2 && | ||
git add F2 && | ||
test-chmtime =-60 F1 && | ||
git rebase --continue | ||
' | ||
|
||
test_done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters