diff options
| author |  Paolo Bonzini <bonzini@gnu.org> | 2008-02-05 11:01:46 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-02-06 02:26:02 -0800 |
| commit | ec84bd000a89e657b36136ec927144cd13f26079 (patch) | |
| tree | 996093de7b6c86b29b6c16efaf04f4a027bf97fc /t | |
| parent | git-commit: set GIT_EDITOR=: if editor will not be launched (diff) | |
| download | tgif-ec84bd000a89e657b36136ec927144cd13f26079.tar.xz | |
git-commit: Refactor creation of log message.
This patch moves the code of run_commit, up to writing the trees, editing
the message and running the commit-msg hook to prepare_log_message. It also
renames the latter to prepare_to_commit.
This simplifies a little the code for the next patch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -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 |