Re: mergetool feature request - select remote or local
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:36
Daniel Barkalow [off-list ref] writes:
On Wed, 14 May 2008, Junio C Hamano wrote: ...quoted
If this turns out to be a better approach, perhaps we would further want to tweak things to make: $ git checkout --unmerged MERGE_HEAD [--] [<pathspec>...] to work (if you want "local", you would use "HEAD" instead of "MERGE_HEAD").This is "for all (or some, by pathspecs) files currently unmerged in the index, resolve them to the version in MERGE_HEAD", right?
Yeah, and possibly limited by pathspec as usual.
quoted
I would have done so here if "git checkout" were still a scripted version, but now it is in C, it would take significantly more effort than it is worth just to raise a weatherbaloon.Like this (also untested)? (This is missing defaulting to a pathspec of '.' if --unmerged is used without any pathspecs)
Looks easy enough. Caleb, does this approach fit the situation you described better?
quoted hunk
diff --git a/builtin-checkout.c b/builtin-checkout.c index 10ec137..0bae1d4 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c@@ -42,6 +42,8 @@ static int post_checkout_hook(struct commit *old, struct commit *new, return run_command(&proc); } +static int unmerged; + static int update_some(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage) {@@ -59,6 +61,13 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen, hashcpy(ce->sha1, sha1); memcpy(ce->name, base, baselen); memcpy(ce->name + baselen, pathname, len - baselen); + if (unmerged) { + int pos = cache_name_pos(ce->name, len); + if (!(pos && pos < active_nr && ce_same_name(active_cache[pos], active_cache[pos + 1]))) { + free(ce); + return 0; + } + } ce->ce_flags = create_ce_flags(len, 0); ce->ce_mode = create_ce_mode(mode); add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);@@ -508,6 +517,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) BRANCH_TRACK_EXPLICIT), OPT_BOOLEAN('f', NULL, &opts.force, "force"), OPT_BOOLEAN('m', NULL, &opts.merge, "merge"), + OPT_BOOLEAN( 0 , "unmerged", &unmerged, "check out unmerged paths"), OPT_END(), };