diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-11-19 13:07:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-21 03:06:15 (GMT) |
| commit | 031b2033e0b5c6276bbd93f276e1698f925fb498 (patch) | |
| tree | 213e0ccf758ac82833f6354c22732b358951fc5c /builtin/read-tree.c | |
| parent | 0e6550a2c631e032c1c283398e50e9e654c171f0 (diff) | |
| download | git-031b2033e0b5c6276bbd93f276e1698f925fb498.zip git-031b2033e0b5c6276bbd93f276e1698f925fb498.tar.gz git-031b2033e0b5c6276bbd93f276e1698f925fb498.tar.bz2 | |
cocci & cache.h: apply a selection of "pending" index-compatibility
Apply a selection of rules in "index-compatibility.pending.cocci"
tree-wide, and in doing so migrate them to
"index-compatibility.cocci".
As in preceding commits the only manual changes here are the macro
removals in "cache.h", and the update to the '*.cocci" rules. The rest
of the C code changes are the result of applying those updated rules.
Move rules for some rarely used cache compatibility macros from
"index-compatibility.pending.cocci" to "index-compatibility.cocci" and
apply them.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/read-tree.c')
| -rw-r--r-- | builtin/read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index fd70827..9ced755 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -192,7 +192,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) die(_("You need to resolve your current index first")); stage = opts.merge = 1; } - resolve_undo_clear(); + resolve_undo_clear_index(&the_index); for (i = 0; i < argc; i++) { const char *arg = argv[i]; |