{"thread":{"id":"49863","subject":"[PATCH 0/1] rebase: warn about the correct tree's OID","startedAt":"2018-11-20T09:44:35Z","lastAt":"2018-11-21T22:15:37Z","messageCount":4,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"363715","messageId":"pull.85.git.gitgitgadget@gmail.com","threadId":"49863","inReplyTo":null,"subject":"[PATCH 0/1] rebase: warn about the correct tree's OID","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2018-11-20T09:44:32Z","receivedAt":"2018-11-20T09:44:35Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"A quick fix for a recent topic. Not overly critical, but I would deem this\nv2.20.0-rc1 material.\n\nJohannes Schindelin (1):\n rebase: warn about the correct tree's OID\n\n builtin/rebase.c | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\n\nbase-commit: bb75be6cb916297f271c846f2f9caa3daaaec718\nPublished-As: https://github.com/gitgitgadget/git/releases/tags/pr-85%2Fdscho%2Freset_head-typo-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-85/dscho/reset_head-typo-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/85\n-- \ngitgitgadget\n"},{"id":"363716","messageId":"d55ede7e4d46d67c070f87df9689ffe8af2d5737.1542707070.git.gitgitgadget@gmail.com","threadId":"49863","inReplyTo":"pull.85.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] rebase: warn about the correct tree's OID","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2018-11-20T09:44:33Z","receivedAt":"2018-11-20T09:44:37Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThis was a simple copy/paste error, and an obvious one at that: if we\ncannot fill the tree descriptor, we should show an error message about\n*that* tree, not another one.\n\nSigned-off-by: Johannes Schindelin \n---\n builtin/rebase.c | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 1a2758756a..5b3e5baec8 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -582,7 +582,8 @@ static int reset_head(struct object_id *oid, const char *action,\n \t}\n \n \tif (!reset_hard && !fill_tree_descriptor(&desc[nr++], &head_oid)) {\n-\t\tret = error(_(\"failed to find tree of %s\"), oid_to_hex(oid));\n+\t\tret = error(_(\"failed to find tree of %s\"),\n+\t\t\t oid_to_hex(&head_oid));\n \t\tgoto leave_reset_head;\n \t}\n \n-- \ngitgitgadget\n"},{"id":"363805","messageId":"xmqqefbf82aj.fsf@gitster-ct.c.googlers.com","threadId":"49863","inReplyTo":"pull.85.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 0/1] rebase: warn about the correct tree's OID","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-11-21T04:47:32Z","receivedAt":"2018-11-21T04:47:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> A quick fix for a recent topic. Not overly critical, but I would deem this\n> v2.20.0-rc1 material.\n>\n> Johannes Schindelin (1):\n> rebase: warn about the correct tree's OID\n>\n\nYup, it is kind of embarrasing that nobody caught it, but at the\nsame time, this typo is at so tiny level that I would not be\nsurprised if it survived for many years.\n\nWill apply.\n\n\n> builtin/rebase.c | 3 ++-\n> 1 file changed, 2 insertions(+), 1 deletion(-)\n>\n>\n> base-commit: bb75be6cb916297f271c846f2f9caa3daaaec718\n> Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-85%2Fdscho%2Freset_head-typo-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-85/dscho/reset_head-typo-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/85\n"},{"id":"363852","messageId":"nycvar.QRO.7.76.6.1811212315000.41@tvgsbejvaqbjf.bet","threadId":"49863","inReplyTo":"xmqqefbf82aj.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 0/1] rebase: warn about the correct tree's OID","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-11-21T22:15:30Z","receivedAt":"2018-11-21T22:15:37Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 21 Nov 2018, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n> \n> > A quick fix for a recent topic. Not overly critical, but I would deem this\n> > v2.20.0-rc1 material.\n> >\n> > Johannes Schindelin (1):\n> > rebase: warn about the correct tree's OID\n> >\n> \n> Yup, it is kind of embarrasing that nobody caught it, but at the\n> same time, this typo is at so tiny level that I would not be\n> surprised if it survived for many years.\n\nTBH I am quite mortified that it slipped through *my* multiple\npre-contribution reviews.\n\n> Will apply.\n\nThanks.\n\nCiao,\nDscho\n"}]}