diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-02 23:56:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-02 23:56:42 (GMT) |
| commit | e3d6d56f1c2097f13a427e158638e5e0918e5705 (patch) | |
| tree | 0477acbfdb7994663be7f22a5ae836e384a2dc6f /t | |
| parent | 3d66dc9657f195cb241387a87bcdd5709abd8a21 (diff) | |
| parent | f45e867b1a60a2023c18719888bb52965ade7192 (diff) | |
| download | git-e3d6d56f1c2097f13a427e158638e5e0918e5705.zip git-e3d6d56f1c2097f13a427e158638e5e0918e5705.tar.gz git-e3d6d56f1c2097f13a427e158638e5e0918e5705.tar.bz2 | |
Merge branch 'maint'
* maint:
Fixing path quoting in git-rebase
Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.
Documentation: quote commit messages consistently.
Remove escaping of '|' in manpage option sections
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 4 | ||||
| -rwxr-xr-x | t/t3901-i18n-patch.sh | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 552af1c..2dbe04f 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -44,7 +44,7 @@ test_expect_success setup ' test_expect_success 'cherry-pick after renaming branch' ' git checkout rename2 && - EDITOR=: VISUAL=: git cherry-pick added && + git cherry-pick added && test -f opos && grep "Add extra line at the end" opos @@ -53,7 +53,7 @@ test_expect_success 'cherry-pick after renaming branch' ' test_expect_success 'revert after renaming branch' ' git checkout rename1 && - EDITOR=: VISUAL=: git revert added && + git revert added && test -f spoo && ! grep "Add extra line at the end" spoo diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh index 28e9e37..235f372 100755 --- a/t/t3901-i18n-patch.sh +++ b/t/t3901-i18n-patch.sh @@ -154,7 +154,7 @@ test_expect_success 'cherry-pick(U/U)' ' git reset --hard master && git cherry-pick side^ && git cherry-pick side && - EDITOR=: VISUAL=: git revert HEAD && + git revert HEAD && check_encoding 3 ' @@ -169,7 +169,7 @@ test_expect_success 'cherry-pick(L/L)' ' git reset --hard master && git cherry-pick side^ && git cherry-pick side && - EDITOR=: VISUAL=: git revert HEAD && + git revert HEAD && check_encoding 3 8859 ' @@ -184,7 +184,7 @@ test_expect_success 'cherry-pick(U/L)' ' git reset --hard master && git cherry-pick side^ && git cherry-pick side && - EDITOR=: VISUAL=: git revert HEAD && + git revert HEAD && check_encoding 3 ' @@ -200,7 +200,7 @@ test_expect_success 'cherry-pick(L/U)' ' git reset --hard master && git cherry-pick side^ && git cherry-pick side && - EDITOR=: VISUAL=: git revert HEAD && + git revert HEAD && check_encoding 3 8859 ' |