2007-11-08 17:59:00 +01:00
|
|
|
/*
|
|
|
|
* Builtin "git commit"
|
|
|
|
*
|
|
|
|
* Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
|
|
|
|
* Based on git-commit.sh by Junio C Hamano and Linus Torvalds
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "cache.h"
|
|
|
|
#include "cache-tree.h"
|
2008-02-18 08:26:03 +01:00
|
|
|
#include "color.h"
|
2007-11-18 10:52:55 +01:00
|
|
|
#include "dir.h"
|
2007-11-08 17:59:00 +01:00
|
|
|
#include "builtin.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "diffcore.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "revision.h"
|
|
|
|
#include "wt-status.h"
|
|
|
|
#include "run-command.h"
|
|
|
|
#include "refs.h"
|
|
|
|
#include "log-tree.h"
|
|
|
|
#include "strbuf.h"
|
|
|
|
#include "utf8.h"
|
|
|
|
#include "parse-options.h"
|
2008-07-21 20:03:49 +02:00
|
|
|
#include "string-list.h"
|
2008-07-09 14:58:57 +02:00
|
|
|
#include "rerere.h"
|
2008-01-13 09:30:56 +01:00
|
|
|
#include "unpack-trees.h"
|
2009-08-08 08:31:57 +02:00
|
|
|
#include "quote.h"
|
2010-08-06 00:40:48 +02:00
|
|
|
#include "submodule.h"
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 02:23:20 +02:00
|
|
|
#include "gpg-interface.h"
|
2012-04-13 12:54:39 +02:00
|
|
|
#include "column.h"
|
2007-11-08 17:59:00 +01:00
|
|
|
|
|
|
|
static const char * const builtin_commit_usage[] = {
|
2012-08-20 14:32:04 +02:00
|
|
|
N_("git commit [options] [--] <filepattern>..."),
|
2007-11-08 17:59:00 +01:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2007-12-03 06:02:09 +01:00
|
|
|
static const char * const builtin_status_usage[] = {
|
2012-08-20 14:32:37 +02:00
|
|
|
N_("git status [options] [--] <filepattern>..."),
|
2007-12-03 06:02:09 +01:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
static const char implicit_ident_advice[] =
|
2011-02-23 00:41:49 +01:00
|
|
|
N_("Your name and email address were configured automatically based\n"
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
"on your username and hostname. Please check that they are accurate.\n"
|
|
|
|
"You can suppress this message by setting them explicitly:\n"
|
|
|
|
"\n"
|
2010-02-24 15:18:25 +01:00
|
|
|
" git config --global user.name \"Your Name\"\n"
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
" git config --global user.email you@example.com\n"
|
|
|
|
"\n"
|
2011-01-12 19:29:14 +01:00
|
|
|
"After doing this, you may fix the identity used for this commit with:\n"
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
"\n"
|
2011-02-23 00:41:49 +01:00
|
|
|
" git commit --amend --reset-author\n");
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
|
2010-06-07 02:41:46 +02:00
|
|
|
static const char empty_amend_advice[] =
|
2011-02-23 00:41:49 +01:00
|
|
|
N_("You asked to amend the most recent commit, but doing so would make\n"
|
2010-06-07 02:41:46 +02:00
|
|
|
"it empty. You can repeat your command with --allow-empty, or you can\n"
|
2011-02-23 00:41:49 +01:00
|
|
|
"remove the commit entirely with \"git reset HEAD^\".\n");
|
2010-06-07 02:41:46 +02:00
|
|
|
|
2011-02-20 05:12:29 +01:00
|
|
|
static const char empty_cherry_pick_advice[] =
|
2011-04-02 02:55:55 +02:00
|
|
|
N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
|
2011-02-20 05:12:29 +01:00
|
|
|
"If you wish to commit it anyway, use:\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --allow-empty\n"
|
|
|
|
"\n"
|
2011-04-02 02:55:55 +02:00
|
|
|
"Otherwise, please use 'git reset'\n");
|
2011-02-20 05:12:29 +01:00
|
|
|
|
|
|
|
static const char *use_message_buffer;
|
2007-11-08 17:59:00 +01:00
|
|
|
static const char commit_editmsg[] = "COMMIT_EDITMSG";
|
2007-11-18 10:52:55 +01:00
|
|
|
static struct lock_file index_lock; /* real index */
|
|
|
|
static struct lock_file false_lock; /* used only for partial commits */
|
|
|
|
static enum {
|
|
|
|
COMMIT_AS_IS = 1,
|
|
|
|
COMMIT_NORMAL,
|
2010-05-14 11:31:35 +02:00
|
|
|
COMMIT_PARTIAL
|
2007-11-18 10:52:55 +01:00
|
|
|
} commit_style;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-08-06 20:43:47 +02:00
|
|
|
static const char *logfile, *force_author;
|
2008-07-05 07:24:40 +02:00
|
|
|
static const char *template_file;
|
2011-02-20 05:12:29 +01:00
|
|
|
/*
|
|
|
|
* The _message variables are commit names from which to take
|
|
|
|
* the commit message and/or authorship.
|
|
|
|
*/
|
|
|
|
static const char *author_message, *author_message_buffer;
|
2007-11-08 17:59:00 +01:00
|
|
|
static char *edit_message, *use_message;
|
2010-11-02 20:59:11 +01:00
|
|
|
static char *fixup_message, *squash_message;
|
2011-12-06 22:09:55 +01:00
|
|
|
static int all, also, interactive, patch_interactive, only, amend, signoff;
|
|
|
|
static int edit_flag = -1; /* unspecified */
|
2009-11-04 04:20:11 +01:00
|
|
|
static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
|
2010-04-06 10:40:35 +02:00
|
|
|
static int no_post_rewrite, allow_empty_message;
|
2010-06-25 16:56:47 +02:00
|
|
|
static char *untracked_files_arg, *force_date, *ignore_submodule_arg;
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 02:23:20 +02:00
|
|
|
static char *sign_commit;
|
|
|
|
|
2007-12-22 19:46:24 +01:00
|
|
|
/*
|
|
|
|
* The default commit message cleanup mode will remove the lines
|
|
|
|
* beginning with # (shell comments) and leading and trailing
|
|
|
|
* whitespaces (empty lines or containing only whitespaces)
|
|
|
|
* if editor is used, and only the whitespaces if the message
|
|
|
|
* is specified explicitly.
|
|
|
|
*/
|
|
|
|
static enum {
|
|
|
|
CLEANUP_SPACE,
|
|
|
|
CLEANUP_NONE,
|
2010-05-14 11:31:35 +02:00
|
|
|
CLEANUP_ALL
|
2007-12-22 19:46:24 +01:00
|
|
|
} cleanup_mode;
|
|
|
|
static char *cleanup_arg;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2011-02-20 05:12:29 +01:00
|
|
|
static enum commit_whence whence;
|
2011-08-19 20:58:18 +02:00
|
|
|
static int use_editor = 1, include_status = 1;
|
2010-04-10 09:33:17 +02:00
|
|
|
static int show_ignored_in_status;
|
2008-07-22 22:40:41 +02:00
|
|
|
static const char *only_include_assumed;
|
2011-12-18 06:03:22 +01:00
|
|
|
static struct strbuf message = STRBUF_INIT;
|
2007-11-11 18:36:39 +01:00
|
|
|
|
2009-09-05 10:59:56 +02:00
|
|
|
static enum {
|
|
|
|
STATUS_FORMAT_LONG,
|
|
|
|
STATUS_FORMAT_SHORT,
|
2010-05-14 11:31:35 +02:00
|
|
|
STATUS_FORMAT_PORCELAIN
|
2009-09-05 10:59:56 +02:00
|
|
|
} status_format = STATUS_FORMAT_LONG;
|
|
|
|
|
2007-11-11 18:36:39 +01:00
|
|
|
static int opt_parse_m(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
|
|
|
struct strbuf *buf = opt->value;
|
|
|
|
if (unset)
|
|
|
|
strbuf_setlen(buf, 0);
|
|
|
|
else {
|
|
|
|
strbuf_addstr(buf, arg);
|
2008-07-22 22:40:41 +02:00
|
|
|
strbuf_addstr(buf, "\n\n");
|
2007-11-11 18:36:39 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2011-02-20 05:12:29 +01:00
|
|
|
static void determine_whence(struct wt_status *s)
|
|
|
|
{
|
|
|
|
if (file_exists(git_path("MERGE_HEAD")))
|
|
|
|
whence = FROM_MERGE;
|
|
|
|
else if (file_exists(git_path("CHERRY_PICK_HEAD")))
|
|
|
|
whence = FROM_CHERRY_PICK;
|
|
|
|
else
|
|
|
|
whence = FROM_COMMIT;
|
|
|
|
if (s)
|
|
|
|
s->whence = whence;
|
|
|
|
}
|
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
static void rollback_index_files(void)
|
|
|
|
{
|
|
|
|
switch (commit_style) {
|
|
|
|
case COMMIT_AS_IS:
|
|
|
|
break; /* nothing to do */
|
|
|
|
case COMMIT_NORMAL:
|
|
|
|
rollback_lock_file(&index_lock);
|
|
|
|
break;
|
|
|
|
case COMMIT_PARTIAL:
|
|
|
|
rollback_lock_file(&index_lock);
|
|
|
|
rollback_lock_file(&false_lock);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-23 18:21:22 +01:00
|
|
|
static int commit_index_files(void)
|
2007-11-18 10:52:55 +01:00
|
|
|
{
|
2008-01-23 18:21:22 +01:00
|
|
|
int err = 0;
|
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
switch (commit_style) {
|
|
|
|
case COMMIT_AS_IS:
|
|
|
|
break; /* nothing to do */
|
|
|
|
case COMMIT_NORMAL:
|
2008-01-23 18:21:22 +01:00
|
|
|
err = commit_lock_file(&index_lock);
|
2007-11-18 10:52:55 +01:00
|
|
|
break;
|
|
|
|
case COMMIT_PARTIAL:
|
2008-01-23 18:21:22 +01:00
|
|
|
err = commit_lock_file(&index_lock);
|
2007-11-18 10:52:55 +01:00
|
|
|
rollback_lock_file(&false_lock);
|
|
|
|
break;
|
|
|
|
}
|
2008-01-23 18:21:22 +01:00
|
|
|
|
|
|
|
return err;
|
2007-11-18 10:52:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Take a union of paths in the index and the named tree (typically, "HEAD"),
|
|
|
|
* and return the paths that match the given pattern in list.
|
|
|
|
*/
|
2008-07-21 20:03:49 +02:00
|
|
|
static int list_paths(struct string_list *list, const char *with_tree,
|
2007-11-18 10:52:55 +01:00
|
|
|
const char *prefix, const char **pattern)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
char *m;
|
|
|
|
|
commit: fix "--amend --only" with no pathspec
When we do not have any pathspec, we typically disallow an
explicit "--only", because it makes no sense (your commit
would, by definition, be empty). But since 6a74642
(git-commit --amend: two fixes., 2006-04-20), we have
allowed "--amend --only" with the intent that it would amend
the commit, ignoring any contents staged in the index.
However, while that commit allowed the combination, we never
actually implemented the logic to make it work. The current
code notices that we have no pathspec and assumes we want to
do an as-is commit (i.e., the "--only" is ignored).
Instead, we must make sure to follow the partial-commit
code-path. We also need to tweak the list_paths function to
handle a NULL pathspec.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-10 22:40:29 +02:00
|
|
|
if (!pattern)
|
|
|
|
return 0;
|
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
for (i = 0; pattern[i]; i++)
|
|
|
|
;
|
|
|
|
m = xcalloc(1, i);
|
|
|
|
|
2011-07-30 19:13:47 +02:00
|
|
|
if (with_tree) {
|
2011-09-04 12:42:01 +02:00
|
|
|
char *max_prefix = common_prefix(pattern);
|
2011-09-04 12:41:59 +02:00
|
|
|
overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix);
|
|
|
|
free(max_prefix);
|
2011-07-30 19:13:47 +02:00
|
|
|
}
|
2007-11-18 10:52:55 +01:00
|
|
|
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
2009-12-14 12:43:59 +01:00
|
|
|
struct string_list_item *item;
|
|
|
|
|
2008-01-15 01:03:17 +01:00
|
|
|
if (ce->ce_flags & CE_UPDATE)
|
2008-01-14 22:54:24 +01:00
|
|
|
continue;
|
2009-01-14 15:54:35 +01:00
|
|
|
if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))
|
2007-11-18 10:52:55 +01:00
|
|
|
continue;
|
2010-06-26 01:41:35 +02:00
|
|
|
item = string_list_insert(list, ce->name);
|
2009-12-14 12:43:59 +01:00
|
|
|
if (ce_skip_worktree(ce))
|
|
|
|
item->util = item; /* better a valid pointer than a fake one */
|
2007-11-18 10:52:55 +01:00
|
|
|
}
|
|
|
|
|
2011-08-01 23:19:58 +02:00
|
|
|
return report_path_error(m, pattern, prefix);
|
2007-11-18 10:52:55 +01:00
|
|
|
}
|
|
|
|
|
2008-07-21 20:03:49 +02:00
|
|
|
static void add_remove_files(struct string_list *list)
|
2007-11-18 10:52:55 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < list->nr; i++) {
|
2008-05-09 18:11:43 +02:00
|
|
|
struct stat st;
|
2008-07-21 20:03:49 +02:00
|
|
|
struct string_list_item *p = &(list->items[i]);
|
2008-05-09 18:11:43 +02:00
|
|
|
|
2009-12-14 12:43:59 +01:00
|
|
|
/* p->util is skip-worktree */
|
|
|
|
if (p->util)
|
2009-08-20 15:46:58 +02:00
|
|
|
continue;
|
2008-05-09 18:11:43 +02:00
|
|
|
|
2008-07-21 20:03:49 +02:00
|
|
|
if (!lstat(p->string, &st)) {
|
|
|
|
if (add_to_cache(p->string, &st, 0))
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("updating files failed"));
|
2008-05-12 19:57:45 +02:00
|
|
|
} else
|
2008-07-21 20:03:49 +02:00
|
|
|
remove_file_from_cache(p->string);
|
2007-11-18 10:52:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-19 20:58:18 +02:00
|
|
|
static void create_base_index(const struct commit *current_head)
|
2008-01-13 09:30:56 +01:00
|
|
|
{
|
|
|
|
struct tree *tree;
|
|
|
|
struct unpack_trees_options opts;
|
|
|
|
struct tree_desc t;
|
|
|
|
|
2011-08-19 20:58:18 +02:00
|
|
|
if (!current_head) {
|
2008-01-13 09:30:56 +01:00
|
|
|
discard_cache();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(&opts, 0, sizeof(opts));
|
|
|
|
opts.head_idx = 1;
|
|
|
|
opts.index_only = 1;
|
|
|
|
opts.merge = 1;
|
2008-03-07 03:12:28 +01:00
|
|
|
opts.src_index = &the_index;
|
|
|
|
opts.dst_index = &the_index;
|
2008-01-13 09:30:56 +01:00
|
|
|
|
|
|
|
opts.fn = oneway_merge;
|
2011-08-19 20:58:18 +02:00
|
|
|
tree = parse_tree_indirect(current_head->object.sha1);
|
2008-01-13 09:30:56 +01:00
|
|
|
if (!tree)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("failed to unpack HEAD tree object"));
|
2008-01-13 09:30:56 +01:00
|
|
|
parse_tree(tree);
|
|
|
|
init_tree_desc(&t, tree->buffer, tree->size);
|
2008-02-07 17:39:48 +01:00
|
|
|
if (unpack_trees(1, &t, &opts))
|
|
|
|
exit(128); /* We've already reported the error, finish dying */
|
2008-01-13 09:30:56 +01:00
|
|
|
}
|
|
|
|
|
Be more user-friendly when refusing to do something because of conflict.
Various commands refuse to run in the presence of conflicts (commit,
merge, pull, cherry-pick/revert). They all used to provide rough, and
inconsistant error messages.
A new variable advice.resolveconflict is introduced, and allows more
verbose messages, pointing the user to the appropriate solution.
For commit, the error message used to look like this:
$ git commit
foo.txt: needs merge
foo.txt: unmerged (c34a92682e0394bc0d6f4d4a67a8e2d32395c169)
foo.txt: unmerged (3afcd75de8de0bb5076942fcb17446be50451030)
foo.txt: unmerged (c9785d77b76dfe4fb038bf927ee518f6ae45ede4)
error: Error building trees
The "need merge" line is given by refresh_cache. We add the IN_PORCELAIN
option to make the output more consistant with the other porcelain
commands, and catch the error in return, to stop with a clean error
message. The next lines were displayed by a call to cache_tree_update(),
which is not reached anymore if we noticed the conflict.
The new output looks like:
U foo.txt
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
Pull is slightly modified to abort immediately if $GIT_DIR/MERGE_HEAD
exists instead of waiting for merge to complain.
The behavior of merge and the test-case are slightly modified to reflect
the usual flow: start with conflicts, fix them, and afterwards get rid of
MERGE_HEAD, with different error messages at each stage.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-12 10:54:44 +01:00
|
|
|
static void refresh_cache_or_die(int refresh_flags)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* refresh_flags contains REFRESH_QUIET, so the only errors
|
|
|
|
* are for unmerged entries.
|
|
|
|
*/
|
|
|
|
if (refresh_cache(refresh_flags | REFRESH_IN_PORCELAIN))
|
|
|
|
die_resolve_conflict("commit");
|
|
|
|
}
|
|
|
|
|
2011-08-19 20:58:18 +02:00
|
|
|
static char *prepare_index(int argc, const char **argv, const char *prefix,
|
|
|
|
const struct commit *current_head, int is_status)
|
2007-11-08 17:59:00 +01:00
|
|
|
{
|
|
|
|
int fd;
|
2008-07-21 20:03:49 +02:00
|
|
|
struct string_list partial;
|
2007-11-18 10:52:55 +01:00
|
|
|
const char **pathspec = NULL;
|
2011-05-07 07:59:59 +02:00
|
|
|
char *old_index_env = NULL;
|
2009-08-05 08:49:33 +02:00
|
|
|
int refresh_flags = REFRESH_QUIET;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
if (is_status)
|
|
|
|
refresh_flags |= REFRESH_UNMERGED;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2007-11-25 17:46:29 +01:00
|
|
|
if (*argv)
|
|
|
|
pathspec = get_pathspec(prefix, argv);
|
2007-11-18 10:52:55 +01:00
|
|
|
|
2008-11-14 01:36:30 +01:00
|
|
|
if (read_cache_preload(pathspec) < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("index file corrupt"));
|
2008-11-14 01:36:30 +01:00
|
|
|
|
2011-05-07 07:59:59 +02:00
|
|
|
if (interactive) {
|
|
|
|
fd = hold_locked_index(&index_lock, 1);
|
|
|
|
|
|
|
|
refresh_cache_or_die(refresh_flags);
|
|
|
|
|
|
|
|
if (write_cache(fd, active_cache, active_nr) ||
|
|
|
|
close_lock_file(&index_lock))
|
|
|
|
die(_("unable to create temporary index"));
|
|
|
|
|
|
|
|
old_index_env = getenv(INDEX_ENVIRONMENT);
|
|
|
|
setenv(INDEX_ENVIRONMENT, index_lock.filename, 1);
|
|
|
|
|
2011-05-07 19:58:07 +02:00
|
|
|
if (interactive_add(argc, argv, prefix, patch_interactive) != 0)
|
2011-05-07 07:59:59 +02:00
|
|
|
die(_("interactive add failed"));
|
|
|
|
|
|
|
|
if (old_index_env && *old_index_env)
|
|
|
|
setenv(INDEX_ENVIRONMENT, old_index_env, 1);
|
|
|
|
else
|
|
|
|
unsetenv(INDEX_ENVIRONMENT);
|
|
|
|
|
|
|
|
discard_cache();
|
|
|
|
read_cache_from(index_lock.filename);
|
|
|
|
|
|
|
|
commit_style = COMMIT_NORMAL;
|
|
|
|
return index_lock.filename;
|
|
|
|
}
|
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
/*
|
|
|
|
* Non partial, non as-is commit.
|
|
|
|
*
|
|
|
|
* (1) get the real index;
|
|
|
|
* (2) update the_index as necessary;
|
|
|
|
* (3) write the_index out to the real index (still locked);
|
|
|
|
* (4) return the name of the locked index file.
|
|
|
|
*
|
|
|
|
* The caller should run hooks on the locked real index, and
|
|
|
|
* (A) if all goes well, commit the real index;
|
|
|
|
* (B) on failure, rollback the real index.
|
|
|
|
*/
|
|
|
|
if (all || (also && pathspec && *pathspec)) {
|
2010-04-02 14:27:19 +02:00
|
|
|
fd = hold_locked_index(&index_lock, 1);
|
2008-05-12 19:58:10 +02:00
|
|
|
add_files_to_cache(also ? prefix : NULL, pathspec, 0);
|
Be more user-friendly when refusing to do something because of conflict.
Various commands refuse to run in the presence of conflicts (commit,
merge, pull, cherry-pick/revert). They all used to provide rough, and
inconsistant error messages.
A new variable advice.resolveconflict is introduced, and allows more
verbose messages, pointing the user to the appropriate solution.
For commit, the error message used to look like this:
$ git commit
foo.txt: needs merge
foo.txt: unmerged (c34a92682e0394bc0d6f4d4a67a8e2d32395c169)
foo.txt: unmerged (3afcd75de8de0bb5076942fcb17446be50451030)
foo.txt: unmerged (c9785d77b76dfe4fb038bf927ee518f6ae45ede4)
error: Error building trees
The "need merge" line is given by refresh_cache. We add the IN_PORCELAIN
option to make the output more consistant with the other porcelain
commands, and catch the error in return, to stop with a clean error
message. The next lines were displayed by a call to cache_tree_update(),
which is not reached anymore if we noticed the conflict.
The new output looks like:
U foo.txt
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
Pull is slightly modified to abort immediately if $GIT_DIR/MERGE_HEAD
exists instead of waiting for merge to complain.
The behavior of merge and the test-case are slightly modified to reflect
the usual flow: start with conflicts, fix them, and afterwards get rid of
MERGE_HEAD, with different error messages at each stage.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-12 10:54:44 +01:00
|
|
|
refresh_cache_or_die(refresh_flags);
|
2012-01-16 03:36:46 +01:00
|
|
|
update_main_cache_tree(WRITE_TREE_SILENT);
|
2008-01-16 20:12:46 +01:00
|
|
|
if (write_cache(fd, active_cache, active_nr) ||
|
|
|
|
close_lock_file(&index_lock))
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("unable to write new_index file"));
|
2007-11-18 10:52:55 +01:00
|
|
|
commit_style = COMMIT_NORMAL;
|
|
|
|
return index_lock.filename;
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
/*
|
|
|
|
* As-is commit.
|
|
|
|
*
|
|
|
|
* (1) return the name of the real index file.
|
|
|
|
*
|
2010-04-02 14:27:18 +02:00
|
|
|
* The caller should run hooks on the real index,
|
|
|
|
* and create commit from the_index.
|
2007-11-18 10:52:55 +01:00
|
|
|
* We still need to refresh the index here.
|
|
|
|
*/
|
commit: fix "--amend --only" with no pathspec
When we do not have any pathspec, we typically disallow an
explicit "--only", because it makes no sense (your commit
would, by definition, be empty). But since 6a74642
(git-commit --amend: two fixes., 2006-04-20), we have
allowed "--amend --only" with the intent that it would amend
the commit, ignoring any contents staged in the index.
However, while that commit allowed the combination, we never
actually implemented the logic to make it work. The current
code notices that we have no pathspec and assumes we want to
do an as-is commit (i.e., the "--only" is ignored).
Instead, we must make sure to follow the partial-commit
code-path. We also need to tweak the list_paths function to
handle a NULL pathspec.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-10 22:40:29 +02:00
|
|
|
if (!only && (!pathspec || !*pathspec)) {
|
2007-11-18 10:52:55 +01:00
|
|
|
fd = hold_locked_index(&index_lock, 1);
|
Be more user-friendly when refusing to do something because of conflict.
Various commands refuse to run in the presence of conflicts (commit,
merge, pull, cherry-pick/revert). They all used to provide rough, and
inconsistant error messages.
A new variable advice.resolveconflict is introduced, and allows more
verbose messages, pointing the user to the appropriate solution.
For commit, the error message used to look like this:
$ git commit
foo.txt: needs merge
foo.txt: unmerged (c34a92682e0394bc0d6f4d4a67a8e2d32395c169)
foo.txt: unmerged (3afcd75de8de0bb5076942fcb17446be50451030)
foo.txt: unmerged (c9785d77b76dfe4fb038bf927ee518f6ae45ede4)
error: Error building trees
The "need merge" line is given by refresh_cache. We add the IN_PORCELAIN
option to make the output more consistant with the other porcelain
commands, and catch the error in return, to stop with a clean error
message. The next lines were displayed by a call to cache_tree_update(),
which is not reached anymore if we noticed the conflict.
The new output looks like:
U foo.txt
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
Pull is slightly modified to abort immediately if $GIT_DIR/MERGE_HEAD
exists instead of waiting for merge to complain.
The behavior of merge and the test-case are slightly modified to reflect
the usual flow: start with conflicts, fix them, and afterwards get rid of
MERGE_HEAD, with different error messages at each stage.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-12 10:54:44 +01:00
|
|
|
refresh_cache_or_die(refresh_flags);
|
2010-07-07 06:53:11 +02:00
|
|
|
if (active_cache_changed) {
|
2012-01-16 03:36:46 +01:00
|
|
|
update_main_cache_tree(WRITE_TREE_SILENT);
|
2010-07-07 06:53:11 +02:00
|
|
|
if (write_cache(fd, active_cache, active_nr) ||
|
|
|
|
commit_locked_index(&index_lock))
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("unable to write new_index file"));
|
2010-07-07 06:53:11 +02:00
|
|
|
} else {
|
|
|
|
rollback_lock_file(&index_lock);
|
|
|
|
}
|
2007-11-18 10:52:55 +01:00
|
|
|
commit_style = COMMIT_AS_IS;
|
2007-11-08 17:59:00 +01:00
|
|
|
return get_index_file();
|
|
|
|
}
|
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
/*
|
|
|
|
* A partial commit.
|
|
|
|
*
|
|
|
|
* (0) find the set of affected paths;
|
|
|
|
* (1) get lock on the real index file;
|
|
|
|
* (2) update the_index with the given paths;
|
|
|
|
* (3) write the_index out to the real index (still locked);
|
|
|
|
* (4) get lock on the false index file;
|
|
|
|
* (5) reset the_index from HEAD;
|
|
|
|
* (6) update the_index the same way as (2);
|
|
|
|
* (7) write the_index out to the false index file;
|
|
|
|
* (8) return the name of the false index file (still locked);
|
|
|
|
*
|
|
|
|
* The caller should run hooks on the locked false index, and
|
|
|
|
* create commit from it. Then
|
|
|
|
* (A) if all goes well, commit the real index;
|
|
|
|
* (B) on failure, rollback the real index;
|
|
|
|
* In either case, rollback the false index.
|
|
|
|
*/
|
|
|
|
commit_style = COMMIT_PARTIAL;
|
|
|
|
|
2012-04-30 17:33:13 +02:00
|
|
|
if (whence != FROM_COMMIT) {
|
|
|
|
if (whence == FROM_MERGE)
|
|
|
|
die(_("cannot do a partial commit during a merge."));
|
|
|
|
else if (whence == FROM_CHERRY_PICK)
|
|
|
|
die(_("cannot do a partial commit during a cherry-pick."));
|
|
|
|
}
|
2007-11-18 10:52:55 +01:00
|
|
|
|
|
|
|
memset(&partial, 0, sizeof(partial));
|
2008-07-21 20:03:49 +02:00
|
|
|
partial.strdup_strings = 1;
|
2011-08-19 20:58:18 +02:00
|
|
|
if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, pathspec))
|
2007-11-18 10:52:55 +01:00
|
|
|
exit(1);
|
|
|
|
|
|
|
|
discard_cache();
|
|
|
|
if (read_cache() < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("cannot read the index"));
|
2007-11-18 10:52:55 +01:00
|
|
|
|
|
|
|
fd = hold_locked_index(&index_lock, 1);
|
|
|
|
add_remove_files(&partial);
|
2007-11-12 21:48:22 +01:00
|
|
|
refresh_cache(REFRESH_QUIET);
|
2008-01-16 20:12:46 +01:00
|
|
|
if (write_cache(fd, active_cache, active_nr) ||
|
|
|
|
close_lock_file(&index_lock))
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("unable to write new_index file"));
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
fd = hold_lock_file_for_update(&false_lock,
|
2008-10-22 02:58:11 +02:00
|
|
|
git_path("next-index-%"PRIuMAX,
|
|
|
|
(uintmax_t) getpid()),
|
2008-10-18 00:44:39 +02:00
|
|
|
LOCK_DIE_ON_ERROR);
|
2008-01-13 09:30:56 +01:00
|
|
|
|
2011-08-19 20:58:18 +02:00
|
|
|
create_base_index(current_head);
|
2007-11-18 10:52:55 +01:00
|
|
|
add_remove_files(&partial);
|
2007-11-09 17:40:27 +01:00
|
|
|
refresh_cache(REFRESH_QUIET);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-01-16 20:12:46 +01:00
|
|
|
if (write_cache(fd, active_cache, active_nr) ||
|
|
|
|
close_lock_file(&false_lock))
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("unable to write temporary index file"));
|
2008-02-14 18:18:23 +01:00
|
|
|
|
|
|
|
discard_cache();
|
|
|
|
read_cache_from(false_lock.filename);
|
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
return false_lock.filename;
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn,
|
|
|
|
struct wt_status *s)
|
2007-11-08 17:59:00 +01:00
|
|
|
{
|
2009-08-08 08:31:57 +02:00
|
|
|
unsigned char sha1[20];
|
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
if (s->relative_paths)
|
|
|
|
s->prefix = prefix;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
|
|
|
if (amend) {
|
2009-08-10 06:59:30 +02:00
|
|
|
s->amend = 1;
|
|
|
|
s->reference = "HEAD^1";
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
2009-08-10 06:59:30 +02:00
|
|
|
s->verbose = verbose;
|
|
|
|
s->index_file = index_file;
|
|
|
|
s->fp = fp;
|
|
|
|
s->nowarn = nowarn;
|
2009-08-08 08:31:57 +02:00
|
|
|
s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2009-08-08 08:31:57 +02:00
|
|
|
wt_status_collect(s);
|
2009-09-05 10:59:56 +02:00
|
|
|
|
|
|
|
switch (status_format) {
|
|
|
|
case STATUS_FORMAT_SHORT:
|
2012-05-07 23:09:04 +02:00
|
|
|
wt_shortstatus_print(s);
|
2009-09-05 10:59:56 +02:00
|
|
|
break;
|
|
|
|
case STATUS_FORMAT_PORCELAIN:
|
2012-05-07 21:44:44 +02:00
|
|
|
wt_porcelain_print(s);
|
2009-09-05 10:59:56 +02:00
|
|
|
break;
|
|
|
|
case STATUS_FORMAT_LONG:
|
|
|
|
wt_status_print(s);
|
|
|
|
break;
|
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
return s->commitable;
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2011-08-19 20:58:18 +02:00
|
|
|
static int is_a_merge(const struct commit *current_head)
|
2008-02-05 11:01:46 +01:00
|
|
|
{
|
2011-08-19 20:58:18 +02:00
|
|
|
return !!(current_head->parents && current_head->parents->next);
|
2008-02-05 11:01:46 +01:00
|
|
|
}
|
|
|
|
|
2007-11-08 17:59:00 +01:00
|
|
|
static const char sign_off_header[] = "Signed-off-by: ";
|
|
|
|
|
2012-03-11 11:12:10 +01:00
|
|
|
static void export_one(const char *var, const char *s, const char *e, int hack)
|
|
|
|
{
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
if (hack)
|
|
|
|
strbuf_addch(&buf, hack);
|
|
|
|
strbuf_addf(&buf, "%.*s", (int)(e - s), s);
|
|
|
|
setenv(var, buf.buf, 1);
|
|
|
|
strbuf_release(&buf);
|
|
|
|
}
|
|
|
|
|
2012-08-31 23:54:18 +02:00
|
|
|
static int sane_ident_split(struct ident_split *person)
|
|
|
|
{
|
|
|
|
if (!person->name_begin || !person->name_end ||
|
|
|
|
person->name_begin == person->name_end)
|
|
|
|
return 0; /* no human readable name */
|
|
|
|
if (!person->mail_begin || !person->mail_end ||
|
|
|
|
person->mail_begin == person->mail_end)
|
|
|
|
return 0; /* no usable mail */
|
|
|
|
if (!person->date_begin || !person->date_end ||
|
|
|
|
!person->tz_begin || !person->tz_end)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2010-12-21 02:00:36 +01:00
|
|
|
static void determine_author_info(struct strbuf *author_ident)
|
2008-05-04 18:04:49 +02:00
|
|
|
{
|
|
|
|
char *name, *email, *date;
|
2012-03-11 11:12:10 +01:00
|
|
|
struct ident_split author;
|
2008-05-04 18:04:49 +02:00
|
|
|
|
|
|
|
name = getenv("GIT_AUTHOR_NAME");
|
|
|
|
email = getenv("GIT_AUTHOR_EMAIL");
|
|
|
|
date = getenv("GIT_AUTHOR_DATE");
|
|
|
|
|
2011-02-20 05:12:29 +01:00
|
|
|
if (author_message) {
|
2008-05-04 18:04:49 +02:00
|
|
|
const char *a, *lb, *rb, *eol;
|
2012-02-02 22:41:43 +01:00
|
|
|
size_t len;
|
2008-05-04 18:04:49 +02:00
|
|
|
|
2011-02-20 05:12:29 +01:00
|
|
|
a = strstr(author_message_buffer, "\nauthor ");
|
2008-05-04 18:04:49 +02:00
|
|
|
if (!a)
|
2011-04-02 02:55:55 +02:00
|
|
|
die(_("invalid commit: %s"), author_message);
|
2008-05-04 18:04:49 +02:00
|
|
|
|
2010-05-02 10:57:12 +02:00
|
|
|
lb = strchrnul(a + strlen("\nauthor "), '<');
|
|
|
|
rb = strchrnul(lb, '>');
|
|
|
|
eol = strchrnul(rb, '\n');
|
|
|
|
if (!*lb || !*rb || !*eol)
|
2011-04-02 02:55:55 +02:00
|
|
|
die(_("invalid commit: %s"), author_message);
|
2008-05-04 18:04:49 +02:00
|
|
|
|
2010-05-02 10:57:12 +02:00
|
|
|
if (lb == a + strlen("\nauthor "))
|
|
|
|
/* \nauthor <foo@example.com> */
|
|
|
|
name = xcalloc(1, 1);
|
|
|
|
else
|
|
|
|
name = xmemdupz(a + strlen("\nauthor "),
|
|
|
|
(lb - strlen(" ") -
|
|
|
|
(a + strlen("\nauthor "))));
|
|
|
|
email = xmemdupz(lb + strlen("<"), rb - (lb + strlen("<")));
|
|
|
|
date = xmemdupz(rb + strlen("> "), eol - (rb + strlen("> ")));
|
2012-02-02 22:41:43 +01:00
|
|
|
len = eol - (rb + strlen("> "));
|
|
|
|
date = xmalloc(len + 2);
|
|
|
|
*date = '@';
|
|
|
|
memcpy(date + 1, rb + strlen("> "), len);
|
|
|
|
date[len + 1] = '\0';
|
2008-05-04 18:04:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (force_author) {
|
|
|
|
const char *lb = strstr(force_author, " <");
|
|
|
|
const char *rb = strchr(force_author, '>');
|
|
|
|
|
|
|
|
if (!lb || !rb)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("malformed --author parameter"));
|
2008-05-04 18:04:49 +02:00
|
|
|
name = xstrndup(force_author, lb - force_author);
|
|
|
|
email = xstrndup(lb + 2, rb - (lb + 2));
|
|
|
|
}
|
|
|
|
|
2009-12-02 23:16:18 +01:00
|
|
|
if (force_date)
|
|
|
|
date = force_date;
|
2012-05-25 01:28:40 +02:00
|
|
|
strbuf_addstr(author_ident, fmt_ident(name, email, date, IDENT_STRICT));
|
2012-08-31 23:54:18 +02:00
|
|
|
if (!split_ident_line(&author, author_ident->buf, author_ident->len) &&
|
|
|
|
sane_ident_split(&author)) {
|
2012-03-11 11:12:10 +01:00
|
|
|
export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0);
|
|
|
|
export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0);
|
|
|
|
export_one("GIT_AUTHOR_DATE", author.date_begin, author.tz_end, '@');
|
|
|
|
}
|
2008-05-04 18:04:49 +02:00
|
|
|
}
|
|
|
|
|
2009-10-28 18:13:44 +01:00
|
|
|
static int ends_rfc2822_footer(struct strbuf *sb)
|
|
|
|
{
|
|
|
|
int ch;
|
|
|
|
int hit = 0;
|
|
|
|
int i, j, k;
|
|
|
|
int len = sb->len;
|
|
|
|
int first = 1;
|
|
|
|
const char *buf = sb->buf;
|
|
|
|
|
|
|
|
for (i = len - 1; i > 0; i--) {
|
|
|
|
if (hit && buf[i] == '\n')
|
|
|
|
break;
|
|
|
|
hit = (buf[i] == '\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
while (i < len - 1 && buf[i] == '\n')
|
|
|
|
i++;
|
|
|
|
|
|
|
|
for (; i < len; i = k) {
|
|
|
|
for (k = i; k < len && buf[k] != '\n'; k++)
|
|
|
|
; /* do nothing */
|
|
|
|
k++;
|
|
|
|
|
|
|
|
if ((buf[k] == ' ' || buf[k] == '\t') && !first)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
first = 0;
|
|
|
|
|
|
|
|
for (j = 0; i + j < len; j++) {
|
|
|
|
ch = buf[i + j];
|
|
|
|
if (ch == ':')
|
|
|
|
break;
|
|
|
|
if (isalnum(ch) ||
|
|
|
|
(ch == '-'))
|
|
|
|
continue;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2010-12-21 02:00:36 +01:00
|
|
|
static char *cut_ident_timestamp_part(char *string)
|
|
|
|
{
|
|
|
|
char *ket = strrchr(string, '>');
|
|
|
|
if (!ket || ket[1] != ' ')
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("Malformed ident string: '%s'"), string);
|
2010-12-21 02:00:36 +01:00
|
|
|
*++ket = '\0';
|
|
|
|
return ket;
|
|
|
|
}
|
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
static int prepare_to_commit(const char *index_file, const char *prefix,
|
2011-08-19 20:58:18 +02:00
|
|
|
struct commit *current_head,
|
2010-12-21 02:00:36 +01:00
|
|
|
struct wt_status *s,
|
|
|
|
struct strbuf *author_ident)
|
2007-11-08 17:59:00 +01:00
|
|
|
{
|
|
|
|
struct stat statbuf;
|
2010-12-21 02:00:36 +01:00
|
|
|
struct strbuf committer_ident = STRBUF_INIT;
|
2007-11-18 21:01:38 +01:00
|
|
|
int commitable, saved_color_setting;
|
2008-10-09 21:12:12 +02:00
|
|
|
struct strbuf sb = STRBUF_INIT;
|
2007-11-08 17:59:00 +01:00
|
|
|
char *buffer;
|
2008-02-05 08:04:18 +01:00
|
|
|
const char *hook_arg1 = NULL;
|
|
|
|
const char *hook_arg2 = NULL;
|
2008-05-04 18:04:51 +02:00
|
|
|
int ident_shown = 0;
|
2011-05-08 12:31:02 +02:00
|
|
|
int clean_message_contents = (cleanup_mode != CLEANUP_NONE);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2012-03-11 11:12:10 +01:00
|
|
|
/* This checks and barfs if author is badly specified */
|
|
|
|
determine_author_info(author_ident);
|
|
|
|
|
2008-02-05 11:01:46 +01:00
|
|
|
if (!no_verify && run_hook(index_file, "pre-commit", NULL))
|
|
|
|
return 0;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2010-11-02 20:59:11 +01:00
|
|
|
if (squash_message) {
|
|
|
|
/*
|
|
|
|
* Insert the proper subject line before other commit
|
|
|
|
* message options add their content.
|
|
|
|
*/
|
|
|
|
if (use_message && !strcmp(use_message, squash_message))
|
|
|
|
strbuf_addstr(&sb, "squash! ");
|
|
|
|
else {
|
|
|
|
struct pretty_print_context ctx = {0};
|
|
|
|
struct commit *c;
|
|
|
|
c = lookup_commit_reference_by_name(squash_message);
|
|
|
|
if (!c)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("could not lookup commit %s"), squash_message);
|
2010-11-02 20:59:11 +01:00
|
|
|
ctx.output_encoding = get_commit_output_encoding();
|
|
|
|
format_commit_message(c, "squash! %s\n\n", &sb,
|
|
|
|
&ctx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-11 18:36:39 +01:00
|
|
|
if (message.len) {
|
|
|
|
strbuf_addbuf(&sb, &message);
|
2008-02-05 08:04:18 +01:00
|
|
|
hook_arg1 = "message";
|
2007-11-08 17:59:00 +01:00
|
|
|
} else if (logfile && !strcmp(logfile, "-")) {
|
|
|
|
if (isatty(0))
|
2011-02-23 00:41:44 +01:00
|
|
|
fprintf(stderr, _("(reading log message from standard input)\n"));
|
2007-11-08 17:59:00 +01:00
|
|
|
if (strbuf_read(&sb, 0, 0) < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not read log from standard input"));
|
2008-02-05 08:04:18 +01:00
|
|
|
hook_arg1 = "message";
|
2007-11-08 17:59:00 +01:00
|
|
|
} else if (logfile) {
|
|
|
|
if (strbuf_read_file(&sb, logfile, 0) < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not read log file '%s'"),
|
2009-06-27 17:58:46 +02:00
|
|
|
logfile);
|
2008-02-05 08:04:18 +01:00
|
|
|
hook_arg1 = "message";
|
2007-11-08 17:59:00 +01:00
|
|
|
} else if (use_message) {
|
|
|
|
buffer = strstr(use_message_buffer, "\n\n");
|
2012-07-09 20:53:26 +02:00
|
|
|
if (!use_editor && (!buffer || buffer[2] == '\0'))
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("commit has empty message"));
|
2007-11-08 17:59:00 +01:00
|
|
|
strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
|
2008-02-05 08:04:18 +01:00
|
|
|
hook_arg1 = "commit";
|
|
|
|
hook_arg2 = use_message;
|
2010-11-02 20:59:09 +01:00
|
|
|
} else if (fixup_message) {
|
|
|
|
struct pretty_print_context ctx = {0};
|
|
|
|
struct commit *commit;
|
|
|
|
commit = lookup_commit_reference_by_name(fixup_message);
|
|
|
|
if (!commit)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("could not lookup commit %s"), fixup_message);
|
2010-11-02 20:59:09 +01:00
|
|
|
ctx.output_encoding = get_commit_output_encoding();
|
|
|
|
format_commit_message(commit, "fixup! %s\n\n",
|
|
|
|
&sb, &ctx);
|
|
|
|
hook_arg1 = "message";
|
2007-11-08 17:59:00 +01:00
|
|
|
} else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
|
|
|
|
if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not read MERGE_MSG"));
|
2008-02-05 08:04:18 +01:00
|
|
|
hook_arg1 = "merge";
|
2007-11-08 17:59:00 +01:00
|
|
|
} else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
|
|
|
|
if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not read SQUASH_MSG"));
|
2008-02-05 08:04:18 +01:00
|
|
|
hook_arg1 = "squash";
|
2011-02-25 10:07:57 +01:00
|
|
|
} else if (template_file) {
|
2007-11-08 17:59:00 +01:00
|
|
|
if (strbuf_read_file(&sb, template_file, 0) < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not read '%s'"), template_file);
|
2008-02-05 08:04:18 +01:00
|
|
|
hook_arg1 = "template";
|
2011-05-08 12:31:02 +02:00
|
|
|
clean_message_contents = 0;
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2008-02-05 08:04:18 +01:00
|
|
|
/*
|
2011-02-20 05:12:29 +01:00
|
|
|
* The remaining cases don't modify the template message, but
|
|
|
|
* just set the argument(s) to the prepare-commit-msg hook.
|
2008-02-05 08:04:18 +01:00
|
|
|
*/
|
2011-02-20 05:12:29 +01:00
|
|
|
else if (whence == FROM_MERGE)
|
2008-02-05 08:04:18 +01:00
|
|
|
hook_arg1 = "merge";
|
2011-02-20 05:12:29 +01:00
|
|
|
else if (whence == FROM_CHERRY_PICK) {
|
|
|
|
hook_arg1 = "commit";
|
|
|
|
hook_arg2 = "CHERRY_PICK_HEAD";
|
|
|
|
}
|
2008-02-05 08:04:18 +01:00
|
|
|
|
2010-11-02 20:59:11 +01:00
|
|
|
if (squash_message) {
|
|
|
|
/*
|
|
|
|
* If squash_commit was used for the commit subject,
|
|
|
|
* then we're possibly hijacking other commit log options.
|
|
|
|
* Reset the hook args to tell the real story.
|
|
|
|
*/
|
|
|
|
hook_arg1 = "message";
|
|
|
|
hook_arg2 = "";
|
|
|
|
}
|
|
|
|
|
2011-02-26 06:10:49 +01:00
|
|
|
s->fp = fopen(git_path(commit_editmsg), "w");
|
|
|
|
if (s->fp == NULL)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not open '%s'"), git_path(commit_editmsg));
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2011-05-08 12:31:02 +02:00
|
|
|
if (clean_message_contents)
|
2007-12-22 19:46:24 +01:00
|
|
|
stripspace(&sb, 0);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
|
|
|
if (signoff) {
|
2008-10-09 21:12:12 +02:00
|
|
|
struct strbuf sob = STRBUF_INIT;
|
2007-11-11 18:35:58 +01:00
|
|
|
int i;
|
|
|
|
|
|
|
|
strbuf_addstr(&sob, sign_off_header);
|
2007-12-02 22:43:34 +01:00
|
|
|
strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
|
|
|
|
getenv("GIT_COMMITTER_EMAIL")));
|
2007-11-11 18:35:58 +01:00
|
|
|
strbuf_addch(&sob, '\n');
|
|
|
|
for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
|
|
|
|
; /* do nothing */
|
2007-11-11 18:36:27 +01:00
|
|
|
if (prefixcmp(sb.buf + i, sob.buf)) {
|
2009-11-07 08:06:06 +01:00
|
|
|
if (!i || !ends_rfc2822_footer(&sb))
|
2007-11-11 18:36:27 +01:00
|
|
|
strbuf_addch(&sb, '\n');
|
2007-11-11 18:35:58 +01:00
|
|
|
strbuf_addbuf(&sb, &sob);
|
2007-11-11 18:36:27 +01:00
|
|
|
}
|
2007-11-11 18:35:58 +01:00
|
|
|
strbuf_release(&sob);
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2011-02-26 06:10:49 +01:00
|
|
|
if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not write commit template"));
|
2007-11-11 18:35:58 +01:00
|
|
|
|
2007-11-08 17:59:00 +01:00
|
|
|
strbuf_release(&sb);
|
|
|
|
|
2008-05-04 18:04:51 +02:00
|
|
|
/* This checks if committer ident is explicitly given */
|
commit: check committer identity more strictly
The identity of the committer will ultimately be pulled from
the ident code by commit_tree(). However, we make an attempt
to check the author and committer identity early, before the
user has done any manual work like inputting a commit
message. That lets us abort without them having to worry
about salvaging the work from .git/COMMIT_EDITMSG.
The early check for committer ident does not use the
IDENT_STRICT flag, meaning that it would not find an empty
name field. The motivation was presumably because we did not
want to be too restrictive, as later calls might be more lax
(for example, when we create the reflog entry, we do not
care too much about a real name). However, because
commit_tree will always get a strict identity to put in the
commit object itself, there is no point in being lax only to
die later (and in fact it is harmful, because the user will
have wasted time typing their commit message).
Incidentally, this bug was masked prior to 060d4bb, as the
initial loose call would taint the later strict call. So the
commit would succeed (albeit with a bogus committer line in
the commit object), and nobody noticed that our early check
did not match the later one.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-23 20:50:35 +02:00
|
|
|
strbuf_addstr(&committer_ident, git_committer_info(IDENT_STRICT));
|
2009-12-07 23:45:27 +01:00
|
|
|
if (use_editor && include_status) {
|
2010-12-21 02:00:36 +01:00
|
|
|
char *ai_tmp, *ci_tmp;
|
2011-02-20 05:12:29 +01:00
|
|
|
if (whence != FROM_COMMIT)
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL,
|
2012-04-30 17:33:13 +02:00
|
|
|
whence == FROM_MERGE
|
|
|
|
? _("\n"
|
|
|
|
"It looks like you may be committing a merge.\n"
|
|
|
|
"If this is not correct, please remove the file\n"
|
|
|
|
" %s\n"
|
|
|
|
"and try again.\n")
|
|
|
|
: _("\n"
|
|
|
|
"It looks like you may be committing a cherry-pick.\n"
|
|
|
|
"If this is not correct, please remove the file\n"
|
|
|
|
" %s\n"
|
|
|
|
"and try again.\n"),
|
2011-02-20 05:12:29 +01:00
|
|
|
git_path(whence == FROM_MERGE
|
|
|
|
? "MERGE_HEAD"
|
|
|
|
: "CHERRY_PICK_HEAD"));
|
2008-02-05 11:01:46 +01:00
|
|
|
|
2011-02-26 06:11:37 +01:00
|
|
|
fprintf(s->fp, "\n");
|
2008-02-05 11:01:46 +01:00
|
|
|
if (cleanup_mode == CLEANUP_ALL)
|
2012-04-30 17:33:14 +02:00
|
|
|
status_printf(s, GIT_COLOR_NORMAL,
|
|
|
|
_("Please enter the commit message for your changes."
|
|
|
|
" Lines starting\nwith '#' will be ignored, and an empty"
|
2011-02-23 00:41:48 +01:00
|
|
|
" message aborts the commit.\n"));
|
2008-02-05 11:01:46 +01:00
|
|
|
else /* CLEANUP_SPACE, that is. */
|
2012-04-30 17:33:14 +02:00
|
|
|
status_printf(s, GIT_COLOR_NORMAL,
|
|
|
|
_("Please enter the commit message for your changes."
|
|
|
|
" Lines starting\n"
|
2011-02-26 06:11:37 +01:00
|
|
|
"with '#' will be kept; you may remove them"
|
2008-07-31 09:36:09 +02:00
|
|
|
" yourself if you want to.\n"
|
2011-02-23 00:41:48 +01:00
|
|
|
"An empty message aborts the commit.\n"));
|
2008-02-05 11:01:46 +01:00
|
|
|
if (only_include_assumed)
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL,
|
|
|
|
"%s", only_include_assumed);
|
2008-02-05 11:01:46 +01:00
|
|
|
|
2010-12-21 02:00:36 +01:00
|
|
|
ai_tmp = cut_ident_timestamp_part(author_ident->buf);
|
|
|
|
ci_tmp = cut_ident_timestamp_part(committer_ident.buf);
|
|
|
|
if (strcmp(author_ident->buf, committer_ident.buf))
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL,
|
2011-02-23 00:41:46 +01:00
|
|
|
_("%s"
|
|
|
|
"Author: %s"),
|
2011-02-26 06:11:37 +01:00
|
|
|
ident_shown++ ? "" : "\n",
|
2010-12-21 02:00:36 +01:00
|
|
|
author_ident->buf);
|
2008-05-04 18:04:50 +02:00
|
|
|
|
2010-01-17 22:54:28 +01:00
|
|
|
if (!user_ident_sufficiently_given())
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL,
|
2011-02-23 00:41:46 +01:00
|
|
|
_("%s"
|
|
|
|
"Committer: %s"),
|
2011-02-26 06:11:37 +01:00
|
|
|
ident_shown++ ? "" : "\n",
|
2010-12-21 02:00:36 +01:00
|
|
|
committer_ident.buf);
|
2008-05-04 18:04:51 +02:00
|
|
|
|
|
|
|
if (ident_shown)
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL, "");
|
2008-05-04 18:04:51 +02:00
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
saved_color_setting = s->use_color;
|
|
|
|
s->use_color = 0;
|
2011-02-26 06:10:49 +01:00
|
|
|
commitable = run_status(s->fp, index_file, prefix, 1, s);
|
2009-08-10 06:59:30 +02:00
|
|
|
s->use_color = saved_color_setting;
|
2010-12-21 02:00:36 +01:00
|
|
|
|
|
|
|
*ai_tmp = ' ';
|
|
|
|
*ci_tmp = ' ';
|
2008-02-05 11:01:46 +01:00
|
|
|
} else {
|
2007-12-23 04:22:29 +01:00
|
|
|
unsigned char sha1[20];
|
2007-12-20 04:23:03 +01:00
|
|
|
const char *parent = "HEAD";
|
2007-11-28 22:13:08 +01:00
|
|
|
|
|
|
|
if (!active_nr && read_cache() < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("Cannot read index"));
|
2007-11-28 22:13:08 +01:00
|
|
|
|
2007-12-20 04:23:03 +01:00
|
|
|
if (amend)
|
|
|
|
parent = "HEAD^1";
|
|
|
|
|
2007-12-23 04:22:29 +01:00
|
|
|
if (get_sha1(parent, sha1))
|
2008-02-05 11:01:46 +01:00
|
|
|
commitable = !!active_nr;
|
2009-02-10 15:30:35 +01:00
|
|
|
else
|
|
|
|
commitable = index_differs_from(parent, 0);
|
2008-02-05 11:01:46 +01:00
|
|
|
}
|
2010-12-21 02:00:36 +01:00
|
|
|
strbuf_release(&committer_ident);
|
2007-12-23 04:22:29 +01:00
|
|
|
|
2011-02-26 06:10:49 +01:00
|
|
|
fclose(s->fp);
|
2007-11-28 22:13:08 +01:00
|
|
|
|
2011-02-20 05:12:29 +01:00
|
|
|
/*
|
|
|
|
* Reject an attempt to record a non-merge empty commit without
|
|
|
|
* explicit --allow-empty. In the cherry-pick case, it may be
|
|
|
|
* empty due to conflict resolution, which the user should okay.
|
|
|
|
*/
|
|
|
|
if (!commitable && whence != FROM_MERGE && !allow_empty &&
|
2011-08-19 20:58:18 +02:00
|
|
|
!(amend && is_a_merge(current_head))) {
|
2009-08-10 06:59:30 +02:00
|
|
|
run_status(stdout, index_file, prefix, 0, s);
|
2010-06-07 02:41:46 +02:00
|
|
|
if (amend)
|
2011-02-23 00:41:49 +01:00
|
|
|
fputs(_(empty_amend_advice), stderr);
|
2011-02-20 05:12:29 +01:00
|
|
|
else if (whence == FROM_CHERRY_PICK)
|
2011-04-02 02:55:55 +02:00
|
|
|
fputs(_(empty_cherry_pick_advice), stderr);
|
2008-02-05 11:01:46 +01:00
|
|
|
return 0;
|
2007-11-28 22:13:08 +01:00
|
|
|
}
|
|
|
|
|
2008-02-05 11:01:46 +01:00
|
|
|
/*
|
|
|
|
* Re-read the index as pre-commit hook could have updated it,
|
|
|
|
* and write it out as a tree. We must do this before we invoke
|
|
|
|
* the editor and after we invoke run_status above.
|
|
|
|
*/
|
|
|
|
discard_cache();
|
|
|
|
read_cache_from(index_file);
|
2011-12-06 18:43:37 +01:00
|
|
|
if (update_main_cache_tree(0)) {
|
2011-02-23 00:41:44 +01:00
|
|
|
error(_("Error building trees"));
|
2008-02-05 11:01:46 +01:00
|
|
|
return 0;
|
2007-11-28 22:13:08 +01:00
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-02-05 08:04:18 +01:00
|
|
|
if (run_hook(index_file, "prepare-commit-msg",
|
|
|
|
git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))
|
|
|
|
return 0;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-02-05 11:01:46 +01:00
|
|
|
if (use_editor) {
|
|
|
|
char index[PATH_MAX];
|
2010-05-14 11:31:33 +02:00
|
|
|
const char *env[2] = { NULL };
|
|
|
|
env[0] = index;
|
2008-02-05 11:01:46 +01:00
|
|
|
snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
|
2008-07-25 18:28:42 +02:00
|
|
|
if (launch_editor(git_path(commit_editmsg), NULL, env)) {
|
|
|
|
fprintf(stderr,
|
2011-02-23 00:41:44 +01:00
|
|
|
_("Please supply the message using either -m or -F option.\n"));
|
2008-07-25 18:28:42 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
2008-02-05 11:01:46 +01:00
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-02-05 11:01:46 +01:00
|
|
|
if (!no_verify &&
|
|
|
|
run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) {
|
|
|
|
return 0;
|
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-02-05 11:01:46 +01:00
|
|
|
return 1;
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2012-03-30 21:14:33 +02:00
|
|
|
static int rest_is_empty(struct strbuf *sb, int start)
|
2007-11-08 17:59:00 +01:00
|
|
|
{
|
2012-03-30 21:14:33 +02:00
|
|
|
int i, eol;
|
2007-11-08 17:59:00 +01:00
|
|
|
const char *nl;
|
|
|
|
|
|
|
|
/* Check if the rest is just whitespace and Signed-of-by's. */
|
|
|
|
for (i = start; i < sb->len; i++) {
|
|
|
|
nl = memchr(sb->buf + i, '\n', sb->len - i);
|
|
|
|
if (nl)
|
|
|
|
eol = nl - sb->buf;
|
|
|
|
else
|
|
|
|
eol = sb->len;
|
|
|
|
|
|
|
|
if (strlen(sign_off_header) <= eol - i &&
|
|
|
|
!prefixcmp(sb->buf + i, sign_off_header)) {
|
|
|
|
i = eol;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
while (i < eol)
|
|
|
|
if (!isspace(sb->buf[i++]))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-03-30 21:14:33 +02:00
|
|
|
/*
|
|
|
|
* Find out if the message in the strbuf contains only whitespace and
|
|
|
|
* Signed-off-by lines.
|
|
|
|
*/
|
|
|
|
static int message_is_empty(struct strbuf *sb)
|
|
|
|
{
|
|
|
|
if (cleanup_mode == CLEANUP_NONE && sb->len)
|
|
|
|
return 0;
|
|
|
|
return rest_is_empty(sb, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* See if the user edited the message in the editor or left what
|
|
|
|
* was in the template intact
|
|
|
|
*/
|
|
|
|
static int template_untouched(struct strbuf *sb)
|
|
|
|
{
|
|
|
|
struct strbuf tmpl = STRBUF_INIT;
|
|
|
|
char *start;
|
|
|
|
|
|
|
|
if (cleanup_mode == CLEANUP_NONE && sb->len)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!template_file || strbuf_read_file(&tmpl, template_file, 0) <= 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
|
|
|
|
start = (char *)skip_prefix(sb->buf, tmpl.buf);
|
|
|
|
if (!start)
|
|
|
|
start = sb->buf;
|
|
|
|
strbuf_release(&tmpl);
|
|
|
|
return rest_is_empty(sb, start - sb->buf);
|
|
|
|
}
|
|
|
|
|
2008-08-27 08:13:13 +02:00
|
|
|
static const char *find_author_by_nickname(const char *name)
|
|
|
|
{
|
|
|
|
struct rev_info revs;
|
|
|
|
struct commit *commit;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
const char *av[20];
|
|
|
|
int ac = 0;
|
|
|
|
|
|
|
|
init_revisions(&revs, NULL);
|
|
|
|
strbuf_addf(&buf, "--author=%s", name);
|
|
|
|
av[++ac] = "--all";
|
|
|
|
av[++ac] = "-i";
|
|
|
|
av[++ac] = buf.buf;
|
|
|
|
av[++ac] = NULL;
|
|
|
|
setup_revisions(ac, av, &revs, NULL);
|
|
|
|
prepare_revision_walk(&revs);
|
|
|
|
commit = get_revision(&revs);
|
|
|
|
if (commit) {
|
2009-10-19 17:48:08 +02:00
|
|
|
struct pretty_print_context ctx = {0};
|
|
|
|
ctx.date_mode = DATE_NORMAL;
|
2008-08-27 08:13:13 +02:00
|
|
|
strbuf_release(&buf);
|
2009-10-19 17:48:08 +02:00
|
|
|
format_commit_message(commit, "%an <%ae>", &buf, &ctx);
|
2008-08-27 08:13:13 +02:00
|
|
|
return strbuf_detach(&buf, NULL);
|
|
|
|
}
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("No existing author found with '%s'"), name);
|
2008-08-27 08:13:13 +02:00
|
|
|
}
|
|
|
|
|
2009-08-08 08:31:57 +02:00
|
|
|
|
|
|
|
static void handle_untracked_files_arg(struct wt_status *s)
|
|
|
|
{
|
|
|
|
if (!untracked_files_arg)
|
|
|
|
; /* default already initialized */
|
|
|
|
else if (!strcmp(untracked_files_arg, "no"))
|
|
|
|
s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
|
|
|
|
else if (!strcmp(untracked_files_arg, "normal"))
|
|
|
|
s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
|
|
|
|
else if (!strcmp(untracked_files_arg, "all"))
|
|
|
|
s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
|
|
|
|
else
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("Invalid untracked files mode '%s'"), untracked_files_arg);
|
2009-08-08 08:31:57 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 05:12:29 +01:00
|
|
|
static const char *read_commit_message(const char *name)
|
|
|
|
{
|
|
|
|
const char *out_enc, *out;
|
|
|
|
struct commit *commit;
|
|
|
|
|
|
|
|
commit = lookup_commit_reference_by_name(name);
|
|
|
|
if (!commit)
|
2011-04-02 02:55:55 +02:00
|
|
|
die(_("could not lookup commit %s"), name);
|
2011-02-20 05:12:29 +01:00
|
|
|
out_enc = get_commit_output_encoding();
|
|
|
|
out = logmsg_reencode(commit, out_enc);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we failed to reencode the buffer, just copy it
|
|
|
|
* byte for byte so the user can try to fix it up.
|
|
|
|
* This also handles the case where input and output
|
|
|
|
* encodings are identical.
|
|
|
|
*/
|
|
|
|
if (out == NULL)
|
|
|
|
out = xstrdup(commit->buffer);
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
2007-12-03 06:02:09 +01:00
|
|
|
static int parse_and_validate_options(int argc, const char *argv[],
|
2012-05-07 21:18:26 +02:00
|
|
|
const struct option *options,
|
2008-08-06 20:43:47 +02:00
|
|
|
const char * const usage[],
|
2009-08-10 06:59:30 +02:00
|
|
|
const char *prefix,
|
2011-08-19 20:58:18 +02:00
|
|
|
struct commit *current_head,
|
2009-08-10 06:59:30 +02:00
|
|
|
struct wt_status *s)
|
2007-11-08 17:59:00 +01:00
|
|
|
{
|
|
|
|
int f = 0;
|
|
|
|
|
2012-05-07 21:18:26 +02:00
|
|
|
argc = parse_options(argc, argv, prefix, options, usage, 0);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-08-27 08:13:13 +02:00
|
|
|
if (force_author && !strchr(force_author, '>'))
|
|
|
|
force_author = find_author_by_nickname(force_author);
|
|
|
|
|
2009-11-04 04:20:11 +01:00
|
|
|
if (force_author && renew_authorship)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("Using both --reset-author and --author does not make sense"));
|
2009-11-04 04:20:11 +01:00
|
|
|
|
2010-11-02 20:59:09 +01:00
|
|
|
if (logfile || message.len || use_message || fixup_message)
|
2007-12-23 04:25:37 +01:00
|
|
|
use_editor = 0;
|
2011-12-06 22:09:55 +01:00
|
|
|
if (0 <= edit_flag)
|
|
|
|
use_editor = edit_flag;
|
2008-02-05 11:01:45 +01:00
|
|
|
if (!use_editor)
|
|
|
|
setenv("GIT_EDITOR", ":", 1);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
|
|
|
/* Sanity check options */
|
2011-08-19 20:58:18 +02:00
|
|
|
if (amend && !current_head)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("You have nothing to amend."));
|
2012-04-30 17:33:13 +02:00
|
|
|
if (amend && whence != FROM_COMMIT) {
|
|
|
|
if (whence == FROM_MERGE)
|
|
|
|
die(_("You are in the middle of a merge -- cannot amend."));
|
|
|
|
else if (whence == FROM_CHERRY_PICK)
|
|
|
|
die(_("You are in the middle of a cherry-pick -- cannot amend."));
|
|
|
|
}
|
2010-11-02 20:59:11 +01:00
|
|
|
if (fixup_message && squash_message)
|
2011-02-23 00:41:45 +01:00
|
|
|
die(_("Options --squash and --fixup cannot be used together"));
|
2007-11-08 17:59:00 +01:00
|
|
|
if (use_message)
|
|
|
|
f++;
|
|
|
|
if (edit_message)
|
|
|
|
f++;
|
2010-11-02 20:59:09 +01:00
|
|
|
if (fixup_message)
|
|
|
|
f++;
|
2007-11-08 17:59:00 +01:00
|
|
|
if (logfile)
|
|
|
|
f++;
|
|
|
|
if (f > 1)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("Only one of -c/-C/-F/--fixup can be used."));
|
2007-11-11 18:36:39 +01:00
|
|
|
if (message.len && f > 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die((_("Option -m cannot be combined with -c/-C/-F/--fixup.")));
|
2012-03-30 20:30:59 +02:00
|
|
|
if (f || message.len)
|
|
|
|
template_file = NULL;
|
2007-11-08 17:59:00 +01:00
|
|
|
if (edit_message)
|
|
|
|
use_message = edit_message;
|
2010-11-02 20:59:09 +01:00
|
|
|
if (amend && !use_message && !fixup_message)
|
2007-11-08 17:59:00 +01:00
|
|
|
use_message = "HEAD";
|
2011-02-20 05:12:29 +01:00
|
|
|
if (!use_message && whence != FROM_CHERRY_PICK && renew_authorship)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("--reset-author can be used only with -C, -c or --amend."));
|
2007-11-08 17:59:00 +01:00
|
|
|
if (use_message) {
|
2011-02-20 05:12:29 +01:00
|
|
|
use_message_buffer = read_commit_message(use_message);
|
|
|
|
if (!renew_authorship) {
|
|
|
|
author_message = use_message;
|
|
|
|
author_message_buffer = use_message_buffer;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (whence == FROM_CHERRY_PICK && !renew_authorship) {
|
|
|
|
author_message = "CHERRY_PICK_HEAD";
|
|
|
|
author_message_buffer = read_commit_message(author_message);
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2011-05-07 19:58:07 +02:00
|
|
|
if (patch_interactive)
|
|
|
|
interactive = 1;
|
|
|
|
|
2007-11-08 17:59:00 +01:00
|
|
|
if (!!also + !!only + !!all + !!interactive > 1)
|
2011-05-07 19:58:07 +02:00
|
|
|
die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
|
2007-11-08 17:59:00 +01:00
|
|
|
if (argc == 0 && (also || (only && !amend)))
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("No paths with --include/--only does not make sense."));
|
2007-11-08 17:59:00 +01:00
|
|
|
if (argc == 0 && only && amend)
|
2011-02-23 00:41:44 +01:00
|
|
|
only_include_assumed = _("Clever... amending the last one with dirty index.");
|
2008-04-10 13:33:08 +02:00
|
|
|
if (argc > 0 && !also && !only)
|
2011-02-23 00:41:44 +01:00
|
|
|
only_include_assumed = _("Explicit paths specified without -i nor -o; assuming --only paths...");
|
2007-12-22 19:46:24 +01:00
|
|
|
if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
|
|
|
|
cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
|
|
|
|
else if (!strcmp(cleanup_arg, "verbatim"))
|
|
|
|
cleanup_mode = CLEANUP_NONE;
|
|
|
|
else if (!strcmp(cleanup_arg, "whitespace"))
|
|
|
|
cleanup_mode = CLEANUP_SPACE;
|
|
|
|
else if (!strcmp(cleanup_arg, "strip"))
|
|
|
|
cleanup_mode = CLEANUP_ALL;
|
|
|
|
else
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("Invalid cleanup mode %s"), cleanup_arg);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2009-08-08 08:31:57 +02:00
|
|
|
handle_untracked_files_arg(s);
|
2008-06-05 10:31:19 +02:00
|
|
|
|
2007-11-08 17:59:00 +01:00
|
|
|
if (all && argc > 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("Paths with -a does not make sense."));
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2012-05-07 21:44:44 +02:00
|
|
|
if (s->null_termination && status_format == STATUS_FORMAT_LONG)
|
2009-09-05 10:59:56 +02:00
|
|
|
status_format = STATUS_FORMAT_PORCELAIN;
|
|
|
|
if (status_format != STATUS_FORMAT_LONG)
|
|
|
|
dry_run = 1;
|
|
|
|
|
2007-11-08 17:59:00 +01:00
|
|
|
return argc;
|
|
|
|
}
|
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
static int dry_run_commit(int argc, const char **argv, const char *prefix,
|
2011-08-19 20:58:18 +02:00
|
|
|
const struct commit *current_head, struct wt_status *s)
|
2007-11-08 17:59:00 +01:00
|
|
|
{
|
|
|
|
int commitable;
|
2009-08-08 08:03:36 +02:00
|
|
|
const char *index_file;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2011-08-19 20:58:18 +02:00
|
|
|
index_file = prepare_index(argc, argv, prefix, current_head, 1);
|
2009-08-10 06:59:30 +02:00
|
|
|
commitable = run_status(stdout, index_file, prefix, 0, s);
|
2009-08-08 08:03:36 +02:00
|
|
|
rollback_index_files();
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2009-08-08 08:03:36 +02:00
|
|
|
return commitable ? 0 : 1;
|
|
|
|
}
|
|
|
|
|
2009-08-10 08:12:19 +02:00
|
|
|
static int parse_status_slot(const char *var, int offset)
|
|
|
|
{
|
|
|
|
if (!strcasecmp(var+offset, "header"))
|
|
|
|
return WT_STATUS_HEADER;
|
2010-11-18 00:40:05 +01:00
|
|
|
if (!strcasecmp(var+offset, "branch"))
|
|
|
|
return WT_STATUS_ONBRANCH;
|
2009-08-10 08:12:19 +02:00
|
|
|
if (!strcasecmp(var+offset, "updated")
|
|
|
|
|| !strcasecmp(var+offset, "added"))
|
|
|
|
return WT_STATUS_UPDATED;
|
|
|
|
if (!strcasecmp(var+offset, "changed"))
|
|
|
|
return WT_STATUS_CHANGED;
|
|
|
|
if (!strcasecmp(var+offset, "untracked"))
|
|
|
|
return WT_STATUS_UNTRACKED;
|
|
|
|
if (!strcasecmp(var+offset, "nobranch"))
|
|
|
|
return WT_STATUS_NOBRANCH;
|
|
|
|
if (!strcasecmp(var+offset, "unmerged"))
|
|
|
|
return WT_STATUS_UNMERGED;
|
ignore unknown color configuration
When parsing the config file, if there is a value that is
syntactically correct but unused, we generally ignore it.
This lets non-core porcelains store arbitrary information in
the config file, and it means that configuration files can
be shared between new and old versions of git (the old
versions might simply ignore certain configuration).
The one exception to this is color configuration; if we
encounter a color.{diff,branch,status}.$slot variable, we
die if it is not one of the recognized slots (presumably as
a safety valve for user misconfiguration). This behavior
has existed since 801235c (diff --color: use
$GIT_DIR/config, 2006-06-24), but hasn't yet caused a
problem. No porcelain has wanted to store extra colors, and
we once a color area (like color.diff) has been introduced,
we've never changed the set of color slots.
However, that changed recently with the addition of
color.diff.func. Now a user with color.diff.func in their
config can no longer freely switch between v1.6.6 and older
versions; the old versions will complain about the existence
of the variable.
This patch loosens the check to match the rest of
git-config; unknown color slots are simply ignored. This
doesn't fix this particular problem, as the older version
(without this patch) is the problem, but it at least
prevents it from happening again in the future.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-12 13:25:24 +01:00
|
|
|
return -1;
|
2009-08-10 08:12:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int git_status_config(const char *k, const char *v, void *cb)
|
|
|
|
{
|
|
|
|
struct wt_status *s = cb;
|
|
|
|
|
2012-04-13 12:54:39 +02:00
|
|
|
if (!prefixcmp(k, "column."))
|
2012-05-07 21:35:03 +02:00
|
|
|
return git_column_config(k, v, "status", &s->colopts);
|
2009-08-10 08:12:19 +02:00
|
|
|
if (!strcmp(k, "status.submodulesummary")) {
|
|
|
|
int is_bool;
|
|
|
|
s->submodule_summary = git_config_bool_or_int(k, v, &is_bool);
|
|
|
|
if (is_bool && s->submodule_summary)
|
|
|
|
s->submodule_summary = -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
|
2011-08-18 07:03:48 +02:00
|
|
|
s->use_color = git_config_colorbool(k, v);
|
2009-08-10 08:12:19 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
|
|
|
|
int slot = parse_status_slot(k, 13);
|
ignore unknown color configuration
When parsing the config file, if there is a value that is
syntactically correct but unused, we generally ignore it.
This lets non-core porcelains store arbitrary information in
the config file, and it means that configuration files can
be shared between new and old versions of git (the old
versions might simply ignore certain configuration).
The one exception to this is color configuration; if we
encounter a color.{diff,branch,status}.$slot variable, we
die if it is not one of the recognized slots (presumably as
a safety valve for user misconfiguration). This behavior
has existed since 801235c (diff --color: use
$GIT_DIR/config, 2006-06-24), but hasn't yet caused a
problem. No porcelain has wanted to store extra colors, and
we once a color area (like color.diff) has been introduced,
we've never changed the set of color slots.
However, that changed recently with the addition of
color.diff.func. Now a user with color.diff.func in their
config can no longer freely switch between v1.6.6 and older
versions; the old versions will complain about the existence
of the variable.
This patch loosens the check to match the rest of
git-config; unknown color slots are simply ignored. This
doesn't fix this particular problem, as the older version
(without this patch) is the problem, but it at least
prevents it from happening again in the future.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-12 13:25:24 +01:00
|
|
|
if (slot < 0)
|
|
|
|
return 0;
|
2009-08-10 08:12:19 +02:00
|
|
|
if (!v)
|
|
|
|
return config_error_nonbool(k);
|
|
|
|
color_parse(v, k, s->color_palette[slot]);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strcmp(k, "status.relativepaths")) {
|
|
|
|
s->relative_paths = git_config_bool(k, v);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strcmp(k, "status.showuntrackedfiles")) {
|
|
|
|
if (!v)
|
|
|
|
return config_error_nonbool(k);
|
|
|
|
else if (!strcmp(v, "no"))
|
|
|
|
s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
|
|
|
|
else if (!strcmp(v, "normal"))
|
|
|
|
s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
|
|
|
|
else if (!strcmp(v, "all"))
|
|
|
|
s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
|
|
|
|
else
|
2011-02-23 00:41:44 +01:00
|
|
|
return error(_("Invalid untracked files mode '%s'"), v);
|
2009-08-10 08:12:19 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return git_diff_ui_config(k, v, NULL);
|
|
|
|
}
|
|
|
|
|
2009-08-08 08:03:36 +02:00
|
|
|
int cmd_status(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2012-05-07 21:18:26 +02:00
|
|
|
static struct wt_status s;
|
2010-04-02 23:44:21 +02:00
|
|
|
int fd;
|
2009-08-08 08:31:57 +02:00
|
|
|
unsigned char sha1[20];
|
2009-08-15 11:27:39 +02:00
|
|
|
static struct option builtin_status_options[] = {
|
2012-08-20 14:32:37 +02:00
|
|
|
OPT__VERBOSE(&verbose, N_("be verbose")),
|
2009-09-05 10:54:14 +02:00
|
|
|
OPT_SET_INT('s', "short", &status_format,
|
2012-08-20 14:32:37 +02:00
|
|
|
N_("show status concisely"), STATUS_FORMAT_SHORT),
|
2012-05-07 23:09:04 +02:00
|
|
|
OPT_BOOLEAN('b', "branch", &s.show_branch,
|
2012-08-20 14:32:37 +02:00
|
|
|
N_("show branch information")),
|
2009-09-05 10:55:37 +02:00
|
|
|
OPT_SET_INT(0, "porcelain", &status_format,
|
2012-08-20 14:32:37 +02:00
|
|
|
N_("machine-readable output"),
|
2009-09-05 10:55:37 +02:00
|
|
|
STATUS_FORMAT_PORCELAIN),
|
2012-05-07 21:44:44 +02:00
|
|
|
OPT_BOOLEAN('z', "null", &s.null_termination,
|
2012-08-20 14:32:37 +02:00
|
|
|
N_("terminate entries with NUL")),
|
2009-08-08 08:31:57 +02:00
|
|
|
{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg,
|
2012-08-20 14:32:37 +02:00
|
|
|
N_("mode"),
|
|
|
|
N_("show untracked files, optional modes: all, normal, no. (Default: all)"),
|
2009-08-08 08:31:57 +02:00
|
|
|
PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
|
2010-04-10 09:33:17 +02:00
|
|
|
OPT_BOOLEAN(0, "ignored", &show_ignored_in_status,
|
2012-08-20 14:32:37 +02:00
|
|
|
N_("show ignored files")),
|
|
|
|
{ OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, N_("when"),
|
|
|
|
N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"),
|
2010-06-25 16:56:47 +02:00
|
|
|
PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
|
2012-08-20 14:32:04 +02:00
|
|
|
OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")),
|
2009-08-08 08:31:57 +02:00
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
|
2010-10-22 08:45:47 +02:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
|
|
usage_with_options(builtin_status_usage, builtin_status_options);
|
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
wt_status_prepare(&s);
|
2010-08-06 00:40:48 +02:00
|
|
|
gitmodules_config();
|
2009-08-10 06:59:30 +02:00
|
|
|
git_config(git_status_config, &s);
|
2011-02-20 05:12:29 +01:00
|
|
|
determine_whence(&s);
|
2009-08-08 08:31:57 +02:00
|
|
|
argc = parse_options(argc, argv, prefix,
|
2009-08-15 11:27:39 +02:00
|
|
|
builtin_status_options,
|
|
|
|
builtin_status_usage, 0);
|
2012-05-07 21:35:03 +02:00
|
|
|
finalize_colopts(&s.colopts, -1);
|
2011-05-26 22:43:21 +02:00
|
|
|
|
2012-05-07 21:44:44 +02:00
|
|
|
if (s.null_termination && status_format == STATUS_FORMAT_LONG)
|
2011-05-26 22:43:21 +02:00
|
|
|
status_format = STATUS_FORMAT_PORCELAIN;
|
|
|
|
|
2009-08-08 08:31:57 +02:00
|
|
|
handle_untracked_files_arg(&s);
|
2010-04-10 09:33:17 +02:00
|
|
|
if (show_ignored_in_status)
|
|
|
|
s.show_ignored_files = 1;
|
2009-08-08 08:31:57 +02:00
|
|
|
if (*argv)
|
|
|
|
s.pathspec = get_pathspec(prefix, argv);
|
|
|
|
|
2010-02-17 21:30:41 +01:00
|
|
|
read_cache_preload(s.pathspec);
|
2010-01-14 16:02:21 +01:00
|
|
|
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
|
2010-04-02 23:44:21 +02:00
|
|
|
|
|
|
|
fd = hold_locked_index(&index_lock, 0);
|
2011-03-21 18:16:10 +01:00
|
|
|
if (0 <= fd)
|
|
|
|
update_index_if_able(&the_index, &index_lock);
|
2010-04-02 23:44:21 +02:00
|
|
|
|
2009-08-08 08:31:57 +02:00
|
|
|
s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
|
2010-06-25 16:56:47 +02:00
|
|
|
s.ignore_submodule_arg = ignore_submodule_arg;
|
2009-08-08 08:31:57 +02:00
|
|
|
wt_status_collect(&s);
|
|
|
|
|
2009-12-07 06:26:25 +01:00
|
|
|
if (s.relative_paths)
|
|
|
|
s.prefix = prefix;
|
2009-01-08 19:53:05 +01:00
|
|
|
|
2009-09-05 10:54:14 +02:00
|
|
|
switch (status_format) {
|
|
|
|
case STATUS_FORMAT_SHORT:
|
2012-05-07 23:09:04 +02:00
|
|
|
wt_shortstatus_print(&s);
|
2009-09-05 10:54:14 +02:00
|
|
|
break;
|
2009-09-05 10:55:37 +02:00
|
|
|
case STATUS_FORMAT_PORCELAIN:
|
2012-05-07 21:44:44 +02:00
|
|
|
wt_porcelain_print(&s);
|
2009-09-05 10:55:37 +02:00
|
|
|
break;
|
2009-09-05 10:54:14 +02:00
|
|
|
case STATUS_FORMAT_LONG:
|
git stat -s: short status output
Give -s(hort) option to "git stat" that shows the status of paths in a
more concise way.
XY PATH1 -> PATH2
format to be more machine readable than output from "git status", which is
about previewing of "git commit" with the same arguments.
PATH1 is the path in the HEAD, and " -> PATH2" part is shown only when
PATH1 corresponds to a different path in the index/worktree.
For unmerged entries, X shows the status of stage #2 (i.e. ours) and Y
shows the status of stage #3 (i.e. theirs). For entries that do not have
conflicts, X shows the status of the index, and Y shows the status of the
work tree. For untracked paths, XY are "??".
X Y Meaning
-------------------------------------------------
[MD] not updated
M [ MD] updated in index
A [ MD] added to index
D [ MD] deleted from index
R [ MD] renamed in index
C [ MD] copied in index
[MARC] index and work tree matches
[ MARC] M work tree changed since index
[ MARC] D deleted in work tree
D D unmerged, both deleted
A U unmerged, added by us
U D unmerged, deleted by them
U A unmerged, added by them
D U unmerged, deleted by us
A A unmerged, both added
U U unmerged, both modified
? ? untracked
When given -z option, the records are terminated by NUL characters for
better machine readability. Because the traditional long format is
designed for human consumption, NUL termination does not make sense.
For this reason, -z option implies -s (short output).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-05 08:55:22 +02:00
|
|
|
s.verbose = verbose;
|
2010-06-25 16:56:47 +02:00
|
|
|
s.ignore_submodule_arg = ignore_submodule_arg;
|
git stat -s: short status output
Give -s(hort) option to "git stat" that shows the status of paths in a
more concise way.
XY PATH1 -> PATH2
format to be more machine readable than output from "git status", which is
about previewing of "git commit" with the same arguments.
PATH1 is the path in the HEAD, and " -> PATH2" part is shown only when
PATH1 corresponds to a different path in the index/worktree.
For unmerged entries, X shows the status of stage #2 (i.e. ours) and Y
shows the status of stage #3 (i.e. theirs). For entries that do not have
conflicts, X shows the status of the index, and Y shows the status of the
work tree. For untracked paths, XY are "??".
X Y Meaning
-------------------------------------------------
[MD] not updated
M [ MD] updated in index
A [ MD] added to index
D [ MD] deleted from index
R [ MD] renamed in index
C [ MD] copied in index
[MARC] index and work tree matches
[ MARC] M work tree changed since index
[ MARC] D deleted in work tree
D D unmerged, both deleted
A U unmerged, added by us
U D unmerged, deleted by them
U A unmerged, added by them
D U unmerged, deleted by us
A A unmerged, both added
U U unmerged, both modified
? ? untracked
When given -z option, the records are terminated by NUL characters for
better machine readability. Because the traditional long format is
designed for human consumption, NUL termination does not make sense.
For this reason, -z option implies -s (short output).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-05 08:55:22 +02:00
|
|
|
wt_status_print(&s);
|
2009-09-05 10:54:14 +02:00
|
|
|
break;
|
git stat -s: short status output
Give -s(hort) option to "git stat" that shows the status of paths in a
more concise way.
XY PATH1 -> PATH2
format to be more machine readable than output from "git status", which is
about previewing of "git commit" with the same arguments.
PATH1 is the path in the HEAD, and " -> PATH2" part is shown only when
PATH1 corresponds to a different path in the index/worktree.
For unmerged entries, X shows the status of stage #2 (i.e. ours) and Y
shows the status of stage #3 (i.e. theirs). For entries that do not have
conflicts, X shows the status of the index, and Y shows the status of the
work tree. For untracked paths, XY are "??".
X Y Meaning
-------------------------------------------------
[MD] not updated
M [ MD] updated in index
A [ MD] added to index
D [ MD] deleted from index
R [ MD] renamed in index
C [ MD] copied in index
[MARC] index and work tree matches
[ MARC] M work tree changed since index
[ MARC] D deleted in work tree
D D unmerged, both deleted
A U unmerged, added by us
U D unmerged, deleted by them
U A unmerged, added by them
D U unmerged, deleted by us
A A unmerged, both added
U U unmerged, both modified
? ? untracked
When given -z option, the records are terminated by NUL characters for
better machine readability. Because the traditional long format is
designed for human consumption, NUL termination does not make sense.
For this reason, -z option implies -s (short output).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-05 08:55:22 +02:00
|
|
|
}
|
2009-08-08 08:31:57 +02:00
|
|
|
return 0;
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2011-08-19 20:58:18 +02:00
|
|
|
static void print_summary(const char *prefix, const unsigned char *sha1,
|
|
|
|
int initial_commit)
|
2007-11-08 17:59:00 +01:00
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
struct commit *commit;
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
struct strbuf format = STRBUF_INIT;
|
2008-10-02 00:31:25 +02:00
|
|
|
unsigned char junk_sha1[20];
|
2011-11-13 11:22:15 +01:00
|
|
|
const char *head;
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
struct pretty_print_context pctx = {0};
|
|
|
|
struct strbuf author_ident = STRBUF_INIT;
|
|
|
|
struct strbuf committer_ident = STRBUF_INIT;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
|
|
|
commit = lookup_commit(sha1);
|
|
|
|
if (!commit)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("couldn't look up newly created commit"));
|
2007-11-08 17:59:00 +01:00
|
|
|
if (!commit || parse_commit(commit))
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("could not parse newly created commit"));
|
2007-11-08 17:59:00 +01:00
|
|
|
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
strbuf_addstr(&format, "format:%h] %s");
|
|
|
|
|
|
|
|
format_commit_message(commit, "%an <%ae>", &author_ident, &pctx);
|
|
|
|
format_commit_message(commit, "%cn <%ce>", &committer_ident, &pctx);
|
|
|
|
if (strbuf_cmp(&author_ident, &committer_ident)) {
|
|
|
|
strbuf_addstr(&format, "\n Author: ");
|
|
|
|
strbuf_addbuf_percentquote(&format, &author_ident);
|
|
|
|
}
|
2010-01-17 22:59:36 +01:00
|
|
|
if (!user_ident_sufficiently_given()) {
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
strbuf_addstr(&format, "\n Committer: ");
|
|
|
|
strbuf_addbuf_percentquote(&format, &committer_ident);
|
2010-01-13 21:17:08 +01:00
|
|
|
if (advice_implicit_identity) {
|
|
|
|
strbuf_addch(&format, '\n');
|
2011-02-23 00:41:49 +01:00
|
|
|
strbuf_addstr(&format, _(implicit_ident_advice));
|
2010-01-13 21:17:08 +01:00
|
|
|
}
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
}
|
|
|
|
strbuf_release(&author_ident);
|
|
|
|
strbuf_release(&committer_ident);
|
|
|
|
|
2007-11-08 17:59:00 +01:00
|
|
|
init_revisions(&rev, prefix);
|
|
|
|
setup_revisions(0, NULL, &rev, NULL);
|
|
|
|
|
|
|
|
rev.diff = 1;
|
|
|
|
rev.diffopt.output_format =
|
|
|
|
DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
|
|
|
|
|
|
|
|
rev.verbose_header = 1;
|
|
|
|
rev.show_root_diff = 1;
|
commit: show interesting ident information in summary
There are a few cases of user identity information that we consider
interesting:
(1) When the author and committer identities do not match.
(2) When the committer identity was picked automatically from the
username, hostname and GECOS information.
In these cases, we already show the information in the commit
message template. However, users do not always see that template
because they might use "-m" or "-F". With this patch, we show these
interesting cases after the commit, along with the subject and
change summary. The new output looks like:
$ git commit \
-m "federalist papers" \
--author='Publius <alexander@hamilton.com>'
[master 3d226a7] federalist papers
Author: Publius <alexander@hamilton.com>
1 files changed, 1 insertions(+), 0 deletions(-)
for case (1), and:
$ git config --global --unset user.name
$ git config --global --unset user.email
$ git commit -m foo
[master 7c2a927] foo
Committer: Jeff King <peff@c-71-185-130-222.hsd1.va.comcast.net>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name Your Name
git config --global user.email you@example.com
If the identity used for this commit is wrong, you can fix it with:
git commit --amend --author='Your Name <you@example.com>'
1 files changed, 1 insertions(+), 0 deletions(-)
for case (2).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-13 18:39:51 +01:00
|
|
|
get_commit_format(format.buf, &rev);
|
2007-12-11 06:02:26 +01:00
|
|
|
rev.always_show_header = 0;
|
2007-12-17 00:05:39 +01:00
|
|
|
rev.diffopt.detect_rename = 1;
|
|
|
|
rev.diffopt.break_opt = 0;
|
2007-12-17 00:03:58 +01:00
|
|
|
diff_setup_done(&rev.diffopt);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2011-12-12 12:20:32 +01:00
|
|
|
head = resolve_ref_unsafe("HEAD", junk_sha1, 0, NULL);
|
2009-01-19 23:45:16 +01:00
|
|
|
printf("[%s%s ",
|
2008-10-02 00:31:25 +02:00
|
|
|
!prefixcmp(head, "refs/heads/") ?
|
|
|
|
head + 11 :
|
|
|
|
!strcmp(head, "HEAD") ?
|
2011-02-23 00:41:47 +01:00
|
|
|
_("detached HEAD") :
|
2008-10-02 00:31:25 +02:00
|
|
|
head,
|
2011-02-23 00:41:47 +01:00
|
|
|
initial_commit ? _(" (root-commit)") : "");
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2007-12-11 06:02:26 +01:00
|
|
|
if (!log_tree_commit(&rev, commit)) {
|
commit::print_summary(): don't use format_commit_message()
This attempts to fix a regression in git-commit, where non-abbreviated
SHA-1s were printed in the summary.
One possible fix would be to set ctx.abbrev to DEFAULT_ABBREV in the
`if` block, where format_commit_message() is used.
Instead, we do away with the format_commit_message() codeblock
altogether, replacing it with a re-run of log_tree_commit().
We re-run log_tree_commit() with rev.always_show_header set, to force
the invocation of show_log(). The effect of this flag can be seen from
this excerpt from log-tree.c:560, the only area that
rev.always_show_header is checked:
shown = log_tree_diff(opt, commit, &log);
if (!shown && opt->loginfo && opt->always_show_header) {
log.parent = NULL;
show_log(opt);
shown = 1;
}
We also set rev.use_terminator, so that a newline is appended at the end
of the log message. Note that callers in builtin/log.c that also set
rev.always_show_header don't have to set rev.use_terminator, but still
get a newline, because they are wrapped in a pager.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-12 16:15:39 +02:00
|
|
|
rev.always_show_header = 1;
|
|
|
|
rev.use_terminator = 1;
|
|
|
|
log_tree_commit(&rev, commit);
|
2007-12-11 06:02:26 +01:00
|
|
|
}
|
commit::print_summary(): don't use format_commit_message()
This attempts to fix a regression in git-commit, where non-abbreviated
SHA-1s were printed in the summary.
One possible fix would be to set ctx.abbrev to DEFAULT_ABBREV in the
`if` block, where format_commit_message() is used.
Instead, we do away with the format_commit_message() codeblock
altogether, replacing it with a re-run of log_tree_commit().
We re-run log_tree_commit() with rev.always_show_header set, to force
the invocation of show_log(). The effect of this flag can be seen from
this excerpt from log-tree.c:560, the only area that
rev.always_show_header is checked:
shown = log_tree_diff(opt, commit, &log);
if (!shown && opt->loginfo && opt->always_show_header) {
log.parent = NULL;
show_log(opt);
shown = 1;
}
We also set rev.use_terminator, so that a newline is appended at the end
of the log message. Note that callers in builtin/log.c that also set
rev.always_show_header don't have to set rev.use_terminator, but still
get a newline, because they are wrapped in a pager.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-12 16:15:39 +02:00
|
|
|
|
2010-01-17 09:57:51 +01:00
|
|
|
strbuf_release(&format);
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2008-07-24 01:09:35 +02:00
|
|
|
static int git_commit_config(const char *k, const char *v, void *cb)
|
2007-11-08 17:59:00 +01:00
|
|
|
{
|
2009-08-10 06:59:30 +02:00
|
|
|
struct wt_status *s = cb;
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 02:23:20 +02:00
|
|
|
int status;
|
2009-08-10 06:59:30 +02:00
|
|
|
|
2008-07-05 07:24:40 +02:00
|
|
|
if (!strcmp(k, "commit.template"))
|
2009-11-17 18:24:25 +01:00
|
|
|
return git_config_pathname(&template_file, k, v);
|
2009-12-07 23:45:27 +01:00
|
|
|
if (!strcmp(k, "commit.status")) {
|
|
|
|
include_status = git_config_bool(k, v);
|
|
|
|
return 0;
|
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 02:23:20 +02:00
|
|
|
status = git_gpg_config(k, v, NULL);
|
|
|
|
if (status)
|
|
|
|
return status;
|
2009-08-10 06:59:30 +02:00
|
|
|
return git_status_config(k, v, s);
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2010-03-12 18:04:28 +01:00
|
|
|
static const char post_rewrite_hook[] = "hooks/post-rewrite";
|
|
|
|
|
|
|
|
static int run_rewrite_hook(const unsigned char *oldsha1,
|
|
|
|
const unsigned char *newsha1)
|
|
|
|
{
|
|
|
|
/* oldsha1 SP newsha1 LF NUL */
|
|
|
|
static char buf[2*40 + 3];
|
|
|
|
struct child_process proc;
|
|
|
|
const char *argv[3];
|
|
|
|
int code;
|
|
|
|
size_t n;
|
|
|
|
|
|
|
|
if (access(git_path(post_rewrite_hook), X_OK) < 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
argv[0] = git_path(post_rewrite_hook);
|
|
|
|
argv[1] = "amend";
|
|
|
|
argv[2] = NULL;
|
|
|
|
|
|
|
|
memset(&proc, 0, sizeof(proc));
|
|
|
|
proc.argv = argv;
|
|
|
|
proc.in = -1;
|
|
|
|
proc.stdout_to_stderr = 1;
|
|
|
|
|
|
|
|
code = start_command(&proc);
|
|
|
|
if (code)
|
|
|
|
return code;
|
|
|
|
n = snprintf(buf, sizeof(buf), "%s %s\n",
|
|
|
|
sha1_to_hex(oldsha1), sha1_to_hex(newsha1));
|
|
|
|
write_in_full(proc.in, buf, n);
|
|
|
|
close(proc.in);
|
|
|
|
return finish_command(&proc);
|
|
|
|
}
|
|
|
|
|
2007-11-08 17:59:00 +01:00
|
|
|
int cmd_commit(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2012-05-07 21:18:26 +02:00
|
|
|
static struct wt_status s;
|
|
|
|
static struct option builtin_commit_options[] = {
|
2012-08-20 14:32:04 +02:00
|
|
|
OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
|
|
|
|
OPT__VERBOSE(&verbose, N_("show diff in commit message template")),
|
|
|
|
|
|
|
|
OPT_GROUP(N_("Commit message options")),
|
|
|
|
OPT_FILENAME('F', "file", &logfile, N_("read message from file")),
|
|
|
|
OPT_STRING(0, "author", &force_author, N_("author"), N_("override author for commit")),
|
|
|
|
OPT_STRING(0, "date", &force_date, N_("date"), N_("override date for commit")),
|
|
|
|
OPT_CALLBACK('m', "message", &message, N_("message"), N_("commit message"), opt_parse_m),
|
|
|
|
OPT_STRING('c', "reedit-message", &edit_message, N_("commit"), N_("reuse and edit message from specified commit")),
|
|
|
|
OPT_STRING('C', "reuse-message", &use_message, N_("commit"), N_("reuse message from specified commit")),
|
|
|
|
OPT_STRING(0, "fixup", &fixup_message, N_("commit"), N_("use autosquash formatted message to fixup specified commit")),
|
|
|
|
OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
|
|
|
|
OPT_BOOLEAN(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
|
|
|
|
OPT_BOOLEAN('s', "signoff", &signoff, N_("add Signed-off-by:")),
|
|
|
|
OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
|
|
|
|
OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
|
|
|
|
OPT_STRING(0, "cleanup", &cleanup_arg, N_("default"), N_("how to strip spaces and #comments from message")),
|
|
|
|
OPT_BOOLEAN(0, "status", &include_status, N_("include status in commit message template")),
|
|
|
|
{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key id"),
|
|
|
|
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
|
2012-05-07 21:18:26 +02:00
|
|
|
/* end commit message options */
|
|
|
|
|
2012-08-20 14:32:04 +02:00
|
|
|
OPT_GROUP(N_("Commit contents options")),
|
|
|
|
OPT_BOOLEAN('a', "all", &all, N_("commit all changed files")),
|
|
|
|
OPT_BOOLEAN('i', "include", &also, N_("add specified files to index for commit")),
|
|
|
|
OPT_BOOLEAN(0, "interactive", &interactive, N_("interactively add files")),
|
|
|
|
OPT_BOOLEAN('p', "patch", &patch_interactive, N_("interactively add changes")),
|
|
|
|
OPT_BOOLEAN('o', "only", &only, N_("commit only specified files")),
|
|
|
|
OPT_BOOLEAN('n', "no-verify", &no_verify, N_("bypass pre-commit hook")),
|
|
|
|
OPT_BOOLEAN(0, "dry-run", &dry_run, N_("show what would be committed")),
|
|
|
|
OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
|
2012-05-07 21:18:26 +02:00
|
|
|
STATUS_FORMAT_SHORT),
|
2012-08-20 14:32:04 +02:00
|
|
|
OPT_BOOLEAN(0, "branch", &s.show_branch, N_("show branch information")),
|
2012-05-07 21:18:26 +02:00
|
|
|
OPT_SET_INT(0, "porcelain", &status_format,
|
2012-08-20 14:32:04 +02:00
|
|
|
N_("machine-readable output"), STATUS_FORMAT_PORCELAIN),
|
2012-05-07 21:44:44 +02:00
|
|
|
OPT_BOOLEAN('z', "null", &s.null_termination,
|
2012-08-20 14:32:04 +02:00
|
|
|
N_("terminate entries with NUL")),
|
|
|
|
OPT_BOOLEAN(0, "amend", &amend, N_("amend previous commit")),
|
|
|
|
OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")),
|
|
|
|
{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, N_("mode"), N_("show untracked files, optional modes: all, normal, no. (Default: all)"), PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
|
2012-05-07 21:18:26 +02:00
|
|
|
/* end commit contents options */
|
|
|
|
|
|
|
|
{ OPTION_BOOLEAN, 0, "allow-empty", &allow_empty, NULL,
|
2012-08-20 14:32:04 +02:00
|
|
|
N_("ok to record an empty change"),
|
2012-05-07 21:18:26 +02:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
|
|
|
|
{ OPTION_BOOLEAN, 0, "allow-empty-message", &allow_empty_message, NULL,
|
2012-08-20 14:32:04 +02:00
|
|
|
N_("ok to record a change with an empty message"),
|
2012-05-07 21:18:26 +02:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
|
|
|
|
|
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
2008-10-09 21:12:12 +02:00
|
|
|
struct strbuf sb = STRBUF_INIT;
|
2010-12-21 02:00:36 +01:00
|
|
|
struct strbuf author_ident = STRBUF_INIT;
|
2007-11-08 17:59:00 +01:00
|
|
|
const char *index_file, *reflog_msg;
|
2007-11-22 03:54:49 +01:00
|
|
|
char *nl, *p;
|
2011-08-19 20:58:18 +02:00
|
|
|
unsigned char sha1[20];
|
2007-11-08 17:59:00 +01:00
|
|
|
struct ref_lock *ref_lock;
|
2008-09-10 22:10:32 +02:00
|
|
|
struct commit_list *parents = NULL, **pptr = &parents;
|
builtin-commit: use reduce_heads() only when appropriate
Since commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10),
builtin-commit performs a reduce_heads() unconditionally. However,
it's not always needed, and in some cases even harmful.
reduce_heads() is not needed for the initial commit or for an
"ordinary" commit, because they don't have any or have only one
parent, respectively.
reduce_heads() must be avoided when 'git commit' is run after a 'git
merge --no-ff --no-commit', otherwise it will turn the
non-fast-forward merge into fast-forward. For the same reason,
reduce_heads() must be avoided when amending such a merge commit.
To resolve this issue, 'git merge' will write info about whether
fast-forward is allowed or not to $GIT_DIR/MERGE_MODE. Based on this
info, 'git commit' will only perform reduce_heads() when it's
committing a merge and fast-forward is enabled.
Also add test cases to ensure that non-fast-forward merges are
committed and amended properly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 14:04:47 +02:00
|
|
|
struct stat statbuf;
|
|
|
|
int allow_fast_forward = 1;
|
2011-08-19 20:58:18 +02:00
|
|
|
struct commit *current_head = NULL;
|
2011-11-09 00:38:07 +01:00
|
|
|
struct commit_extra_header *extra = NULL;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2010-10-22 08:45:47 +02:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
|
|
usage_with_options(builtin_commit_usage, builtin_commit_options);
|
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
wt_status_prepare(&s);
|
|
|
|
git_config(git_commit_config, &s);
|
2011-02-20 05:12:29 +01:00
|
|
|
determine_whence(&s);
|
2012-05-07 21:35:03 +02:00
|
|
|
s.colopts = 0;
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2011-08-19 20:58:18 +02:00
|
|
|
if (get_sha1("HEAD", sha1))
|
|
|
|
current_head = NULL;
|
|
|
|
else {
|
2011-09-17 13:57:45 +02:00
|
|
|
current_head = lookup_commit_or_die(sha1, "HEAD");
|
2011-08-19 20:58:18 +02:00
|
|
|
if (!current_head || parse_commit(current_head))
|
|
|
|
die(_("could not parse HEAD commit"));
|
|
|
|
}
|
2012-05-07 21:18:26 +02:00
|
|
|
argc = parse_and_validate_options(argc, argv, builtin_commit_options,
|
|
|
|
builtin_commit_usage,
|
2011-08-19 20:58:18 +02:00
|
|
|
prefix, current_head, &s);
|
2011-08-18 07:05:35 +02:00
|
|
|
if (dry_run)
|
2011-08-19 20:58:18 +02:00
|
|
|
return dry_run_commit(argc, argv, prefix, current_head, &s);
|
|
|
|
index_file = prepare_index(argc, argv, prefix, current_head, 0);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-02-05 11:01:46 +01:00
|
|
|
/* Set up everything for writing the commit object. This includes
|
|
|
|
running hooks, writing the trees, and interacting with the user. */
|
2011-08-19 20:58:18 +02:00
|
|
|
if (!prepare_to_commit(index_file, prefix,
|
|
|
|
current_head, &s, &author_ident)) {
|
2007-11-18 10:52:55 +01:00
|
|
|
rollback_index_files();
|
2007-11-08 17:59:00 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Determine parents */
|
2010-06-12 18:05:12 +02:00
|
|
|
reflog_msg = getenv("GIT_REFLOG_ACTION");
|
2011-08-19 20:58:18 +02:00
|
|
|
if (!current_head) {
|
2010-06-12 18:05:12 +02:00
|
|
|
if (!reflog_msg)
|
|
|
|
reflog_msg = "commit (initial)";
|
2007-11-08 17:59:00 +01:00
|
|
|
} else if (amend) {
|
|
|
|
struct commit_list *c;
|
|
|
|
|
2010-06-12 18:05:12 +02:00
|
|
|
if (!reflog_msg)
|
|
|
|
reflog_msg = "commit (amend)";
|
2011-08-19 20:58:18 +02:00
|
|
|
for (c = current_head->parents; c; c = c->next)
|
2008-09-10 22:10:32 +02:00
|
|
|
pptr = &commit_list_insert(c->item, pptr)->next;
|
2011-02-20 05:12:29 +01:00
|
|
|
} else if (whence == FROM_MERGE) {
|
2008-10-09 21:12:12 +02:00
|
|
|
struct strbuf m = STRBUF_INIT;
|
2007-11-08 17:59:00 +01:00
|
|
|
FILE *fp;
|
|
|
|
|
2010-06-12 18:05:12 +02:00
|
|
|
if (!reflog_msg)
|
|
|
|
reflog_msg = "commit (merge)";
|
2011-08-19 20:58:18 +02:00
|
|
|
pptr = &commit_list_insert(current_head, pptr)->next;
|
2007-11-08 17:59:00 +01:00
|
|
|
fp = fopen(git_path("MERGE_HEAD"), "r");
|
|
|
|
if (fp == NULL)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not open '%s' for reading"),
|
2009-06-27 17:58:46 +02:00
|
|
|
git_path("MERGE_HEAD"));
|
2008-01-16 01:12:33 +01:00
|
|
|
while (strbuf_getline(&m, fp, '\n') != EOF) {
|
2011-11-08 01:21:32 +01:00
|
|
|
struct commit *parent;
|
|
|
|
|
|
|
|
parent = get_merge_parent(m.buf);
|
|
|
|
if (!parent)
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("Corrupt MERGE_HEAD file (%s)"), m.buf);
|
2011-11-08 01:21:32 +01:00
|
|
|
pptr = &commit_list_insert(parent, pptr)->next;
|
2008-01-16 01:12:33 +01:00
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
fclose(fp);
|
|
|
|
strbuf_release(&m);
|
builtin-commit: use reduce_heads() only when appropriate
Since commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10),
builtin-commit performs a reduce_heads() unconditionally. However,
it's not always needed, and in some cases even harmful.
reduce_heads() is not needed for the initial commit or for an
"ordinary" commit, because they don't have any or have only one
parent, respectively.
reduce_heads() must be avoided when 'git commit' is run after a 'git
merge --no-ff --no-commit', otherwise it will turn the
non-fast-forward merge into fast-forward. For the same reason,
reduce_heads() must be avoided when amending such a merge commit.
To resolve this issue, 'git merge' will write info about whether
fast-forward is allowed or not to $GIT_DIR/MERGE_MODE. Based on this
info, 'git commit' will only perform reduce_heads() when it's
committing a merge and fast-forward is enabled.
Also add test cases to ensure that non-fast-forward merges are
committed and amended properly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 14:04:47 +02:00
|
|
|
if (!stat(git_path("MERGE_MODE"), &statbuf)) {
|
|
|
|
if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
|
2011-02-23 00:41:44 +01:00
|
|
|
die_errno(_("could not read MERGE_MODE"));
|
builtin-commit: use reduce_heads() only when appropriate
Since commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10),
builtin-commit performs a reduce_heads() unconditionally. However,
it's not always needed, and in some cases even harmful.
reduce_heads() is not needed for the initial commit or for an
"ordinary" commit, because they don't have any or have only one
parent, respectively.
reduce_heads() must be avoided when 'git commit' is run after a 'git
merge --no-ff --no-commit', otherwise it will turn the
non-fast-forward merge into fast-forward. For the same reason,
reduce_heads() must be avoided when amending such a merge commit.
To resolve this issue, 'git merge' will write info about whether
fast-forward is allowed or not to $GIT_DIR/MERGE_MODE. Based on this
info, 'git commit' will only perform reduce_heads() when it's
committing a merge and fast-forward is enabled.
Also add test cases to ensure that non-fast-forward merges are
committed and amended properly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 14:04:47 +02:00
|
|
|
if (!strcmp(sb.buf, "no-ff"))
|
|
|
|
allow_fast_forward = 0;
|
|
|
|
}
|
|
|
|
if (allow_fast_forward)
|
|
|
|
parents = reduce_heads(parents);
|
2007-11-08 17:59:00 +01:00
|
|
|
} else {
|
2010-06-12 18:05:12 +02:00
|
|
|
if (!reflog_msg)
|
2011-02-20 05:12:29 +01:00
|
|
|
reflog_msg = (whence == FROM_CHERRY_PICK)
|
|
|
|
? "commit (cherry-pick)"
|
|
|
|
: "commit";
|
2011-08-19 20:58:18 +02:00
|
|
|
pptr = &commit_list_insert(current_head, pptr)->next;
|
2007-11-08 17:59:00 +01:00
|
|
|
}
|
|
|
|
|
2008-02-05 11:01:46 +01:00
|
|
|
/* Finally, get the commit message */
|
builtin-commit: use reduce_heads() only when appropriate
Since commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10),
builtin-commit performs a reduce_heads() unconditionally. However,
it's not always needed, and in some cases even harmful.
reduce_heads() is not needed for the initial commit or for an
"ordinary" commit, because they don't have any or have only one
parent, respectively.
reduce_heads() must be avoided when 'git commit' is run after a 'git
merge --no-ff --no-commit', otherwise it will turn the
non-fast-forward merge into fast-forward. For the same reason,
reduce_heads() must be avoided when amending such a merge commit.
To resolve this issue, 'git merge' will write info about whether
fast-forward is allowed or not to $GIT_DIR/MERGE_MODE. Based on this
info, 'git commit' will only perform reduce_heads() when it's
committing a merge and fast-forward is enabled.
Also add test cases to ensure that non-fast-forward merges are
committed and amended properly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 14:04:47 +02:00
|
|
|
strbuf_reset(&sb);
|
2007-12-09 08:23:20 +01:00
|
|
|
if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
|
2009-06-27 17:58:47 +02:00
|
|
|
int saved_errno = errno;
|
2007-12-09 08:23:20 +01:00
|
|
|
rollback_index_files();
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("could not read commit message: %s"), strerror(saved_errno));
|
2007-12-09 08:23:20 +01:00
|
|
|
}
|
2007-11-22 03:54:49 +01:00
|
|
|
|
|
|
|
/* Truncate the message just before the diff, if any. */
|
2008-11-12 09:25:52 +01:00
|
|
|
if (verbose) {
|
|
|
|
p = strstr(sb.buf, "\ndiff --git ");
|
|
|
|
if (p != NULL)
|
|
|
|
strbuf_setlen(&sb, p - sb.buf + 1);
|
|
|
|
}
|
2007-11-22 03:54:49 +01:00
|
|
|
|
2007-12-22 19:46:24 +01:00
|
|
|
if (cleanup_mode != CLEANUP_NONE)
|
|
|
|
stripspace(&sb, cleanup_mode == CLEANUP_ALL);
|
2012-03-30 21:14:33 +02:00
|
|
|
if (template_untouched(&sb) && !allow_empty_message) {
|
|
|
|
rollback_index_files();
|
|
|
|
fprintf(stderr, _("Aborting commit; you did not edit the message.\n"));
|
|
|
|
exit(1);
|
|
|
|
}
|
2010-04-06 10:40:35 +02:00
|
|
|
if (message_is_empty(&sb) && !allow_empty_message) {
|
2007-11-18 10:52:55 +01:00
|
|
|
rollback_index_files();
|
2011-02-23 00:41:44 +01:00
|
|
|
fprintf(stderr, _("Aborting commit due to empty commit message.\n"));
|
2008-07-31 09:36:09 +02:00
|
|
|
exit(1);
|
2007-11-18 10:52:55 +01:00
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2011-12-20 22:20:56 +01:00
|
|
|
if (amend) {
|
2012-01-05 19:54:14 +01:00
|
|
|
const char *exclude_gpgsig[2] = { "gpgsig", NULL };
|
|
|
|
extra = read_commit_extra_headers(current_head, exclude_gpgsig);
|
2011-12-20 22:20:56 +01:00
|
|
|
} else {
|
|
|
|
struct commit_extra_header **tail = &extra;
|
|
|
|
append_merge_tag_headers(parents, &tail);
|
|
|
|
}
|
2011-11-09 00:38:07 +01:00
|
|
|
|
2011-12-22 20:27:26 +01:00
|
|
|
if (commit_tree_extended(&sb, active_cache_tree->sha1, parents, sha1,
|
commit: teach --gpg-sign option
This uses the gpg-interface.[ch] to allow signing the commit, i.e.
$ git commit --gpg-sign -m foo
You need a passphrase to unlock the secret key for
user: "Junio C Hamano <gitster@pobox.com>"
4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
[master 8457d13] foo
1 files changed, 1 insertions(+), 0 deletions(-)
The lines of GPG detached signature are placed in a new multi-line header
field, instead of tucking the signature block at the end of the commit log
message text (similar to how signed tag is done), for multiple reasons:
- The signature won't clutter output from "git log" and friends if it is
in the extra header. If we place it at the end of the log message, we
would need to teach "git log" and friends to strip the signature block
with an option.
- Teaching new versions of "git log" and "gitk" to optionally verify and
show signatures is cleaner if we structurally know where the signature
block is (instead of scanning in the commit log message).
- The signature needs to be stripped upon various commit rewriting
operations, e.g. rebase, filter-branch, etc. They all already ignore
unknown headers, but if we place signature in the log message, all of
these tools (and third-party tools) also need to learn how a signature
block would look like.
- When we added the optional encoding header, all the tools (both in tree
and third-party) that acts on the raw commit object should have been
fixed to ignore headers they do not understand, so it is not like that
new header would be more likely to break than extra text in the commit.
A commit made with the above sample sequence would look like this:
$ git cat-file commit HEAD
tree 3cd71d90e3db4136e5260ab54599791c4f883b9d
parent b87755351a47b09cb27d6913e6e0e17e6254a4d4
author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
...
=dt98
-----END PGP SIGNATURE-----
foo
but "git log" (unless you ask for it with --pretty=raw) output is not
cluttered with the signature information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 02:23:20 +02:00
|
|
|
author_ident.buf, sign_commit, extra)) {
|
2007-11-18 10:52:55 +01:00
|
|
|
rollback_index_files();
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("failed to write commit object"));
|
2007-11-18 10:52:55 +01:00
|
|
|
}
|
2010-12-21 02:00:36 +01:00
|
|
|
strbuf_release(&author_ident);
|
2011-11-09 00:38:07 +01:00
|
|
|
free_commit_extra_headers(extra);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
|
|
|
ref_lock = lock_any_ref_for_update("HEAD",
|
2011-08-19 20:58:18 +02:00
|
|
|
!current_head
|
|
|
|
? NULL
|
|
|
|
: current_head->object.sha1,
|
2007-11-08 17:59:00 +01:00
|
|
|
0);
|
|
|
|
|
2008-09-10 22:10:32 +02:00
|
|
|
nl = strchr(sb.buf, '\n');
|
2007-11-08 13:15:26 +01:00
|
|
|
if (nl)
|
|
|
|
strbuf_setlen(&sb, nl + 1 - sb.buf);
|
|
|
|
else
|
|
|
|
strbuf_addch(&sb, '\n');
|
|
|
|
strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
|
|
|
|
strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2007-11-18 10:52:55 +01:00
|
|
|
if (!ref_lock) {
|
|
|
|
rollback_index_files();
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("cannot lock HEAD ref"));
|
2007-11-18 10:52:55 +01:00
|
|
|
}
|
2011-08-19 20:58:18 +02:00
|
|
|
if (write_ref_sha1(ref_lock, sha1, sb.buf) < 0) {
|
2007-11-18 10:52:55 +01:00
|
|
|
rollback_index_files();
|
2011-02-23 00:41:44 +01:00
|
|
|
die(_("cannot update HEAD ref"));
|
2007-11-18 10:52:55 +01:00
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2011-02-20 05:12:27 +01:00
|
|
|
unlink(git_path("CHERRY_PICK_HEAD"));
|
2011-11-22 12:17:36 +01:00
|
|
|
unlink(git_path("REVERT_HEAD"));
|
2007-11-08 17:59:00 +01:00
|
|
|
unlink(git_path("MERGE_HEAD"));
|
|
|
|
unlink(git_path("MERGE_MSG"));
|
builtin-commit: use reduce_heads() only when appropriate
Since commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10),
builtin-commit performs a reduce_heads() unconditionally. However,
it's not always needed, and in some cases even harmful.
reduce_heads() is not needed for the initial commit or for an
"ordinary" commit, because they don't have any or have only one
parent, respectively.
reduce_heads() must be avoided when 'git commit' is run after a 'git
merge --no-ff --no-commit', otherwise it will turn the
non-fast-forward merge into fast-forward. For the same reason,
reduce_heads() must be avoided when amending such a merge commit.
To resolve this issue, 'git merge' will write info about whether
fast-forward is allowed or not to $GIT_DIR/MERGE_MODE. Based on this
info, 'git commit' will only perform reduce_heads() when it's
committing a merge and fast-forward is enabled.
Also add test cases to ensure that non-fast-forward merges are
committed and amended properly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 14:04:47 +02:00
|
|
|
unlink(git_path("MERGE_MODE"));
|
2008-02-08 10:53:58 +01:00
|
|
|
unlink(git_path("SQUASH_MSG"));
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2008-01-23 18:21:22 +01:00
|
|
|
if (commit_index_files())
|
2011-02-23 00:41:44 +01:00
|
|
|
die (_("Repository has been updated, but unable to write\n"
|
2008-01-23 18:21:22 +01:00
|
|
|
"new_index file. Check that disk is not full or quota is\n"
|
2011-02-23 00:41:44 +01:00
|
|
|
"not exceeded, and then \"git reset HEAD\" to recover."));
|
2007-11-08 17:59:00 +01:00
|
|
|
|
2009-12-04 09:20:48 +01:00
|
|
|
rerere(0);
|
2007-11-18 10:52:55 +01:00
|
|
|
run_hook(get_index_file(), "post-commit", NULL);
|
2010-03-12 18:04:28 +01:00
|
|
|
if (amend && !no_post_rewrite) {
|
2010-03-12 18:04:34 +01:00
|
|
|
struct notes_rewrite_cfg *cfg;
|
|
|
|
cfg = init_copy_notes_for_rewrite("amend");
|
|
|
|
if (cfg) {
|
2011-08-19 20:58:18 +02:00
|
|
|
/* we are amending, so current_head is not NULL */
|
|
|
|
copy_note_for_rewrite(cfg, current_head->object.sha1, sha1);
|
2010-03-12 18:04:34 +01:00
|
|
|
finish_copy_notes_for_rewrite(cfg);
|
|
|
|
}
|
2011-08-19 20:58:18 +02:00
|
|
|
run_rewrite_hook(current_head->object.sha1, sha1);
|
2010-03-12 18:04:28 +01:00
|
|
|
}
|
2007-11-08 17:59:00 +01:00
|
|
|
if (!quiet)
|
2011-08-19 20:58:18 +02:00
|
|
|
print_summary(prefix, sha1, !current_head);
|
2007-11-08 17:59:00 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|