From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Fix amending of a commit with an empty message
Date: Thu, 21 Feb 2008 21:38:02 +0100 [thread overview]
Message-ID: <20080221203802.GB20143@steel.home> (raw)
In-Reply-To: <20080221203506.GA20143@steel.home>
This change probably does even more than that: it allows amending of
anything, even of a commit which does not change anything.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Alex Riesen, Thu, Feb 21, 2008 21:35:06 +0100:
> Junio C Hamano, Thu, Feb 21, 2008 21:23:10 +0100:
> > Alex Riesen <raa.lkml@gmail.com> writes:
> > >
> > > Well, it fails... In current master
> >
> > Then please mark it with test_expect_failure.
>
> That's because I expect it to be fixed (in the next mail)
>
In this one. I am a bit unsure regarding the change (it looks a little
too strong), even though it passes the test suite.
builtin-commit.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c
index 065e1f7..ab3fd7b 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -520,6 +520,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
if (get_sha1(parent, sha1))
commitable = !!active_nr;
+ else if (amend)
+ commitable = 1;
else {
init_revisions(&rev, "");
rev.abbrev = 0;
--
1.5.4.2.204.g6d0ab
next prev parent reply other threads:[~2008-02-21 20:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-21 19:54 [PATCH] A test for commit --amend allowing changing of a very empty commit message Alex Riesen
2008-02-21 20:23 ` Junio C Hamano
2008-02-21 20:35 ` Alex Riesen
2008-02-21 20:38 ` Alex Riesen [this message]
2008-02-21 20:56 ` [PATCH] Fix amending of a commit with an empty message Junio C Hamano
2008-02-21 21:32 ` Alex Riesen
2008-02-21 22:01 ` Junio C Hamano
2008-02-21 20:57 ` [PATCH] A test for commit --amend allowing changing of a very empty commit message Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080221203802.GB20143@steel.home \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).