kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Advertise the ability to abort a commit 

This treats aborting a commit more like a feature.

Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Anders Melchiorsen 2008-07-29 22:12:22 +02:00 committed by Junio C Hamano
parent ae7c5dcef9
commit bd2574ca69
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin-commit.c
View File

@ -555,6 +555,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
fprintf(fp, fprintf(fp,
"\n" "\n"
"# Please enter the commit message for your changes.\n" "# Please enter the commit message for your changes.\n"
"# To abort the commit, use an empty commit message.\n"
"# (Comment lines starting with '#' will "); "# (Comment lines starting with '#' will ");
if (cleanup_mode == CLEANUP_ALL) if (cleanup_mode == CLEANUP_ALL)
fprintf(fp, "not be included)\n"); fprintf(fp, "not be included)\n");

7
t/t7502-commit.sh
View File

@ -142,6 +142,7 @@ test_expect_success 'cleanup commit messages (strip,-F)' '
echo "sample echo "sample


# Please enter the commit message for your changes. # Please enter the commit message for your changes.
# To abort the commit, use an empty commit message.
# (Comment lines starting with '#' will not be included)" >expect # (Comment lines starting with '#' will not be included)" >expect


test_expect_success 'cleanup commit messages (strip,-F,-e)' ' test_expect_success 'cleanup commit messages (strip,-F,-e)' '
@ -149,7 +150,7 @@ test_expect_success 'cleanup commit messages (strip,-F,-e)' '
echo >>negative && echo >>negative &&
{ echo;echo sample;echo; } >text && { echo;echo sample;echo; } >text &&
git commit -e -F text -a && git commit -e -F text -a &&
head -n 4 .git/COMMIT_EDITMSG >actual && head -n 5 .git/COMMIT_EDITMSG >actual &&
test_cmp expect actual test_cmp expect actual


' '
@ -162,7 +163,7 @@ test_expect_success 'author different from committer' '


echo >>negative && echo >>negative &&
git commit -e -m "sample" git commit -e -m "sample"
head -n 7 .git/COMMIT_EDITMSG >actual && head -n 8 .git/COMMIT_EDITMSG >actual &&
test_cmp expect actual test_cmp expect actual
' '


@ -181,7 +182,7 @@ test_expect_success 'committer is automatic' '
# must fail because there is no change # must fail because there is no change
test_must_fail git commit -e -m "sample" test_must_fail git commit -e -m "sample"
) && ) &&
head -n 8 .git/COMMIT_EDITMSG | \ head -n 9 .git/COMMIT_EDITMSG | \
sed "s/^# Committer: .*/# Committer:/" >actual && sed "s/^# Committer: .*/# Committer:/" >actual &&
test_cmp expect actual test_cmp expect actual
' '