2009-02-02 05:12:44 +00:00
|
|
|
/*
|
|
|
|
* Builtin "git replace"
|
|
|
|
*
|
|
|
|
* Copyright (c) 2008 Christian Couder <chriscool@tuxfamily.org>
|
|
|
|
*
|
2013-06-18 17:44:58 +00:00
|
|
|
* Based on builtin/tag.c by Kristian Høgsberg <krh@redhat.com>
|
2009-02-02 05:12:44 +00:00
|
|
|
* and Carlos Rica <jasampler@gmail.com> that was itself based on
|
|
|
|
* git-tag.sh and mktag.c by Linus Torvalds.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "cache.h"
|
|
|
|
#include "builtin.h"
|
|
|
|
#include "refs.h"
|
|
|
|
#include "parse-options.h"
|
2014-04-26 20:00:57 +00:00
|
|
|
#include "run-command.h"
|
2014-07-19 15:01:14 +00:00
|
|
|
#include "tag.h"
|
2009-02-02 05:12:44 +00:00
|
|
|
|
|
|
|
static const char * const git_replace_usage[] = {
|
2012-08-20 12:32:36 +00:00
|
|
|
N_("git replace [-f] <object> <replacement>"),
|
2014-05-17 12:16:38 +00:00
|
|
|
N_("git replace [-f] --edit <object>"),
|
2014-07-19 15:01:08 +00:00
|
|
|
N_("git replace [-f] --graft <commit> [<parent>...]"),
|
2012-08-20 12:32:36 +00:00
|
|
|
N_("git replace -d <object>..."),
|
2013-12-11 07:46:10 +00:00
|
|
|
N_("git replace [--format=<format>] [-l [<pattern>]]"),
|
2009-02-02 05:12:44 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2013-12-28 11:00:05 +00:00
|
|
|
enum replace_format {
|
2014-06-24 09:43:07 +00:00
|
|
|
REPLACE_FORMAT_SHORT,
|
|
|
|
REPLACE_FORMAT_MEDIUM,
|
|
|
|
REPLACE_FORMAT_LONG
|
2013-12-28 11:00:05 +00:00
|
|
|
};
|
2013-12-11 07:46:10 +00:00
|
|
|
|
|
|
|
struct show_data {
|
|
|
|
const char *pattern;
|
2013-12-28 11:00:05 +00:00
|
|
|
enum replace_format format;
|
2013-12-11 07:46:10 +00:00
|
|
|
};
|
|
|
|
|
2015-05-25 18:38:44 +00:00
|
|
|
static int show_reference(const char *refname, const struct object_id *oid,
|
2009-02-02 05:12:44 +00:00
|
|
|
int flag, void *cb_data)
|
|
|
|
{
|
2013-12-11 07:46:10 +00:00
|
|
|
struct show_data *data = cb_data;
|
|
|
|
|
2014-02-15 02:01:46 +00:00
|
|
|
if (!wildmatch(data->pattern, refname, 0, NULL)) {
|
2013-12-28 11:00:05 +00:00
|
|
|
if (data->format == REPLACE_FORMAT_SHORT)
|
2013-12-11 07:46:10 +00:00
|
|
|
printf("%s\n", refname);
|
2013-12-28 11:00:05 +00:00
|
|
|
else if (data->format == REPLACE_FORMAT_MEDIUM)
|
2015-05-25 18:38:44 +00:00
|
|
|
printf("%s -> %s\n", refname, oid_to_hex(oid));
|
2013-12-28 11:00:05 +00:00
|
|
|
else { /* data->format == REPLACE_FORMAT_LONG */
|
2015-05-25 18:38:44 +00:00
|
|
|
struct object_id object;
|
2013-12-11 07:46:10 +00:00
|
|
|
enum object_type obj_type, repl_type;
|
2009-02-02 05:12:44 +00:00
|
|
|
|
2015-05-25 18:38:44 +00:00
|
|
|
if (get_sha1(refname, object.hash))
|
2013-12-11 07:46:10 +00:00
|
|
|
return error("Failed to resolve '%s' as a valid ref.", refname);
|
|
|
|
|
2015-05-25 18:38:44 +00:00
|
|
|
obj_type = sha1_object_info(object.hash, NULL);
|
|
|
|
repl_type = sha1_object_info(oid->hash, NULL);
|
2013-12-11 07:46:10 +00:00
|
|
|
|
|
|
|
printf("%s (%s) -> %s (%s)\n", refname, typename(obj_type),
|
2015-05-25 18:38:44 +00:00
|
|
|
oid_to_hex(oid), typename(repl_type));
|
2013-12-11 07:46:10 +00:00
|
|
|
}
|
|
|
|
}
|
2009-02-02 05:12:44 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-12-11 07:46:10 +00:00
|
|
|
static int list_replace_refs(const char *pattern, const char *format)
|
2009-02-02 05:12:44 +00:00
|
|
|
{
|
2013-12-11 07:46:10 +00:00
|
|
|
struct show_data data;
|
|
|
|
|
2009-02-02 05:12:44 +00:00
|
|
|
if (pattern == NULL)
|
|
|
|
pattern = "*";
|
2013-12-11 07:46:10 +00:00
|
|
|
data.pattern = pattern;
|
|
|
|
|
|
|
|
if (format == NULL || *format == '\0' || !strcmp(format, "short"))
|
2013-12-28 11:00:05 +00:00
|
|
|
data.format = REPLACE_FORMAT_SHORT;
|
2013-12-11 07:46:10 +00:00
|
|
|
else if (!strcmp(format, "medium"))
|
2013-12-28 11:00:05 +00:00
|
|
|
data.format = REPLACE_FORMAT_MEDIUM;
|
|
|
|
else if (!strcmp(format, "long"))
|
|
|
|
data.format = REPLACE_FORMAT_LONG;
|
2013-12-11 07:46:10 +00:00
|
|
|
else
|
|
|
|
die("invalid replace format '%s'\n"
|
2013-12-28 11:00:05 +00:00
|
|
|
"valid formats are 'short', 'medium' and 'long'\n",
|
2013-12-11 07:46:10 +00:00
|
|
|
format);
|
2009-02-02 05:12:44 +00:00
|
|
|
|
2015-05-25 18:38:44 +00:00
|
|
|
for_each_replace_ref(show_reference, (void *)&data);
|
2009-02-02 05:12:44 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef int (*each_replace_name_fn)(const char *name, const char *ref,
|
2017-02-21 23:47:30 +00:00
|
|
|
const struct object_id *oid);
|
2009-02-02 05:12:44 +00:00
|
|
|
|
|
|
|
static int for_each_replace_name(const char **argv, each_replace_name_fn fn)
|
|
|
|
{
|
2012-11-13 10:34:11 +00:00
|
|
|
const char **p, *full_hex;
|
2009-02-02 05:12:44 +00:00
|
|
|
char ref[PATH_MAX];
|
|
|
|
int had_error = 0;
|
2017-02-21 23:47:30 +00:00
|
|
|
struct object_id oid;
|
2009-02-02 05:12:44 +00:00
|
|
|
|
|
|
|
for (p = argv; *p; p++) {
|
2017-02-21 23:47:30 +00:00
|
|
|
if (get_oid(*p, &oid)) {
|
2012-11-13 10:34:11 +00:00
|
|
|
error("Failed to resolve '%s' as a valid ref.", *p);
|
2009-02-02 05:12:44 +00:00
|
|
|
had_error = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2017-02-21 23:47:30 +00:00
|
|
|
full_hex = oid_to_hex(&oid);
|
2015-06-11 21:34:59 +00:00
|
|
|
snprintf(ref, sizeof(ref), "%s%s", git_replace_ref_base, full_hex);
|
2012-11-13 10:34:11 +00:00
|
|
|
/* read_ref() may reuse the buffer */
|
2015-06-11 21:34:59 +00:00
|
|
|
full_hex = ref + strlen(git_replace_ref_base);
|
2017-02-21 23:47:30 +00:00
|
|
|
if (read_ref(ref, oid.hash)) {
|
2012-11-13 10:34:11 +00:00
|
|
|
error("replace ref '%s' not found.", full_hex);
|
2009-02-02 05:12:44 +00:00
|
|
|
had_error = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2017-02-21 23:47:30 +00:00
|
|
|
if (fn(full_hex, ref, &oid))
|
2009-02-02 05:12:44 +00:00
|
|
|
had_error = 1;
|
|
|
|
}
|
|
|
|
return had_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int delete_replace_ref(const char *name, const char *ref,
|
2017-02-21 23:47:30 +00:00
|
|
|
const struct object_id *oid)
|
2009-02-02 05:12:44 +00:00
|
|
|
{
|
2017-03-17 20:50:24 +00:00
|
|
|
if (delete_ref(NULL, ref, oid->hash, 0))
|
2009-02-02 05:12:44 +00:00
|
|
|
return 1;
|
|
|
|
printf("Deleted replace ref '%s'\n", name);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
static void check_ref_valid(struct object_id *object,
|
|
|
|
struct object_id *prev,
|
2014-05-17 12:16:35 +00:00
|
|
|
char *ref,
|
|
|
|
int ref_size,
|
|
|
|
int force)
|
|
|
|
{
|
|
|
|
if (snprintf(ref, ref_size,
|
2015-06-11 21:34:59 +00:00
|
|
|
"%s%s", git_replace_ref_base,
|
2017-02-21 23:47:30 +00:00
|
|
|
oid_to_hex(object)) > ref_size - 1)
|
2014-05-17 12:16:35 +00:00
|
|
|
die("replace ref name too long: %.*s...", 50, ref);
|
|
|
|
if (check_refname_format(ref, 0))
|
|
|
|
die("'%s' is not a valid ref name.", ref);
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
if (read_ref(ref, prev->hash))
|
|
|
|
oidclr(prev);
|
2014-05-17 12:16:35 +00:00
|
|
|
else if (!force)
|
|
|
|
die("replace ref '%s' already exists", ref);
|
|
|
|
}
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
static int replace_object_oid(const char *object_ref,
|
|
|
|
struct object_id *object,
|
2014-04-26 20:00:56 +00:00
|
|
|
const char *replace_ref,
|
2017-02-21 23:47:30 +00:00
|
|
|
struct object_id *repl,
|
2014-04-26 20:00:56 +00:00
|
|
|
int force)
|
2009-02-02 05:12:53 +00:00
|
|
|
{
|
2017-02-21 23:47:30 +00:00
|
|
|
struct object_id prev;
|
replace: forbid replacing an object with one of a different type
Users replacing an object with one of a different type were not
prevented to do so, even if it was obvious, and stated in the doc,
that bad things would result from doing that.
To avoid mistakes, it is better to just forbid that though.
If -f option, which means '--force', is used, we can allow an object
to be replaced with one of a different type, as the user should know
what (s)he is doing.
If one object is replaced with one of a different type, the only way
to keep the history valid is to also replace all the other objects
that point to the replaced object. That's because:
* Annotated tags contain the type of the tagged object.
* The tree/parent lines in commits must be a tree and commits, resp.
* The object types referred to by trees are specified in the 'mode'
field:
100644 and 100755 blob
160000 commit
040000 tree
(these are the only valid modes)
* Blobs don't point at anything.
The doc will be updated in a later patch.
Acked-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-06 05:10:53 +00:00
|
|
|
enum object_type obj_type, repl_type;
|
2009-02-02 05:12:53 +00:00
|
|
|
char ref[PATH_MAX];
|
2014-04-16 22:32:29 +00:00
|
|
|
struct ref_transaction *transaction;
|
|
|
|
struct strbuf err = STRBUF_INIT;
|
2009-02-02 05:12:53 +00:00
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
obj_type = sha1_object_info(object->hash, NULL);
|
|
|
|
repl_type = sha1_object_info(repl->hash, NULL);
|
replace: forbid replacing an object with one of a different type
Users replacing an object with one of a different type were not
prevented to do so, even if it was obvious, and stated in the doc,
that bad things would result from doing that.
To avoid mistakes, it is better to just forbid that though.
If -f option, which means '--force', is used, we can allow an object
to be replaced with one of a different type, as the user should know
what (s)he is doing.
If one object is replaced with one of a different type, the only way
to keep the history valid is to also replace all the other objects
that point to the replaced object. That's because:
* Annotated tags contain the type of the tagged object.
* The tree/parent lines in commits must be a tree and commits, resp.
* The object types referred to by trees are specified in the 'mode'
field:
100644 and 100755 blob
160000 commit
040000 tree
(these are the only valid modes)
* Blobs don't point at anything.
The doc will be updated in a later patch.
Acked-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-06 05:10:53 +00:00
|
|
|
if (!force && obj_type != repl_type)
|
|
|
|
die("Objects must be of the same type.\n"
|
|
|
|
"'%s' points to a replaced object of type '%s'\n"
|
|
|
|
"while '%s' points to a replacement object of type '%s'.",
|
|
|
|
object_ref, typename(obj_type),
|
|
|
|
replace_ref, typename(repl_type));
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
check_ref_valid(object, &prev, ref, sizeof(ref), force);
|
2009-02-02 05:12:53 +00:00
|
|
|
|
2014-04-16 22:32:29 +00:00
|
|
|
transaction = ref_transaction_begin(&err);
|
|
|
|
if (!transaction ||
|
2017-02-21 23:47:30 +00:00
|
|
|
ref_transaction_update(transaction, ref, repl->hash, prev.hash,
|
2015-02-17 17:00:15 +00:00
|
|
|
0, NULL, &err) ||
|
2014-04-30 19:22:42 +00:00
|
|
|
ref_transaction_commit(transaction, &err))
|
2014-04-16 22:32:29 +00:00
|
|
|
die("%s", err.buf);
|
2009-02-02 05:12:53 +00:00
|
|
|
|
2014-04-16 22:32:29 +00:00
|
|
|
ref_transaction_free(transaction);
|
2009-02-02 05:12:53 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-04-26 20:00:56 +00:00
|
|
|
static int replace_object(const char *object_ref, const char *replace_ref, int force)
|
|
|
|
{
|
2017-02-21 23:47:30 +00:00
|
|
|
struct object_id object, repl;
|
2014-04-26 20:00:56 +00:00
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
if (get_oid(object_ref, &object))
|
2014-04-26 20:00:56 +00:00
|
|
|
die("Failed to resolve '%s' as a valid ref.", object_ref);
|
2017-02-21 23:47:30 +00:00
|
|
|
if (get_oid(replace_ref, &repl))
|
2014-04-26 20:00:56 +00:00
|
|
|
die("Failed to resolve '%s' as a valid ref.", replace_ref);
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
return replace_object_oid(object_ref, &object, replace_ref, &repl, force);
|
2014-04-26 20:00:56 +00:00
|
|
|
}
|
|
|
|
|
2014-04-26 20:00:57 +00:00
|
|
|
/*
|
2014-06-24 09:46:31 +00:00
|
|
|
* Write the contents of the object named by "sha1" to the file "filename".
|
|
|
|
* If "raw" is true, then the object's raw contents are printed according to
|
|
|
|
* "type". Otherwise, we pretty-print the contents for human editing.
|
2014-04-26 20:00:57 +00:00
|
|
|
*/
|
2017-02-21 23:47:30 +00:00
|
|
|
static void export_object(const struct object_id *oid, enum object_type type,
|
2014-06-24 09:46:31 +00:00
|
|
|
int raw, const char *filename)
|
2014-04-26 20:00:57 +00:00
|
|
|
{
|
2014-08-19 19:09:35 +00:00
|
|
|
struct child_process cmd = CHILD_PROCESS_INIT;
|
2014-04-26 20:00:57 +00:00
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
|
|
|
|
if (fd < 0)
|
|
|
|
die_errno("unable to open %s for writing", filename);
|
|
|
|
|
2014-06-24 09:46:05 +00:00
|
|
|
argv_array_push(&cmd.args, "--no-replace-objects");
|
|
|
|
argv_array_push(&cmd.args, "cat-file");
|
2014-06-24 09:46:31 +00:00
|
|
|
if (raw)
|
|
|
|
argv_array_push(&cmd.args, typename(type));
|
|
|
|
else
|
|
|
|
argv_array_push(&cmd.args, "-p");
|
2017-02-21 23:47:30 +00:00
|
|
|
argv_array_push(&cmd.args, oid_to_hex(oid));
|
2014-04-26 20:00:57 +00:00
|
|
|
cmd.git_cmd = 1;
|
|
|
|
cmd.out = fd;
|
|
|
|
|
|
|
|
if (run_command(&cmd))
|
|
|
|
die("cat-file reported failure");
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read a previously-exported (and possibly edited) object back from "filename",
|
|
|
|
* interpreting it as "type", and writing the result to the object database.
|
|
|
|
* The sha1 of the written object is returned via sha1.
|
|
|
|
*/
|
2017-02-21 23:47:30 +00:00
|
|
|
static void import_object(struct object_id *oid, enum object_type type,
|
2014-06-24 09:46:31 +00:00
|
|
|
int raw, const char *filename)
|
2014-04-26 20:00:57 +00:00
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = open(filename, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
die_errno("unable to open %s for reading", filename);
|
|
|
|
|
2014-06-24 09:46:31 +00:00
|
|
|
if (!raw && type == OBJ_TREE) {
|
2014-04-26 20:00:57 +00:00
|
|
|
const char *argv[] = { "mktree", NULL };
|
2014-08-19 19:09:35 +00:00
|
|
|
struct child_process cmd = CHILD_PROCESS_INIT;
|
2014-04-26 20:00:57 +00:00
|
|
|
struct strbuf result = STRBUF_INIT;
|
|
|
|
|
|
|
|
cmd.argv = argv;
|
|
|
|
cmd.git_cmd = 1;
|
|
|
|
cmd.in = fd;
|
|
|
|
cmd.out = -1;
|
|
|
|
|
|
|
|
if (start_command(&cmd))
|
|
|
|
die("unable to spawn mktree");
|
|
|
|
|
|
|
|
if (strbuf_read(&result, cmd.out, 41) < 0)
|
|
|
|
die_errno("unable to read from mktree");
|
|
|
|
close(cmd.out);
|
|
|
|
|
|
|
|
if (finish_command(&cmd))
|
|
|
|
die("mktree reported failure");
|
2017-02-21 23:47:30 +00:00
|
|
|
if (get_oid_hex(result.buf, oid) < 0)
|
2014-04-26 20:00:57 +00:00
|
|
|
die("mktree did not return an object name");
|
|
|
|
|
|
|
|
strbuf_release(&result);
|
|
|
|
} else {
|
|
|
|
struct stat st;
|
|
|
|
int flags = HASH_FORMAT_CHECK | HASH_WRITE_OBJECT;
|
|
|
|
|
|
|
|
if (fstat(fd, &st) < 0)
|
|
|
|
die_errno("unable to fstat %s", filename);
|
2017-02-21 23:47:30 +00:00
|
|
|
if (index_fd(oid->hash, fd, &st, type, NULL, flags) < 0)
|
2014-04-26 20:00:57 +00:00
|
|
|
die("unable to write object to database");
|
|
|
|
/* index_fd close()s fd for us */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* No need to close(fd) here; both run-command and index-fd
|
|
|
|
* will have done it for us.
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
2014-06-24 09:46:31 +00:00
|
|
|
static int edit_and_replace(const char *object_ref, int force, int raw)
|
2014-04-26 20:00:57 +00:00
|
|
|
{
|
|
|
|
char *tmpfile = git_pathdup("REPLACE_EDITOBJ");
|
|
|
|
enum object_type type;
|
2017-02-21 23:47:30 +00:00
|
|
|
struct object_id old, new, prev;
|
2014-05-17 12:16:36 +00:00
|
|
|
char ref[PATH_MAX];
|
2014-04-26 20:00:57 +00:00
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
if (get_oid(object_ref, &old) < 0)
|
2014-04-26 20:00:57 +00:00
|
|
|
die("Not a valid object name: '%s'", object_ref);
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
type = sha1_object_info(old.hash, NULL);
|
2014-04-26 20:00:57 +00:00
|
|
|
if (type < 0)
|
2017-02-21 23:47:30 +00:00
|
|
|
die("unable to get object type for %s", oid_to_hex(&old));
|
2014-04-26 20:00:57 +00:00
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
check_ref_valid(&old, &prev, ref, sizeof(ref), force);
|
2014-05-17 12:16:36 +00:00
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
export_object(&old, type, raw, tmpfile);
|
2014-04-26 20:00:57 +00:00
|
|
|
if (launch_editor(tmpfile, NULL, NULL) < 0)
|
|
|
|
die("editing object file failed");
|
2017-02-21 23:47:30 +00:00
|
|
|
import_object(&new, type, raw, tmpfile);
|
2014-04-26 20:00:57 +00:00
|
|
|
|
|
|
|
free(tmpfile);
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
if (!oidcmp(&old, &new))
|
|
|
|
return error("new object is the same as the old one: '%s'", oid_to_hex(&old));
|
2014-05-17 12:16:34 +00:00
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
return replace_object_oid(object_ref, &old, "replacement", &new, force);
|
2014-04-26 20:00:57 +00:00
|
|
|
}
|
|
|
|
|
2014-07-19 15:01:08 +00:00
|
|
|
static void replace_parents(struct strbuf *buf, int argc, const char **argv)
|
|
|
|
{
|
|
|
|
struct strbuf new_parents = STRBUF_INIT;
|
|
|
|
const char *parent_start, *parent_end;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* find existing parents */
|
|
|
|
parent_start = buf->buf;
|
2017-02-21 23:47:30 +00:00
|
|
|
parent_start += GIT_SHA1_HEXSZ + 6; /* "tree " + "hex sha1" + "\n" */
|
2014-07-19 15:01:08 +00:00
|
|
|
parent_end = parent_start;
|
|
|
|
|
|
|
|
while (starts_with(parent_end, "parent "))
|
|
|
|
parent_end += 48; /* "parent " + "hex sha1" + "\n" */
|
|
|
|
|
|
|
|
/* prepare new parents */
|
|
|
|
for (i = 0; i < argc; i++) {
|
2017-02-21 23:47:30 +00:00
|
|
|
struct object_id oid;
|
|
|
|
if (get_oid(argv[i], &oid) < 0)
|
2014-07-19 15:01:08 +00:00
|
|
|
die(_("Not a valid object name: '%s'"), argv[i]);
|
2017-02-21 23:47:30 +00:00
|
|
|
lookup_commit_or_die(oid.hash, argv[i]);
|
|
|
|
strbuf_addf(&new_parents, "parent %s\n", oid_to_hex(&oid));
|
2014-07-19 15:01:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* replace existing parents with new ones */
|
|
|
|
strbuf_splice(buf, parent_start - buf->buf, parent_end - parent_start,
|
|
|
|
new_parents.buf, new_parents.len);
|
|
|
|
|
|
|
|
strbuf_release(&new_parents);
|
|
|
|
}
|
|
|
|
|
2014-07-19 15:01:14 +00:00
|
|
|
struct check_mergetag_data {
|
|
|
|
int argc;
|
|
|
|
const char **argv;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void check_one_mergetag(struct commit *commit,
|
|
|
|
struct commit_extra_header *extra,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct check_mergetag_data *mergetag_data = (struct check_mergetag_data *)data;
|
|
|
|
const char *ref = mergetag_data->argv[0];
|
2017-02-21 23:47:30 +00:00
|
|
|
struct object_id tag_oid;
|
2014-07-19 15:01:14 +00:00
|
|
|
struct tag *tag;
|
|
|
|
int i;
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), tag_oid.hash);
|
|
|
|
tag = lookup_tag(tag_oid.hash);
|
2014-07-19 15:01:14 +00:00
|
|
|
if (!tag)
|
|
|
|
die(_("bad mergetag in commit '%s'"), ref);
|
|
|
|
if (parse_tag_buffer(tag, extra->value, extra->len))
|
|
|
|
die(_("malformed mergetag in commit '%s'"), ref);
|
|
|
|
|
|
|
|
/* iterate over new parents */
|
|
|
|
for (i = 1; i < mergetag_data->argc; i++) {
|
2015-11-10 02:22:28 +00:00
|
|
|
struct object_id oid;
|
|
|
|
if (get_sha1(mergetag_data->argv[i], oid.hash) < 0)
|
2014-07-19 15:01:14 +00:00
|
|
|
die(_("Not a valid object name: '%s'"), mergetag_data->argv[i]);
|
2015-11-10 02:22:28 +00:00
|
|
|
if (!oidcmp(&tag->tagged->oid, &oid))
|
2014-07-19 15:01:14 +00:00
|
|
|
return; /* found */
|
|
|
|
}
|
|
|
|
|
|
|
|
die(_("original commit '%s' contains mergetag '%s' that is discarded; "
|
2017-02-21 23:47:30 +00:00
|
|
|
"use --edit instead of --graft"), ref, oid_to_hex(&tag_oid));
|
2014-07-19 15:01:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void check_mergetags(struct commit *commit, int argc, const char **argv)
|
|
|
|
{
|
|
|
|
struct check_mergetag_data mergetag_data;
|
|
|
|
|
|
|
|
mergetag_data.argc = argc;
|
|
|
|
mergetag_data.argv = argv;
|
|
|
|
for_each_mergetag(check_one_mergetag, commit, &mergetag_data);
|
|
|
|
}
|
|
|
|
|
2014-07-19 15:01:08 +00:00
|
|
|
static int create_graft(int argc, const char **argv, int force)
|
|
|
|
{
|
2017-02-21 23:47:30 +00:00
|
|
|
struct object_id old, new;
|
2014-07-19 15:01:08 +00:00
|
|
|
const char *old_ref = argv[0];
|
|
|
|
struct commit *commit;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
const char *buffer;
|
|
|
|
unsigned long size;
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
if (get_oid(old_ref, &old) < 0)
|
2014-07-19 15:01:08 +00:00
|
|
|
die(_("Not a valid object name: '%s'"), old_ref);
|
2017-02-21 23:47:30 +00:00
|
|
|
commit = lookup_commit_or_die(old.hash, old_ref);
|
2014-07-19 15:01:08 +00:00
|
|
|
|
|
|
|
buffer = get_commit_buffer(commit, &size);
|
|
|
|
strbuf_add(&buf, buffer, size);
|
|
|
|
unuse_commit_buffer(commit, buffer);
|
|
|
|
|
|
|
|
replace_parents(&buf, argc - 1, &argv[1]);
|
|
|
|
|
2014-07-19 15:01:12 +00:00
|
|
|
if (remove_signature(&buf)) {
|
|
|
|
warning(_("the original commit '%s' has a gpg signature."), old_ref);
|
|
|
|
warning(_("the signature will be removed in the replacement commit!"));
|
|
|
|
}
|
|
|
|
|
2014-07-19 15:01:14 +00:00
|
|
|
check_mergetags(commit, argc, argv);
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
if (write_sha1_file(buf.buf, buf.len, commit_type, new.hash))
|
2014-07-19 15:01:08 +00:00
|
|
|
die(_("could not write replacement commit for: '%s'"), old_ref);
|
|
|
|
|
|
|
|
strbuf_release(&buf);
|
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
if (!oidcmp(&old, &new))
|
|
|
|
return error("new commit is the same as the old one: '%s'", oid_to_hex(&old));
|
2014-07-19 15:01:08 +00:00
|
|
|
|
2017-02-21 23:47:30 +00:00
|
|
|
return replace_object_oid(old_ref, &old, "replacement", &new, force);
|
2014-07-19 15:01:08 +00:00
|
|
|
}
|
|
|
|
|
2009-02-02 05:12:44 +00:00
|
|
|
int cmd_replace(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2014-04-26 20:00:55 +00:00
|
|
|
int force = 0;
|
2014-06-24 09:46:31 +00:00
|
|
|
int raw = 0;
|
2013-12-11 07:46:10 +00:00
|
|
|
const char *format = NULL;
|
2014-04-26 20:00:55 +00:00
|
|
|
enum {
|
|
|
|
MODE_UNSPECIFIED = 0,
|
|
|
|
MODE_LIST,
|
|
|
|
MODE_DELETE,
|
2014-04-26 20:00:57 +00:00
|
|
|
MODE_EDIT,
|
2014-07-19 15:01:08 +00:00
|
|
|
MODE_GRAFT,
|
2014-04-26 20:00:55 +00:00
|
|
|
MODE_REPLACE
|
|
|
|
} cmdmode = MODE_UNSPECIFIED;
|
2009-02-02 05:12:44 +00:00
|
|
|
struct option options[] = {
|
2014-04-26 20:00:55 +00:00
|
|
|
OPT_CMDMODE('l', "list", &cmdmode, N_("list replace refs"), MODE_LIST),
|
|
|
|
OPT_CMDMODE('d', "delete", &cmdmode, N_("delete replace refs"), MODE_DELETE),
|
2014-04-26 20:00:57 +00:00
|
|
|
OPT_CMDMODE('e', "edit", &cmdmode, N_("edit existing object"), MODE_EDIT),
|
2014-07-19 15:01:08 +00:00
|
|
|
OPT_CMDMODE('g', "graft", &cmdmode, N_("change a commit's parents"), MODE_GRAFT),
|
2013-09-25 06:35:24 +00:00
|
|
|
OPT_BOOL('f', "force", &force, N_("replace the ref if it exists")),
|
2014-06-24 09:46:31 +00:00
|
|
|
OPT_BOOL(0, "raw", &raw, N_("do not pretty-print contents for --edit")),
|
2013-12-11 07:46:10 +00:00
|
|
|
OPT_STRING(0, "format", &format, N_("format"), N_("use this format")),
|
2009-02-02 05:12:44 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
2014-02-18 11:24:55 +00:00
|
|
|
check_replace_refs = 0;
|
2016-04-20 06:38:03 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2013-12-11 07:46:12 +00:00
|
|
|
|
2009-02-02 05:12:58 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);
|
2009-02-02 05:12:44 +00:00
|
|
|
|
2014-04-26 20:00:55 +00:00
|
|
|
if (!cmdmode)
|
|
|
|
cmdmode = argc ? MODE_REPLACE : MODE_LIST;
|
2014-04-26 20:00:54 +00:00
|
|
|
|
2014-04-26 20:00:55 +00:00
|
|
|
if (format && cmdmode != MODE_LIST)
|
2014-04-26 20:00:54 +00:00
|
|
|
usage_msg_opt("--format cannot be used when not listing",
|
2013-12-11 07:46:10 +00:00
|
|
|
git_replace_usage, options);
|
|
|
|
|
2014-07-19 15:01:08 +00:00
|
|
|
if (force &&
|
|
|
|
cmdmode != MODE_REPLACE &&
|
|
|
|
cmdmode != MODE_EDIT &&
|
|
|
|
cmdmode != MODE_GRAFT)
|
2014-04-26 20:00:55 +00:00
|
|
|
usage_msg_opt("-f only makes sense when writing a replacement",
|
2009-02-02 05:13:06 +00:00
|
|
|
git_replace_usage, options);
|
2009-02-02 05:12:53 +00:00
|
|
|
|
2014-06-24 09:46:31 +00:00
|
|
|
if (raw && cmdmode != MODE_EDIT)
|
|
|
|
usage_msg_opt("--raw only makes sense with --edit",
|
|
|
|
git_replace_usage, options);
|
|
|
|
|
2014-04-26 20:00:55 +00:00
|
|
|
switch (cmdmode) {
|
|
|
|
case MODE_DELETE:
|
2009-02-02 05:12:44 +00:00
|
|
|
if (argc < 1)
|
2009-02-02 05:13:06 +00:00
|
|
|
usage_msg_opt("-d needs at least one argument",
|
|
|
|
git_replace_usage, options);
|
2009-02-02 05:12:44 +00:00
|
|
|
return for_each_replace_name(argv, delete_replace_ref);
|
|
|
|
|
2014-04-26 20:00:55 +00:00
|
|
|
case MODE_REPLACE:
|
2009-02-02 05:12:53 +00:00
|
|
|
if (argc != 2)
|
2009-02-02 05:13:06 +00:00
|
|
|
usage_msg_opt("bad number of arguments",
|
|
|
|
git_replace_usage, options);
|
2009-02-02 05:12:53 +00:00
|
|
|
return replace_object(argv[0], argv[1], force);
|
|
|
|
|
2014-04-26 20:00:57 +00:00
|
|
|
case MODE_EDIT:
|
|
|
|
if (argc != 1)
|
|
|
|
usage_msg_opt("-e needs exactly one argument",
|
|
|
|
git_replace_usage, options);
|
2014-06-24 09:46:31 +00:00
|
|
|
return edit_and_replace(argv[0], force, raw);
|
2014-04-26 20:00:57 +00:00
|
|
|
|
2014-07-19 15:01:08 +00:00
|
|
|
case MODE_GRAFT:
|
|
|
|
if (argc < 1)
|
|
|
|
usage_msg_opt("-g needs at least one argument",
|
|
|
|
git_replace_usage, options);
|
|
|
|
return create_graft(argc, argv, force);
|
|
|
|
|
2014-04-26 20:00:55 +00:00
|
|
|
case MODE_LIST:
|
|
|
|
if (argc > 1)
|
|
|
|
usage_msg_opt("only one pattern can be given with -l",
|
|
|
|
git_replace_usage, options);
|
|
|
|
return list_replace_refs(argv[0], format);
|
2009-02-02 05:12:44 +00:00
|
|
|
|
2014-04-26 20:00:55 +00:00
|
|
|
default:
|
|
|
|
die("BUG: invalid cmdmode %d", (int)cmdmode);
|
|
|
|
}
|
2009-02-02 05:12:44 +00:00
|
|
|
}
|