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

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2007-11-02 16:56:42 -07:00
parent 3d66dc9657 f45e867b1a
commit e3d6d56f1c
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t3501-revert-cherry-pick.sh
View File

@ -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

8
t/t3901-i18n-patch.sh
View File

@ -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
'