undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: extract helper to update active_cache_tree

Browse Source 
This patch extracts the code from is_index_unchanged() to initialize or
update the index' cache tree (i.e. a tree object reflecting the current
index' top-level tree).

The new helper will be used in the upcoming code to support `git rebase
-i --root` via the sequencer.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2018-05-04 01:01:15 +02:00 committed by Junio C Hamano
parent 25cff9f109
commit ba97aea165
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sequencer.c
View File

@ -562,9 +562,23 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
return !clean; return !clean;
} }
static struct object_id *get_cache_tree_oid(void)
{
if (!active_cache_tree)
active_cache_tree = cache_tree();
if (!cache_tree_fully_valid(active_cache_tree))
if (cache_tree_update(&the_index, 0)) {
error(_("unable to update cache tree"));
return NULL;
}
return &active_cache_tree->oid;
}
static int is_index_unchanged(void) static int is_index_unchanged(void)
{ {
struct object_id head_oid; struct object_id head_oid, *cache_tree_oid;
struct commit *head_commit; struct commit *head_commit;
if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL)) if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL))
@ -583,15 +597,10 @@ static int is_index_unchanged(void)
if (parse_commit(head_commit)) if (parse_commit(head_commit))
return -1; return -1;
if (!active_cache_tree) if (!(cache_tree_oid = get_cache_tree_oid()))
active_cache_tree = cache_tree(); return -1;
if (!cache_tree_fully_valid(active_cache_tree)) return !oidcmp(cache_tree_oid, &head_commit->tree->object.oid);
if (cache_tree_update(&the_index, 0))
return error(_("unable to update cache tree"));
return !oidcmp(&active_cache_tree->oid,
&head_commit->tree->object.oid);
} }
static int write_author_script(const char *message) static int write_author_script(const char *message)