2005-04-07 22:16:10 +00:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2005-04-07 22:13:13 +00:00
|
|
|
#include "cache.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2023-03-21 06:25:54 +00:00
|
|
|
#include "gettext.h"
|
2023-02-24 00:09:27 +00:00
|
|
|
#include "hex.h"
|
2018-05-15 23:42:15 +00:00
|
|
|
#include "object-store.h"
|
2018-06-29 01:21:59 +00:00
|
|
|
#include "repository.h"
|
2006-04-02 12:44:09 +00:00
|
|
|
#include "commit.h"
|
|
|
|
#include "tree.h"
|
2006-05-23 12:15:33 +00:00
|
|
|
#include "builtin.h"
|
2006-12-22 21:06:08 +00:00
|
|
|
#include "utf8.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 00:23:20 +00:00
|
|
|
#include "gpg-interface.h"
|
2019-03-07 15:44:09 +00:00
|
|
|
#include "parse-options.h"
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2019-03-07 15:44:09 +00:00
|
|
|
static const char * const commit_tree_usage[] = {
|
2022-10-13 15:39:18 +00:00
|
|
|
N_("git commit-tree <tree> [(-p <parent>)...]"),
|
2022-10-13 15:39:02 +00:00
|
|
|
N_("git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
|
|
|
|
" [(-F <file>)...] <tree>"),
|
2019-03-07 15:44:09 +00:00
|
|
|
NULL
|
|
|
|
};
|
2005-04-21 02:49:16 +00:00
|
|
|
|
2013-11-04 23:14:41 +00:00
|
|
|
static const char *sign_commit;
|
|
|
|
|
2008-06-27 12:24:47 +00:00
|
|
|
static void new_parent(struct commit *parent, struct commit_list **parents_p)
|
2005-06-19 17:40:10 +00:00
|
|
|
{
|
2015-11-10 02:22:28 +00:00
|
|
|
struct object_id *oid = &parent->object.oid;
|
2008-06-27 12:24:47 +00:00
|
|
|
struct commit_list *parents;
|
|
|
|
for (parents = *parents_p; parents; parents = parents->next) {
|
|
|
|
if (parents->item == parent) {
|
2019-03-07 15:44:09 +00:00
|
|
|
error(_("duplicate parent %s ignored"), oid_to_hex(oid));
|
2008-06-27 12:24:47 +00:00
|
|
|
return;
|
2005-06-19 17:40:10 +00:00
|
|
|
}
|
2008-06-27 12:24:47 +00:00
|
|
|
parents_p = &parents->next;
|
2005-06-19 17:40:10 +00:00
|
|
|
}
|
2008-06-27 12:24:47 +00:00
|
|
|
commit_list_insert(parent, parents_p);
|
2005-06-19 17:40:10 +00:00
|
|
|
}
|
|
|
|
|
2019-03-07 15:44:09 +00:00
|
|
|
static int parse_parent_arg_callback(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
struct object_id oid;
|
|
|
|
struct commit_list **parents = opt->value;
|
|
|
|
|
|
|
|
BUG_ON_OPT_NEG_NOARG(unset, arg);
|
|
|
|
|
|
|
|
if (get_oid_commit(arg, &oid))
|
|
|
|
die(_("not a valid object name %s"), arg);
|
|
|
|
|
|
|
|
assert_oid_type(&oid, OBJ_COMMIT);
|
|
|
|
new_parent(lookup_commit(the_repository, &oid), parents);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_message_arg_callback(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
struct strbuf *buf = opt->value;
|
|
|
|
|
|
|
|
BUG_ON_OPT_NEG_NOARG(unset, arg);
|
|
|
|
|
|
|
|
if (buf->len)
|
|
|
|
strbuf_addch(buf, '\n');
|
|
|
|
strbuf_addstr(buf, arg);
|
|
|
|
strbuf_complete_line(buf);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_file_arg_callback(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
struct strbuf *buf = opt->value;
|
|
|
|
|
|
|
|
BUG_ON_OPT_NEG_NOARG(unset, arg);
|
|
|
|
|
|
|
|
if (buf->len)
|
|
|
|
strbuf_addch(buf, '\n');
|
|
|
|
if (!strcmp(arg, "-"))
|
|
|
|
fd = 0;
|
|
|
|
else {
|
2021-08-25 20:16:46 +00:00
|
|
|
fd = xopen(arg, O_RDONLY);
|
2019-03-07 15:44:09 +00:00
|
|
|
}
|
|
|
|
if (strbuf_read(buf, fd, 0) < 0)
|
|
|
|
die_errno(_("git commit-tree: failed to read '%s'"), arg);
|
|
|
|
if (fd && close(fd))
|
|
|
|
die_errno(_("git commit-tree: failed to close '%s'"), arg);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-01 02:37:49 +00:00
|
|
|
int cmd_commit_tree(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2019-03-07 15:44:09 +00:00
|
|
|
static struct strbuf buffer = STRBUF_INIT;
|
2008-07-01 02:37:49 +00:00
|
|
|
struct commit_list *parents = NULL;
|
2016-09-05 20:08:10 +00:00
|
|
|
struct object_id tree_oid;
|
|
|
|
struct object_id commit_oid;
|
2019-03-07 15:44:09 +00:00
|
|
|
|
|
|
|
struct option options[] = {
|
Use OPT_CALLBACK and OPT_CALLBACK_F
In the codebase, there are many options which use OPTION_CALLBACK in a
plain ol' struct definition. However, we have the OPT_CALLBACK and
OPT_CALLBACK_F macros which are meant to abstract these plain struct
definitions away. These macros are useful as they semantically signal to
developers that these are just normal callback option with nothing fancy
happening.
Replace plain struct definitions of OPTION_CALLBACK with OPT_CALLBACK or
OPT_CALLBACK_F where applicable. The heavy lifting was done using the
following (disgusting) shell script:
#!/bin/sh
do_replacement () {
tr '\n' '\r' |
sed -e 's/{\s*OPTION_CALLBACK,\s*\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\s*0,\(\s*[^[:space:]}]*\)\s*}/OPT_CALLBACK(\1,\2,\3,\4,\5,\6)/g' |
sed -e 's/{\s*OPTION_CALLBACK,\s*\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\(\s*[^[:space:]}]*\)\s*}/OPT_CALLBACK_F(\1,\2,\3,\4,\5,\6,\7)/g' |
tr '\r' '\n'
}
for f in $(git ls-files \*.c)
do
do_replacement <"$f" >"$f.tmp"
mv "$f.tmp" "$f"
done
The result was manually inspected and then reformatted to match the
style of the surrounding code. Finally, using
`git grep OPTION_CALLBACK \*.c`, leftover results which were not handled
by the script were manually transformed.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-28 08:36:28 +00:00
|
|
|
OPT_CALLBACK_F('p', NULL, &parents, N_("parent"),
|
2019-03-07 15:44:09 +00:00
|
|
|
N_("id of a parent commit object"), PARSE_OPT_NONEG,
|
Use OPT_CALLBACK and OPT_CALLBACK_F
In the codebase, there are many options which use OPTION_CALLBACK in a
plain ol' struct definition. However, we have the OPT_CALLBACK and
OPT_CALLBACK_F macros which are meant to abstract these plain struct
definitions away. These macros are useful as they semantically signal to
developers that these are just normal callback option with nothing fancy
happening.
Replace plain struct definitions of OPTION_CALLBACK with OPT_CALLBACK or
OPT_CALLBACK_F where applicable. The heavy lifting was done using the
following (disgusting) shell script:
#!/bin/sh
do_replacement () {
tr '\n' '\r' |
sed -e 's/{\s*OPTION_CALLBACK,\s*\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\s*0,\(\s*[^[:space:]}]*\)\s*}/OPT_CALLBACK(\1,\2,\3,\4,\5,\6)/g' |
sed -e 's/{\s*OPTION_CALLBACK,\s*\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\(\s*[^[:space:]}]*\)\s*}/OPT_CALLBACK_F(\1,\2,\3,\4,\5,\6,\7)/g' |
tr '\r' '\n'
}
for f in $(git ls-files \*.c)
do
do_replacement <"$f" >"$f.tmp"
mv "$f.tmp" "$f"
done
The result was manually inspected and then reformatted to match the
style of the surrounding code. Finally, using
`git grep OPTION_CALLBACK \*.c`, leftover results which were not handled
by the script were manually transformed.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-28 08:36:28 +00:00
|
|
|
parse_parent_arg_callback),
|
|
|
|
OPT_CALLBACK_F('m', NULL, &buffer, N_("message"),
|
2019-03-07 15:44:09 +00:00
|
|
|
N_("commit message"), PARSE_OPT_NONEG,
|
Use OPT_CALLBACK and OPT_CALLBACK_F
In the codebase, there are many options which use OPTION_CALLBACK in a
plain ol' struct definition. However, we have the OPT_CALLBACK and
OPT_CALLBACK_F macros which are meant to abstract these plain struct
definitions away. These macros are useful as they semantically signal to
developers that these are just normal callback option with nothing fancy
happening.
Replace plain struct definitions of OPTION_CALLBACK with OPT_CALLBACK or
OPT_CALLBACK_F where applicable. The heavy lifting was done using the
following (disgusting) shell script:
#!/bin/sh
do_replacement () {
tr '\n' '\r' |
sed -e 's/{\s*OPTION_CALLBACK,\s*\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\s*0,\(\s*[^[:space:]}]*\)\s*}/OPT_CALLBACK(\1,\2,\3,\4,\5,\6)/g' |
sed -e 's/{\s*OPTION_CALLBACK,\s*\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\(\s*[^[:space:]}]*\)\s*}/OPT_CALLBACK_F(\1,\2,\3,\4,\5,\6,\7)/g' |
tr '\r' '\n'
}
for f in $(git ls-files \*.c)
do
do_replacement <"$f" >"$f.tmp"
mv "$f.tmp" "$f"
done
The result was manually inspected and then reformatted to match the
style of the surrounding code. Finally, using
`git grep OPTION_CALLBACK \*.c`, leftover results which were not handled
by the script were manually transformed.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-28 08:36:28 +00:00
|
|
|
parse_message_arg_callback),
|
|
|
|
OPT_CALLBACK_F('F', NULL, &buffer, N_("file"),
|
2019-03-07 15:44:09 +00:00
|
|
|
N_("read commit log message from file"), PARSE_OPT_NONEG,
|
Use OPT_CALLBACK and OPT_CALLBACK_F
In the codebase, there are many options which use OPTION_CALLBACK in a
plain ol' struct definition. However, we have the OPT_CALLBACK and
OPT_CALLBACK_F macros which are meant to abstract these plain struct
definitions away. These macros are useful as they semantically signal to
developers that these are just normal callback option with nothing fancy
happening.
Replace plain struct definitions of OPTION_CALLBACK with OPT_CALLBACK or
OPT_CALLBACK_F where applicable. The heavy lifting was done using the
following (disgusting) shell script:
#!/bin/sh
do_replacement () {
tr '\n' '\r' |
sed -e 's/{\s*OPTION_CALLBACK,\s*\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\s*0,\(\s*[^[:space:]}]*\)\s*}/OPT_CALLBACK(\1,\2,\3,\4,\5,\6)/g' |
sed -e 's/{\s*OPTION_CALLBACK,\s*\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\([^,]*\),\(\s*[^[:space:]}]*\)\s*}/OPT_CALLBACK_F(\1,\2,\3,\4,\5,\6,\7)/g' |
tr '\r' '\n'
}
for f in $(git ls-files \*.c)
do
do_replacement <"$f" >"$f.tmp"
mv "$f.tmp" "$f"
done
The result was manually inspected and then reformatted to match the
style of the surrounding code. Finally, using
`git grep OPTION_CALLBACK \*.c`, leftover results which were not handled
by the script were manually transformed.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-28 08:36:28 +00:00
|
|
|
parse_file_arg_callback),
|
2019-03-07 15:44:09 +00:00
|
|
|
{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
|
|
|
|
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
|
|
|
|
OPT_END()
|
|
|
|
};
|
2008-07-01 02:37:49 +00:00
|
|
|
|
2023-02-26 22:40:46 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2008-07-01 02:37:49 +00:00
|
|
|
|
2009-11-09 15:04:44 +00:00
|
|
|
if (argc < 2 || !strcmp(argv[1], "-h"))
|
2019-03-07 15:44:09 +00:00
|
|
|
usage_with_options(commit_tree_usage, options);
|
2008-07-01 02:37:49 +00:00
|
|
|
|
2019-03-07 15:44:09 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, options, commit_tree_usage, 0);
|
2019-01-19 23:23:34 +00:00
|
|
|
|
2019-03-07 15:44:09 +00:00
|
|
|
if (argc != 1)
|
|
|
|
die(_("must give exactly one tree"));
|
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 00:23:20 +00:00
|
|
|
|
2019-03-07 15:44:09 +00:00
|
|
|
if (get_oid_tree(argv[0], &tree_oid))
|
|
|
|
die(_("not a valid object name %s"), argv[0]);
|
2008-07-01 02:37:49 +00:00
|
|
|
|
2011-11-09 19:54:04 +00:00
|
|
|
if (!buffer.len) {
|
|
|
|
if (strbuf_read(&buffer, 0, 0) < 0)
|
2019-03-07 15:44:09 +00:00
|
|
|
die_errno(_("git commit-tree: failed to read"));
|
2011-11-09 19:54:04 +00:00
|
|
|
}
|
2008-07-01 02:37:49 +00:00
|
|
|
|
2018-01-28 00:13:16 +00:00
|
|
|
if (commit_tree(buffer.buf, buffer.len, &tree_oid, parents, &commit_oid,
|
|
|
|
NULL, sign_commit)) {
|
2010-10-02 08:41:00 +00:00
|
|
|
strbuf_release(&buffer);
|
2006-03-25 06:23:25 +00:00
|
|
|
return 1;
|
2010-10-02 08:41:00 +00:00
|
|
|
}
|
|
|
|
|
2016-09-05 20:08:10 +00:00
|
|
|
printf("%s\n", oid_to_hex(&commit_oid));
|
2010-10-02 08:41:00 +00:00
|
|
|
strbuf_release(&buffer);
|
|
|
|
return 0;
|
2005-04-07 22:13:13 +00:00
|
|
|
}
|