{"thread":{"id":"42790","subject":"[PATCH] am: counteract gender bias","startedAt":"2016-07-07T11:47:35Z","lastAt":"2016-07-08T21:39:14Z","messageCount":10,"participants":["Johannes Schindelin","Mike Hommey","Jakub Narębski","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"290931","messageId":"d54f8f8b32ecc024eb3a58dd42ef9f855f8e2cb9.1467892022.git.johannes.schindelin@gmx.de","threadId":"42790","inReplyTo":null,"subject":"[PATCH] am: counteract gender bias","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-07-07T11:47:19Z","receivedAt":"2016-07-07T11:47:35Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for\nalmost 11 years already, we demonstrated our disrespect to the pioneers\nof software development like Ada Lovelace, Grace Hopper and Margaret\nHamilton, by pretending that each and every software developer is male\n(\"his_tree\"). It appears almost as if we weren't fully aware that the\nfirst professional software developers were all female.\n\nWe know our field to have this unfortunate gender bias that has nothing\nto do with qualification or biological reasons, and we are very sad\nabout the current gender imbalance of the Git developer community.\n\nLet's start changing that by using the variable name \"her_tree\" for an\nequal number of years out of fairness, and change to the gender neutral\n\"their_tree\" after that.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\nPublished-As: https://github.com/dscho/git/releases/tag/gender-bias-v1\n builtin/am.c | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/builtin/am.c b/builtin/am.c\nindex d5da5fe..2c7f3dd 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -1584,14 +1584,14 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f\n }\n \n /**\n- * Do the three-way merge using fake ancestor, his tree constructed\n+ * Do the three-way merge using fake ancestor, her tree constructed\n  * from the fake ancestor and the postimage of the patch, and our\n  * state.\n  */\n static int run_fallback_merge_recursive(const struct am_state *state,\n \t\t\t\t\tunsigned char *orig_tree,\n \t\t\t\t\tunsigned char *our_tree,\n-\t\t\t\t\tunsigned char *his_tree)\n+\t\t\t\t\tunsigned char *her_tree)\n {\n \tstruct child_process cp = CHILD_PROCESS_INIT;\n \tint status;\n@@ -1599,7 +1599,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n \tcp.git_cmd = 1;\n \n \targv_array_pushf(&cp.env_array, \"GITHEAD_%s=%.*s\",\n-\t\t\t sha1_to_hex(his_tree), linelen(state->msg), state->msg);\n+\t\t\t sha1_to_hex(her_tree), linelen(state->msg), state->msg);\n \tif (state->quiet)\n \t\targv_array_push(&cp.env_array, \"GIT_MERGE_VERBOSITY=0\");\n \n@@ -1607,7 +1607,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n \targv_array_push(&cp.args, sha1_to_hex(orig_tree));\n \targv_array_push(&cp.args, \"--\");\n \targv_array_push(&cp.args, sha1_to_hex(our_tree));\n-\targv_array_push(&cp.args, sha1_to_hex(his_tree));\n+\targv_array_push(&cp.args, sha1_to_hex(her_tree));\n \n \tstatus = run_command(&cp) ? (-1) : 0;\n \tdiscard_cache();\n@@ -1620,7 +1620,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n  */\n static int fall_back_threeway(const struct am_state *state, const char *index_path)\n {\n-\tunsigned char orig_tree[GIT_SHA1_RAWSZ], his_tree[GIT_SHA1_RAWSZ],\n+\tunsigned char orig_tree[GIT_SHA1_RAWSZ], her_tree[GIT_SHA1_RAWSZ],\n \t\t      our_tree[GIT_SHA1_RAWSZ];\n \n \tif (get_sha1(\"HEAD\", our_tree) < 0)\n@@ -1657,7 +1657,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa\n \t\treturn error(_(\"Did you hand edit your patch?\\n\"\n \t\t\t\t\"It does not apply to blobs recorded in its index.\"));\n \n-\tif (write_index_as_tree(his_tree, &the_index, index_path, 0, NULL))\n+\tif (write_index_as_tree(her_tree, &the_index, index_path, 0, NULL))\n \t\treturn error(\"could not write tree\");\n \n \tsay(state, stdout, _(\"Falling back to patching base and 3-way merge...\"));\n@@ -1667,13 +1667,13 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa\n \n \t/*\n \t * This is not so wrong. Depending on which base we picked, orig_tree\n-\t * may be wildly different from ours, but his_tree has the same set of\n+\t * may be wildly different from ours, but her_tree has the same set of\n \t * wildly different changes in parts the patch did not touch, so\n \t * recursive ends up canceling them, saying that we reverted all those\n \t * changes.\n \t */\n \n-\tif (run_fallback_merge_recursive(state, orig_tree, our_tree, his_tree)) {\n+\tif (run_fallback_merge_recursive(state, orig_tree, our_tree, her_tree)) {\n \t\trerere(state->allow_rerere_autoupdate);\n \t\treturn error(_(\"Failed to merge in the changes.\"));\n \t}\n-- \n2.9.0.278.g1caae67\n\nbase-commit: 5c589a73de4394ad125a4effac227b3aec856fa1\n"},{"id":"290933","messageId":"20160707124943.GA22668@glandium.org","threadId":"42790","inReplyTo":"d54f8f8b32ecc024eb3a58dd42ef9f855f8e2cb9.1467892022.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH] am: counteract gender bias","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2016-07-07T12:49:43Z","receivedAt":"2016-07-07T12:50:22Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Thu, Jul 07, 2016 at 01:47:19PM +0200, Johannes Schindelin wrote:\n> Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for\n> almost 11 years already, we demonstrated our disrespect to the pioneers\n> of software development like Ada Lovelace, Grace Hopper and Margaret\n> Hamilton, by pretending that each and every software developer is male\n> (\"his_tree\"). It appears almost as if we weren't fully aware that the\n> first professional software developers were all female.\n> \n> We know our field to have this unfortunate gender bias that has nothing\n> to do with qualification or biological reasons, and we are very sad\n> about the current gender imbalance of the Git developer community.\n> \n> Let's start changing that by using the variable name \"her_tree\" for an\n> equal number of years out of fairness, and change to the gender neutral\n> \"their_tree\" after that.\n\nYou make it sound like the decision to use \"his\" was conscious and on\npurpose. I doubt that was the case, especially 11 years ago, when these\nissues weren't as publicized. Let's not attribute to malice on part of\nthe people who wrote those lines what can be attributed to linguistics.\n\nMike\n"},{"id":"290934","messageId":"577E580B.5090000@gmail.com","threadId":"42790","inReplyTo":"20160707124943.GA22668@glandium.org","subject":"Re: [PATCH] am: counteract gender bias","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2016-07-07T13:24:27Z","receivedAt":"2016-07-07T13:24:42Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"W dniu 2016-07-07 o 14:49, Mike Hommey pisze:\n> On Thu, Jul 07, 2016 at 01:47:19PM +0200, Johannes Schindelin wrote:\n>> Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for\n>> almost 11 years already, we demonstrated our disrespect to the pioneers\n>> of software development like Ada Lovelace, Grace Hopper and Margaret\n>> Hamilton, by pretending that each and every software developer is male\n>> (\"his_tree\"). It appears almost as if we weren't fully aware that the\n>> first professional software developers were all female.\n>>\n>> We know our field to have this unfortunate gender bias that has nothing\n>> to do with qualification or biological reasons, and we are very sad\n>> about the current gender imbalance of the Git developer community.\n>>\n>> Let's start changing that by using the variable name \"her_tree\" for an\n>> equal number of years out of fairness, and change to the gender neutral\n>> \"their_tree\" after that.\n> \n> You make it sound like the decision to use \"his\" was conscious and on\n> purpose. I doubt that was the case, especially 11 years ago, when these\n> issues weren't as publicized. Let's not attribute to malice on part of\n> the people who wrote those lines what can be attributed to linguistics.\n\nAlso, in all (?) other places we use \"ours\" and \"theirs\"; it looks like\ngit-am was a strange exception with \"ours\" and \"his\" (also, it was/is\ninconsistent in using plural vs singular form).  Though perhaps it was\ncreated before the terminology solidified...\n\nAs to why it was not noticed and not fixed: probably no-one worked\nin this area, thus nobody noticed this (callee just don't care how the\nparameter is named).\n\nInstead of nebulous \"fairness\" (i.e., be unfair in other direction),\nin my opinion it would be better to simply fix the issue, be consistent\nand use common terminology.\n-- \nJakub Narębski\n\n"},{"id":"290935","messageId":"alpine.DEB.2.20.1607071611100.6426@virtualbox","threadId":"42790","inReplyTo":"20160707124943.GA22668@glandium.org","subject":"Re: [PATCH] am: counteract gender bias","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-07-07T14:12:23Z","receivedAt":"2016-07-07T14:13:01Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Mike,\n\nOn Thu, 7 Jul 2016, Mike Hommey wrote:\n\n> On Thu, Jul 07, 2016 at 01:47:19PM +0200, Johannes Schindelin wrote:\n> > Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for\n> > almost 11 years already, we demonstrated our disrespect to the pioneers\n> > of software development like Ada Lovelace, Grace Hopper and Margaret\n> > Hamilton, by pretending that each and every software developer is male\n> > (\"his_tree\"). It appears almost as if we weren't fully aware that the\n> > first professional software developers were all female.\n> > \n> > We know our field to have this unfortunate gender bias that has nothing\n> > to do with qualification or biological reasons, and we are very sad\n> > about the current gender imbalance of the Git developer community.\n> > \n> > Let's start changing that by using the variable name \"her_tree\" for an\n> > equal number of years out of fairness, and change to the gender neutral\n> > \"their_tree\" after that.\n> \n> You make it sound like the decision to use \"his\" was conscious and on\n> purpose. I doubt that was the case, especially 11 years ago, when these\n> issues weren't as publicized. Let's not attribute to malice on part of\n> the people who wrote those lines what can be attributed to linguistics.\n\nIt was not my intention to imply that the original decision was conscious.\n\nWhat with me being a non-native speaker, would you kindly suggest a commit\nmessage that conveys the intention better?\n\nThanks,\nDscho\n"},{"id":"290936","messageId":"alpine.DEB.2.20.1607071616290.6426@virtualbox","threadId":"42790","inReplyTo":"577E580B.5090000@gmail.com","subject":"Re: [PATCH] am: counteract gender bias","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-07-07T14:17:12Z","receivedAt":"2016-07-07T14:17:48Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Kuba,\n\nOn Thu, 7 Jul 2016, Jakub Narębski wrote:\n\n> Instead of nebulous \"fairness\" (i.e., be unfair in other direction),\n> [...]\n\nThere is nothing nebulous about it.\n\nCiao,\nDscho"},{"id":"290963","messageId":"xmqq37nlqvse.fsf@gitster.mtv.corp.google.com","threadId":"42790","inReplyTo":"577E580B.5090000@gmail.com","subject":"Re: [PATCH] am: counteract gender bias","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-07-07T16:04:33Z","receivedAt":"2016-07-07T16:04:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narębski <jnareb@gmail.com> writes:\n\n> Also, in all (?) other places we use \"ours\" and \"theirs\"; it looks like\n> git-am was a strange exception with \"ours\" and \"his\" (also, it was/is\n> inconsistent in using plural vs singular form).  Though perhaps it was\n> created before the terminology solidified...\n\nI also thought that \"ours\" vs \"his\" was strange mixture of plural\nand singular when I first saw it, but it turns out there was no\nmixture.\n\nIt originates at 47f0b6d5 (Fall back to three-way merge when\napplying a patch., 2005-10-06), where the code used $his_tree and\n$orig_tree, (there was no reference to \"our\" tree), both singular.\nThey were copied to \"git am\" introduced at d1c5f2a4 (Add git-am,\napplymbox replacement., 2005-10-07) almost verbatim.\n\nThe use of \"ours\" & \"theirs\" is now established, and I agree with\nyou that the use of \"his\" that is contained to the fall_back_3way\nhelper function (cf. contrib/examples/git-am.sh) is an oddball.\n\nWe should just use \"theirs\" to be consistent from the beginning, as\nyou suggested.  There is no need to churn the codebase for political\ncorrectness to first use \"hers\" that everybody knows will *not* be\nthe final form.\n"},{"id":"291009","messageId":"alpine.DEB.2.20.1607080845360.6426@virtualbox","threadId":"42790","inReplyTo":"xmqq37nlqvse.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] am: counteract gender bias","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-07-08T07:08:06Z","receivedAt":"2016-07-08T07:08:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 7 Jul 2016, Junio C Hamano wrote:\n\n> We should just use \"theirs\" to be consistent from the beginning, as\n> you suggested.  There is no need to churn the codebase for political\n> correctness to first use \"hers\" that everybody knows will *not* be\n> the final form.\n\nI will change the patch to say \"theirs\" (BTW \"they\" is nowadays considered\nnot necessarily plural only, but can be used as a gender-neutral singular:\nhttps://en.wikipedia.org/wiki/They).\n\nHowever.\n\nI strongly disagree that this is the correct course of action. In my view,\nthis has nothing to do with political correctness. It has all to do with\nrespect instead. And I find it disrespectful to quietly paper over the\nissue instead of making a bold statement (which my patch constitutes).\n\nThere seems to be no support for my position.\n\nTherefore, with sadness, I set this aside as yet another concession to\nthose men who are really comfortable to equate \"programmer\" with \"he\" in\ntheir minds and at the same time feel utterly offended when addressed as\n\"How are you ladies doing today?\".\n\nI absolutely despise having to change this patch, yet I do not currently\nhave the time nor the nerve to insist on my version of the patch.\n\nRegards,\nJohannes\n\nP.S.: Having said that, I do notice that the communication on this mailing\nlist has become much more civil in the past few years. I am pleased by\nthat, and I am hoping for much more, to the point where we are truly\ninclusive. It will be more productive, and also much more fun.\n"},{"id":"291010","messageId":"ceb80e45d1f02b71cc5ad2d7ded04360c530a9a8.1467962234.git.johannes.schindelin@gmx.de","threadId":"42790","inReplyTo":"d54f8f8b32ecc024eb3a58dd42ef9f855f8e2cb9.1467892022.git.johannes.schindelin@gmx.de","subject":"[PATCH v2] am: counteract gender bias","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-07-08T07:17:34Z","receivedAt":"2016-07-08T07:18:02Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for\nalmost 11 years already, we used a male form to describe \"the other\ntree\".\n\nWhile most likely unintended, this gave the erroneous impression as if\nthe Git developers thought of users as male, and were unaware of the\nimportant role in software development played by female actors such as\nAda Lovelace, Grace Hopper and Margaret Hamilton. In fact, the first\nprofessional software developers were all female.\n\nLet's change those unfortunate references to the gender neutral \"their\ntree\".\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\nPublished-As: https://github.com/dscho/git/releases/tag/gender-bias-v2\n builtin/am.c | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)\nInterdiff vs v1:\n\n diff --git a/builtin/am.c b/builtin/am.c\n index 2c7f3dd..1f0aa99 100644\n --- a/builtin/am.c\n +++ b/builtin/am.c\n @@ -1584,14 +1584,14 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f\n  }\n  \n  /**\n - * Do the three-way merge using fake ancestor, her tree constructed\n + * Do the three-way merge using fake ancestor, their tree constructed\n   * from the fake ancestor and the postimage of the patch, and our\n   * state.\n   */\n  static int run_fallback_merge_recursive(const struct am_state *state,\n  \t\t\t\t\tunsigned char *orig_tree,\n  \t\t\t\t\tunsigned char *our_tree,\n -\t\t\t\t\tunsigned char *her_tree)\n +\t\t\t\t\tunsigned char *their_tree)\n  {\n  \tstruct child_process cp = CHILD_PROCESS_INIT;\n  \tint status;\n @@ -1599,7 +1599,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n  \tcp.git_cmd = 1;\n  \n  \targv_array_pushf(&cp.env_array, \"GITHEAD_%s=%.*s\",\n -\t\t\t sha1_to_hex(her_tree), linelen(state->msg), state->msg);\n +\t\t\t sha1_to_hex(their_tree), linelen(state->msg), state->msg);\n  \tif (state->quiet)\n  \t\targv_array_push(&cp.env_array, \"GIT_MERGE_VERBOSITY=0\");\n  \n @@ -1607,7 +1607,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n  \targv_array_push(&cp.args, sha1_to_hex(orig_tree));\n  \targv_array_push(&cp.args, \"--\");\n  \targv_array_push(&cp.args, sha1_to_hex(our_tree));\n -\targv_array_push(&cp.args, sha1_to_hex(her_tree));\n +\targv_array_push(&cp.args, sha1_to_hex(their_tree));\n  \n  \tstatus = run_command(&cp) ? (-1) : 0;\n  \tdiscard_cache();\n @@ -1620,7 +1620,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n   */\n  static int fall_back_threeway(const struct am_state *state, const char *index_path)\n  {\n -\tunsigned char orig_tree[GIT_SHA1_RAWSZ], her_tree[GIT_SHA1_RAWSZ],\n +\tunsigned char orig_tree[GIT_SHA1_RAWSZ], their_tree[GIT_SHA1_RAWSZ],\n  \t\t      our_tree[GIT_SHA1_RAWSZ];\n  \n  \tif (get_sha1(\"HEAD\", our_tree) < 0)\n @@ -1657,7 +1657,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa\n  \t\treturn error(_(\"Did you hand edit your patch?\\n\"\n  \t\t\t\t\"It does not apply to blobs recorded in its index.\"));\n  \n -\tif (write_index_as_tree(her_tree, &the_index, index_path, 0, NULL))\n +\tif (write_index_as_tree(their_tree, &the_index, index_path, 0, NULL))\n  \t\treturn error(\"could not write tree\");\n  \n  \tsay(state, stdout, _(\"Falling back to patching base and 3-way merge...\"));\n @@ -1667,13 +1667,13 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa\n  \n  \t/*\n  \t * This is not so wrong. Depending on which base we picked, orig_tree\n -\t * may be wildly different from ours, but her_tree has the same set of\n +\t * may be wildly different from ours, but their_tree has the same set of\n  \t * wildly different changes in parts the patch did not touch, so\n  \t * recursive ends up canceling them, saying that we reverted all those\n  \t * changes.\n  \t */\n  \n -\tif (run_fallback_merge_recursive(state, orig_tree, our_tree, her_tree)) {\n +\tif (run_fallback_merge_recursive(state, orig_tree, our_tree, their_tree)) {\n  \t\trerere(state->allow_rerere_autoupdate);\n  \t\treturn error(_(\"Failed to merge in the changes.\"));\n  \t}\n\n\ndiff --git a/builtin/am.c b/builtin/am.c\nindex d5da5fe..1f0aa99 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -1584,14 +1584,14 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f\n }\n \n /**\n- * Do the three-way merge using fake ancestor, his tree constructed\n+ * Do the three-way merge using fake ancestor, their tree constructed\n  * from the fake ancestor and the postimage of the patch, and our\n  * state.\n  */\n static int run_fallback_merge_recursive(const struct am_state *state,\n \t\t\t\t\tunsigned char *orig_tree,\n \t\t\t\t\tunsigned char *our_tree,\n-\t\t\t\t\tunsigned char *his_tree)\n+\t\t\t\t\tunsigned char *their_tree)\n {\n \tstruct child_process cp = CHILD_PROCESS_INIT;\n \tint status;\n@@ -1599,7 +1599,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n \tcp.git_cmd = 1;\n \n \targv_array_pushf(&cp.env_array, \"GITHEAD_%s=%.*s\",\n-\t\t\t sha1_to_hex(his_tree), linelen(state->msg), state->msg);\n+\t\t\t sha1_to_hex(their_tree), linelen(state->msg), state->msg);\n \tif (state->quiet)\n \t\targv_array_push(&cp.env_array, \"GIT_MERGE_VERBOSITY=0\");\n \n@@ -1607,7 +1607,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n \targv_array_push(&cp.args, sha1_to_hex(orig_tree));\n \targv_array_push(&cp.args, \"--\");\n \targv_array_push(&cp.args, sha1_to_hex(our_tree));\n-\targv_array_push(&cp.args, sha1_to_hex(his_tree));\n+\targv_array_push(&cp.args, sha1_to_hex(their_tree));\n \n \tstatus = run_command(&cp) ? (-1) : 0;\n \tdiscard_cache();\n@@ -1620,7 +1620,7 @@ static int run_fallback_merge_recursive(const struct am_state *state,\n  */\n static int fall_back_threeway(const struct am_state *state, const char *index_path)\n {\n-\tunsigned char orig_tree[GIT_SHA1_RAWSZ], his_tree[GIT_SHA1_RAWSZ],\n+\tunsigned char orig_tree[GIT_SHA1_RAWSZ], their_tree[GIT_SHA1_RAWSZ],\n \t\t      our_tree[GIT_SHA1_RAWSZ];\n \n \tif (get_sha1(\"HEAD\", our_tree) < 0)\n@@ -1657,7 +1657,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa\n \t\treturn error(_(\"Did you hand edit your patch?\\n\"\n \t\t\t\t\"It does not apply to blobs recorded in its index.\"));\n \n-\tif (write_index_as_tree(his_tree, &the_index, index_path, 0, NULL))\n+\tif (write_index_as_tree(their_tree, &the_index, index_path, 0, NULL))\n \t\treturn error(\"could not write tree\");\n \n \tsay(state, stdout, _(\"Falling back to patching base and 3-way merge...\"));\n@@ -1667,13 +1667,13 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa\n \n \t/*\n \t * This is not so wrong. Depending on which base we picked, orig_tree\n-\t * may be wildly different from ours, but his_tree has the same set of\n+\t * may be wildly different from ours, but their_tree has the same set of\n \t * wildly different changes in parts the patch did not touch, so\n \t * recursive ends up canceling them, saying that we reverted all those\n \t * changes.\n \t */\n \n-\tif (run_fallback_merge_recursive(state, orig_tree, our_tree, his_tree)) {\n+\tif (run_fallback_merge_recursive(state, orig_tree, our_tree, their_tree)) {\n \t\trerere(state->allow_rerere_autoupdate);\n \t\treturn error(_(\"Failed to merge in the changes.\"));\n \t}\n-- \n2.9.0.278.g1caae67\n\nbase-commit: 5c589a73de4394ad125a4effac227b3aec856fa1\n"},{"id":"291011","messageId":"CANQwDwfB=NuZuzVJUOLncF-T8gLzJne01i1K2zrXJwgKBLidfg@mail.gmail.com","threadId":"42790","inReplyTo":"ceb80e45d1f02b71cc5ad2d7ded04360c530a9a8.1467962234.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH v2] am: counteract gender bias","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2016-07-08T07:50:26Z","receivedAt":"2016-07-08T07:51:13Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Hello Johannes,\n\nOn 8 July 2016 at 09:17, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:\n\n> Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for\n> almost 11 years already, we used a male form to describe \"the other\n> tree\".\n>\n> While most likely unintended, this gave the erroneous impression as if\n> the Git developers thought of users as male, and were unaware of the\n> important role in software development played by female actors such as\n> Ada Lovelace, Grace Hopper and Margaret Hamilton. In fact, the first\n> professional software developers were all female.\n>\n> Let's change those unfortunate references to the gender neutral \"their\n> tree\".\n\nIn my opinion more important reason than being \"gender neutral\" is that\nGit uses the \"ours\" / \"theirs\" terminology in all other places - this patch\nmakes Git consistent and code easier to understand (it also removes\nweird plural \"ours_tree\" vs singular \"his_tree\" in code arguments).\n\nBut nevermind that...\n\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n> Published-As: https://github.com/dscho/git/releases/tag/gender-bias-v2\n"},{"id":"291057","messageId":"xmqqfurjlshz.fsf@gitster.mtv.corp.google.com","threadId":"42790","inReplyTo":"ceb80e45d1f02b71cc5ad2d7ded04360c530a9a8.1467962234.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH v2] am: counteract gender bias","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-07-08T21:39:04Z","receivedAt":"2016-07-08T21:39:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <johannes.schindelin@gmx.de> writes:\n\n> Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for\n> almost 11 years already, we used a male form to describe \"the other\n> tree\".\n\nThis actually is older than that commit by 9 commits.  I may have\nsaid it already, but it originates at 47f0b6d5 (Fall back to\nthree-way merge when applying a patch., 2005-10-06).\n\n> While most likely unintended, this gave the erroneous impression as if\n> the Git developers thought of users as male, and were unaware of the\n> important role in software development played by female actors such as\n> Ada Lovelace, Grace Hopper and Margaret Hamilton. In fact, the first\n> professional software developers were all female.\n>\n> Let's change those unfortunate references to the gender neutral \"their\n> tree\".\n\nI'd add this at the end.\n\n\tDoing so would also make the fallback_merge_recursive(),\n\twhich is an oddball, more in line with the other parts of\n\tthe system where we contrast what we have vs what we obtain\n\tfrom others with \"ours\" vs \"theirs\".  This inconsistency was\n\talso unintended.\n\nI do not think changing these references to \"her\" and keep them like\nso for 11 years is a proper way to show \"respect\" anyway, by the\nway, so this round is a definite improvement over that version.\n\nThanks.\n\n"}]}