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>

diff --git a/builtin-commit.c b/builtin-commit.c
index 9a11ca0bcd402d9bd4488df6e3526e4a24617b30..f7c053a0106c2e42833d0d7c7255b7b636d09a93 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -555,6 +555,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
                fprintf(fp,
                        "\n"
                        "# Please enter the commit message for your changes.\n"
                fprintf(fp,
                        "\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 ");
                if (cleanup_mode == CLEANUP_ALL)
                        fprintf(fp, "not be included)\n");
                        "# (Comment lines starting with '#' will ");
                if (cleanup_mode == CLEANUP_ALL)
                        fprintf(fp, "not be included)\n");

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 4f2682ea800df599d720108ef8f17de06fedc06c..f1112639b698faca38b2c8fc743e422d14dc15f6 100755 (executable)
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -142,6 +142,7 @@ test_expect_success 'cleanup commit messages (strip,-F)' '
 echo "sample
 
 # Please enter the commit message for your changes.
 echo "sample
 
 # 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
 
 test_expect_success 'cleanup commit messages (strip,-F,-e)' '
 # (Comment lines starting with '#' will not be included)" >expect
 
 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;echo sample;echo; } >text &&
        git commit -e -F text -a &&
        echo >>negative &&
        { echo;echo sample;echo; } >text &&
        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 &&
        git commit -e -m "sample"
 
        echo >>negative &&
        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
                test_must_fail git commit -e -m "sample"
        ) &&
                # must fail because there is no change
                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 &&
        test_cmp expect actual
 '
        sed "s/^# Committer: .*/# Committer:/" >actual &&
        test_cmp expect actual
 '