mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'
One part of "git am" had an oddball helper function that called stuff from outside "his" as opposed to calling what we have "ours", which was not gender-neutral and also inconsistent with the rest of the system where outside stuff is usuall called "theirs" in contrast to "ours". * js/am-call-theirs-theirs-in-fallback-3way: am: counteract gender bias
This commit is contained in:
commit
3d55eea805
16
builtin/am.c
16
builtin/am.c
|
@ -1579,14 +1579,14 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f
|
|||
}
|
||||
|
||||
/**
|
||||
* Do the three-way merge using fake ancestor, his tree constructed
|
||||
* Do the three-way merge using fake ancestor, their tree constructed
|
||||
* from the fake ancestor and the postimage of the patch, and our
|
||||
* state.
|
||||
*/
|
||||
static int run_fallback_merge_recursive(const struct am_state *state,
|
||||
unsigned char *orig_tree,
|
||||
unsigned char *our_tree,
|
||||
unsigned char *his_tree)
|
||||
unsigned char *their_tree)
|
||||
{
|
||||
struct child_process cp = CHILD_PROCESS_INIT;
|
||||
int status;
|
||||
|
@ -1594,7 +1594,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,
|
|||
cp.git_cmd = 1;
|
||||
|
||||
argv_array_pushf(&cp.env_array, "GITHEAD_%s=%.*s",
|
||||
sha1_to_hex(his_tree), linelen(state->msg), state->msg);
|
||||
sha1_to_hex(their_tree), linelen(state->msg), state->msg);
|
||||
if (state->quiet)
|
||||
argv_array_push(&cp.env_array, "GIT_MERGE_VERBOSITY=0");
|
||||
|
||||
|
@ -1602,7 +1602,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,
|
|||
argv_array_push(&cp.args, sha1_to_hex(orig_tree));
|
||||
argv_array_push(&cp.args, "--");
|
||||
argv_array_push(&cp.args, sha1_to_hex(our_tree));
|
||||
argv_array_push(&cp.args, sha1_to_hex(his_tree));
|
||||
argv_array_push(&cp.args, sha1_to_hex(their_tree));
|
||||
|
||||
status = run_command(&cp) ? (-1) : 0;
|
||||
discard_cache();
|
||||
|
@ -1615,7 +1615,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,
|
|||
*/
|
||||
static int fall_back_threeway(const struct am_state *state, const char *index_path)
|
||||
{
|
||||
unsigned char orig_tree[GIT_SHA1_RAWSZ], his_tree[GIT_SHA1_RAWSZ],
|
||||
unsigned char orig_tree[GIT_SHA1_RAWSZ], their_tree[GIT_SHA1_RAWSZ],
|
||||
our_tree[GIT_SHA1_RAWSZ];
|
||||
|
||||
if (get_sha1("HEAD", our_tree) < 0)
|
||||
|
@ -1652,7 +1652,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
|
|||
return error(_("Did you hand edit your patch?\n"
|
||||
"It does not apply to blobs recorded in its index."));
|
||||
|
||||
if (write_index_as_tree(his_tree, &the_index, index_path, 0, NULL))
|
||||
if (write_index_as_tree(their_tree, &the_index, index_path, 0, NULL))
|
||||
return error("could not write tree");
|
||||
|
||||
say(state, stdout, _("Falling back to patching base and 3-way merge..."));
|
||||
|
@ -1662,13 +1662,13 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
|
|||
|
||||
/*
|
||||
* This is not so wrong. Depending on which base we picked, orig_tree
|
||||
* may be wildly different from ours, but his_tree has the same set of
|
||||
* may be wildly different from ours, but their_tree has the same set of
|
||||
* wildly different changes in parts the patch did not touch, so
|
||||
* recursive ends up canceling them, saying that we reverted all those
|
||||
* changes.
|
||||
*/
|
||||
|
||||
if (run_fallback_merge_recursive(state, orig_tree, our_tree, his_tree)) {
|
||||
if (run_fallback_merge_recursive(state, orig_tree, our_tree, their_tree)) {
|
||||
rerere(state->allow_rerere_autoupdate);
|
||||
return error(_("Failed to merge in the changes."));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue