undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bs/maint-t7005' into maint

Browse Source 
* bs/maint-t7005:
  t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
This commit is contained in:
Junio C Hamano 2007-11-24 18:01:46 -08:00
commit 18a135f419
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t7005-editor.sh
View File

@ -13,7 +13,6 @@ do
done done
unset vi unset vi
mv e-vi.sh vi mv e-vi.sh vi
PATH=".:$PATH"
unset EDITOR VISUAL GIT_EDITOR unset EDITOR VISUAL GIT_EDITOR
test_expect_success setup ' test_expect_success setup '
@ -59,7 +58,7 @@ do
;; ;;
esac esac
test_expect_success "Using $i" ' test_expect_success "Using $i" '
git commit --amend && git --exec-path=. commit --amend &&
git show -s --pretty=oneline | git show -s --pretty=oneline |
sed -e "s/^[0-9a-f]* //" >actual && sed -e "s/^[0-9a-f]* //" >actual &&
diff actual expect diff actual expect
@ -81,7 +80,7 @@ do
;; ;;
esac esac
test_expect_success "Using $i (override)" ' test_expect_success "Using $i (override)" '
git commit --amend && git --exec-path=. commit --amend &&
git show -s --pretty=oneline | git show -s --pretty=oneline |
sed -e "s/^[0-9a-f]* //" >actual && sed -e "s/^[0-9a-f]* //" >actual &&
diff actual expect diff actual expect