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

replace: prepare create_graft() for converting graft files wholesale 

When converting all grafts in a graft file to replace refs, and one of
them happens to leave the original commit's parents unchanged, we do not
want to error out. Instead, we would like to issue a warning.

Prepare the create_graft() function for such a use case by adding a
`gentle` parameter. If set, we do not return an error when the replace ref
is unchanged, but a mere warning.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2018-04-29 00:44:32 +02:00 committed by Junio C Hamano
parent e24e871920
commit 041c98e22d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/replace.c
View File

@ -428,7 +428,7 @@ static int check_mergetags(struct commit *commit, int argc, const char **argv)
return for_each_mergetag(check_one_mergetag, commit, &mergetag_data); return for_each_mergetag(check_one_mergetag, commit, &mergetag_data);
} }


static int create_graft(int argc, const char **argv, int force) static int create_graft(int argc, const char **argv, int force, int gentle)
{ {
struct object_id old_oid, new_oid; struct object_id old_oid, new_oid;
const char *old_ref = argv[0]; const char *old_ref = argv[0];
@ -470,8 +470,13 @@ static int create_graft(int argc, const char **argv, int force)


strbuf_release(&buf); strbuf_release(&buf);


if (!oidcmp(&old_oid, &new_oid)) if (!oidcmp(&old_oid, &new_oid)) {
if (gentle) {
warning("graft for '%s' unnecessary", oid_to_hex(&old_oid));
return 0;
}
return error("new commit is the same as the old one: '%s'", oid_to_hex(&old_oid)); return error("new commit is the same as the old one: '%s'", oid_to_hex(&old_oid));
}


return replace_object_oid(old_ref, &old_oid, "replacement", &new_oid, force); return replace_object_oid(old_ref, &old_oid, "replacement", &new_oid, force);
} }
@ -547,7 +552,7 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
if (argc < 1) if (argc < 1)
usage_msg_opt("-g needs at least one argument", usage_msg_opt("-g needs at least one argument",
git_replace_usage, options); git_replace_usage, options);
return create_graft(argc, argv, force); return create_graft(argc, argv, force, 0);


case MODE_LIST: case MODE_LIST:
if (argc > 1) if (argc > 1)