1579
}
1580
1581
/**
1582
- * Do the three-way merge using fake ancestor, his tree constructed
1582
+ * Do the three-way merge using fake ancestor, their tree constructed
1583
* from the fake ancestor and the postimage of the patch, and our
1584
* state.
1585
*/
1586
static int run_fallback_merge_recursive(const struct am_state *state,
1587
unsigned char *orig_tree,
1588
unsigned char *our_tree,
1589
- unsigned char *his_tree)
1589
+ unsigned char *their_tree)
1590
{
1591
struct child_process cp = CHILD_PROCESS_INIT;
1592
int status;
1594
cp.git_cmd = 1;
1595
1596
argv_array_pushf(&cp.env_array, "GITHEAD_%s=%.*s",
1597
- sha1_to_hex(his_tree), linelen(state->msg), state->msg);
1597
+ sha1_to_hex(their_tree), linelen(state->msg), state->msg);
1598
if (state->quiet)
1599
argv_array_push(&cp.env_array, "GIT_MERGE_VERBOSITY=0");
1600
1602
argv_array_push(&cp.args, sha1_to_hex(orig_tree));
1603
argv_array_push(&cp.args, "--");
1604
argv_array_push(&cp.args, sha1_to_hex(our_tree));
1605
- argv_array_push(&cp.args, sha1_to_hex(his_tree));
1605
+ argv_array_push(&cp.args, sha1_to_hex(their_tree));
1606
1607
status = run_command(&cp) ? (-1) : 0;
1608
discard_cache();
1615
*/
1616
static int fall_back_threeway(const struct am_state *state, const char *index_path)
1617
{
1618
- unsigned char orig_tree[GIT_SHA1_RAWSZ], his_tree[GIT_SHA1_RAWSZ],
1618
+ unsigned char orig_tree[GIT_SHA1_RAWSZ], their_tree[GIT_SHA1_RAWSZ],
1619
our_tree[GIT_SHA1_RAWSZ];
1620
1621
if (get_sha1("HEAD", our_tree) < 0)
1652
return error(_("Did you hand edit your patch?\n"
1653
"It does not apply to blobs recorded in its index."));
1654
1655
- if (write_index_as_tree(his_tree, &the_index, index_path, 0, NULL))
1655
+ if (write_index_as_tree(their_tree, &the_index, index_path, 0, NULL))
1656
return error("could not write tree");
1657
1658
say(state, stdout, _("Falling back to patching base and 3-way merge..."));
1662
1663
/*
1664
* This is not so wrong. Depending on which base we picked, orig_tree
1665
- * may be wildly different from ours, but his_tree has the same set of
1665
+ * may be wildly different from ours, but their_tree has the same set of
1666
* wildly different changes in parts the patch did not touch, so
1667
* recursive ends up canceling them, saying that we reverted all those
1668
* changes.
1669
*/
1670
1671
- if (run_fallback_merge_recursive(state, orig_tree, our_tree, his_tree)) {
1671
+ if (run_fallback_merge_recursive(state, orig_tree, our_tree, their_tree)) {
1672
rerere(state->allow_rerere_autoupdate);
1673
return error(_("Failed to merge in the changes."));
1674
}