зеркало из https://github.com/microsoft/git.git
builtin/reset: convert to use struct object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
Junio C Hamano
Родитель
031cee5b73
Коммит
3a5d7c55f7
|
|
@ -39,7 +39,7 @@ static inline int is_merge(void)
|
|||
return !access(git_path_merge_head(), F_OK);
|
||||
}
|
||||
|
||||
static int reset_index(const unsigned char *sha1, int reset_type, int quiet)
|
||||
static int reset_index(const struct object_id *oid, int reset_type, int quiet)
|
||||
{
|
||||
int nr = 1;
|
||||
struct tree_desc desc[2];
|
||||
|
|
@ -69,22 +69,22 @@ static int reset_index(const unsigned char *sha1, int reset_type, int quiet)
|
|||
read_cache_unmerged();
|
||||
|
||||
if (reset_type == KEEP) {
|
||||
unsigned char head_sha1[20];
|
||||
if (get_sha1("HEAD", head_sha1))
|
||||
struct object_id head_oid;
|
||||
if (get_oid("HEAD", &head_oid))
|
||||
return error(_("You do not have a valid HEAD."));
|
||||
if (!fill_tree_descriptor(desc, head_sha1))
|
||||
if (!fill_tree_descriptor(desc, head_oid.hash))
|
||||
return error(_("Failed to find tree of HEAD."));
|
||||
nr++;
|
||||
opts.fn = twoway_merge;
|
||||
}
|
||||
|
||||
if (!fill_tree_descriptor(desc + nr - 1, sha1))
|
||||
return error(_("Failed to find tree of %s."), sha1_to_hex(sha1));
|
||||
if (!fill_tree_descriptor(desc + nr - 1, oid->hash))
|
||||
return error(_("Failed to find tree of %s."), oid_to_hex(oid));
|
||||
if (unpack_trees(nr, desc, &opts))
|
||||
return -1;
|
||||
|
||||
if (reset_type == MIXED || reset_type == HARD) {
|
||||
tree = parse_tree_indirect(sha1);
|
||||
tree = parse_tree_indirect(oid->hash);
|
||||
prime_cache_tree(&the_index, tree);
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
|
|||
}
|
||||
|
||||
static int read_from_tree(const struct pathspec *pathspec,
|
||||
unsigned char *tree_sha1,
|
||||
struct object_id *tree_oid,
|
||||
int intent_to_add)
|
||||
{
|
||||
struct diff_options opt;
|
||||
|
|
@ -154,7 +154,7 @@ static int read_from_tree(const struct pathspec *pathspec,
|
|||
opt.format_callback = update_index_from_diff;
|
||||
opt.format_callback_data = &intent_to_add;
|
||||
|
||||
if (do_diff_cache(tree_sha1, &opt))
|
||||
if (do_diff_cache(tree_oid->hash, &opt))
|
||||
return 1;
|
||||
diffcore_std(&opt);
|
||||
diff_flush(&opt);
|
||||
|
|
@ -191,7 +191,7 @@ static void parse_args(struct pathspec *pathspec,
|
|||
const char **rev_ret)
|
||||
{
|
||||
const char *rev = "HEAD";
|
||||
unsigned char unused[20];
|
||||
struct object_id unused;
|
||||
/*
|
||||
* Possible arguments are:
|
||||
*
|
||||
|
|
@ -216,8 +216,8 @@ static void parse_args(struct pathspec *pathspec,
|
|||
* has to be unambiguous. If there is a single argument, it
|
||||
* can not be a tree
|
||||
*/
|
||||
else if ((!argv[1] && !get_sha1_committish(argv[0], unused)) ||
|
||||
(argv[1] && !get_sha1_treeish(argv[0], unused))) {
|
||||
else if ((!argv[1] && !get_sha1_committish(argv[0], unused.hash)) ||
|
||||
(argv[1] && !get_sha1_treeish(argv[0], unused.hash))) {
|
||||
/*
|
||||
* Ok, argv[0] looks like a commit/tree; it should not
|
||||
* be a filename.
|
||||
|
|
@ -241,24 +241,24 @@ static void parse_args(struct pathspec *pathspec,
|
|||
prefix, argv);
|
||||
}
|
||||
|
||||
static int reset_refs(const char *rev, const unsigned char *sha1)
|
||||
static int reset_refs(const char *rev, const struct object_id *oid)
|
||||
{
|
||||
int update_ref_status;
|
||||
struct strbuf msg = STRBUF_INIT;
|
||||
unsigned char *orig = NULL, sha1_orig[20],
|
||||
*old_orig = NULL, sha1_old_orig[20];
|
||||
struct object_id *orig = NULL, oid_orig,
|
||||
*old_orig = NULL, oid_old_orig;
|
||||
|
||||
if (!get_sha1("ORIG_HEAD", sha1_old_orig))
|
||||
old_orig = sha1_old_orig;
|
||||
if (!get_sha1("HEAD", sha1_orig)) {
|
||||
orig = sha1_orig;
|
||||
if (!get_oid("ORIG_HEAD", &oid_old_orig))
|
||||
old_orig = &oid_old_orig;
|
||||
if (!get_oid("HEAD", &oid_orig)) {
|
||||
orig = &oid_orig;
|
||||
set_reflog_message(&msg, "updating ORIG_HEAD", NULL);
|
||||
update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
|
||||
update_ref_oid(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
|
||||
UPDATE_REFS_MSG_ON_ERR);
|
||||
} else if (old_orig)
|
||||
delete_ref("ORIG_HEAD", old_orig, 0);
|
||||
delete_ref("ORIG_HEAD", old_orig->hash, 0);
|
||||
set_reflog_message(&msg, "updating HEAD", rev);
|
||||
update_ref_status = update_ref(msg.buf, "HEAD", sha1, orig, 0,
|
||||
update_ref_status = update_ref_oid(msg.buf, "HEAD", oid, orig, 0,
|
||||
UPDATE_REFS_MSG_ON_ERR);
|
||||
strbuf_release(&msg);
|
||||
return update_ref_status;
|
||||
|
|
@ -357,15 +357,15 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
|
|||
hold_locked_index(lock, 1);
|
||||
if (reset_type == MIXED) {
|
||||
int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
|
||||
if (read_from_tree(&pathspec, oid.hash, intent_to_add))
|
||||
if (read_from_tree(&pathspec, &oid, intent_to_add))
|
||||
return 1;
|
||||
if (get_git_work_tree())
|
||||
refresh_index(&the_index, flags, NULL, NULL,
|
||||
_("Unstaged changes after reset:"));
|
||||
} else {
|
||||
int err = reset_index(oid.hash, reset_type, quiet);
|
||||
int err = reset_index(&oid, reset_type, quiet);
|
||||
if (reset_type == KEEP && !err)
|
||||
err = reset_index(oid.hash, MIXED, quiet);
|
||||
err = reset_index(&oid, MIXED, quiet);
|
||||
if (err)
|
||||
die(_("Could not reset index file to revision '%s'."), rev);
|
||||
}
|
||||
|
|
@ -377,7 +377,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
|
|||
if (!pathspec.nr && !unborn) {
|
||||
/* Any resets without paths update HEAD to the head being
|
||||
* switched to, saving the previous head in ORIG_HEAD before. */
|
||||
update_ref_status = reset_refs(rev, oid.hash);
|
||||
update_ref_status = reset_refs(rev, &oid);
|
||||
|
||||
if (reset_type == HARD && !update_ref_status && !quiet)
|
||||
print_new_head_line(lookup_commit_reference(oid.hash));
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче