diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:56:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:56:59 -0800 |
| commit | 1ae419cb3902e6cc45538a9673539ed5316fcf30 (patch) | |
| tree | b347204ec26b40a72b394f75d357c3278d75bab9 /t/t7502-commit.sh | |
| parent | fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4 (diff) | |
| parent | 8089c85bcba89464b9b2a32fa948ed85eb367e70 (diff) | |
| download | git-1ae419cb3902e6cc45538a9673539ed5316fcf30.tar.gz | |
Merge branch 'pb/prepare-commit-msg'
* pb/prepare-commit-msg:
git-commit: add a prepare-commit-msg hook
git-commit: Refactor creation of log message.
git-commit: set GIT_EDITOR=: if editor will not be launched
git-commit: support variable number of hook arguments
Diffstat (limited to 't/t7502-commit.sh')
| -rwxr-xr-x | t/t7502-commit.sh | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index aaf497e6a5..b780fddc08 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -154,4 +154,33 @@ test_expect_success 'cleanup commit messages (strip,-F,-e)' ' ' +pwd=`pwd` +cat >> .git/FAKE_EDITOR << EOF +#! /bin/sh +echo editor started > "$pwd/.git/result" +exit 0 +EOF +chmod +x .git/FAKE_EDITOR + +test_expect_success 'do not fire editor in the presence of conflicts' ' + + git clean + echo f>g + git add g + git commit -myes + git branch second + echo master>g + echo g>h + git add g h + git commit -mmaster + git checkout second + echo second>g + git add g + git commit -msecond + git cherry-pick -n master + echo "editor not started" > .git/result + GIT_EDITOR=`pwd`/.git/FAKE_EDITOR git commit && exit 1 # should fail + test "`cat .git/result`" = "editor not started" +' + test_done |