{"thread":{"id":"45051","subject":"release notes/ change number discrepancy ? - Documentation/RelNotes/2.10.0.txt \"merge b738396...\"","startedAt":"2017-02-05T02:30:17Z","lastAt":"2017-02-05T07:44:29Z","messageCount":2,"participants":["Zenaan Harkness","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"310865","messageId":"20170205022156.GA19612@x220-a02","threadId":"45051","inReplyTo":null,"subject":"release notes/ change number discrepancy ? - Documentation/RelNotes/2.10.0.txt \"merge b738396...\"","fromName":"Zenaan Harkness","fromEmail":"zen@freedbms.net","sentAt":"2017-02-05T02:21:56Z","receivedAt":"2017-02-05T02:30:17Z","isPatch":false,"sender":{"key":"zen@freedbms.net","avatar":null},"body":"Am I missing something in the following:\n\nlooking at Documentation/RelNotes/2.10.0.txt I see the following release\nnote (~line 35):\n\n * \"upload-pack\" allows a custom \"git pack-objects\" replacement when\n responding to \"fetch/clone\" via the uploadpack.packObjectsHook.\n (merge b738396 jk/upload-pack-hook later to maint).\n\n\nbut when I run git show b738396 , I get the following:\n\ncommit b738396cfdcc276c0cde0c1a6462c5cc74ba7b76\nAuthor: Johannes Schindelin \nDate: Thu Jul 14 15:58:59 2016 +0200\n\n mingw: fix regression in t1308-config-set\n\n\nwhich seems to be completely unrelated. What am I missing please?\n\nThanks\nZenaan\n"},{"id":"310867","messageId":"xmqqvasp3wvl.fsf@gitster.mtv.corp.google.com","threadId":"45051","inReplyTo":"20170205022156.GA19612@x220-a02","subject":"Re: release notes/ change number discrepancy ? - Documentation/RelNotes/2.10.0.txt \"merge b738396...\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-02-05T07:44:14Z","receivedAt":"2017-02-05T07:44:29Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Zenaan Harkness writes:\n\n> Am I missing something in the following:\n>\n> looking at Documentation/RelNotes/2.10.0.txt I see the following release\n> note (~line 35):\n>\n> * \"upload-pack\" allows a custom \"git pack-objects\" replacement when\n> responding to \"fetch/clone\" via the uploadpack.packObjectsHook.\n> (merge b738396 jk/upload-pack-hook later to maint).\n>\n>\n> but when I run git show b738396 , I get the following:\n>\n> commit b738396cfdcc276c0cde0c1a6462c5cc74ba7b76\n> Author: Johannes Schindelin \n> Date: Thu Jul 14 15:58:59 2016 +0200\n>\n> mingw: fix regression in t1308-config-set\n>\n> which seems to be completely unrelated. What am I missing please?\n\nI think the commit is an \"oops, we found a regression on a different\nplatform than the one used when developing the series after its\ndevelopment completed, and here is a fix on top\" commit that is\nqueued as the tip of a series. You shouldn't be using \"git show\" on\nit to look ONLY the tip of the series.\n\nLet me show a better way to ask Git what you want to know, with the\nexcellent \"git when-merged\" script (google for it).\n\n$ git when-merged b738396 master\nrefs/heads/master 75676c8c8b6cbeec7ccb68d97c17db230d9f2659\n\nWe merged that commit to 'master' at 75676c8c8. What does the merge\nlog say?\n\n$ git show 75676c8c\ncommit 75676c8c8b6cbeec7ccb68d97c17db230d9f2659\nMerge: 79ed43c28f b738396cfd\nAuthor: Junio C Hamano \nDate: Thu Jul 14 10:38:57 2016 -0700\n\n Merge branch 'jk/upload-pack-hook'\n\n A hot-fix to make a test working in mingw again.\n\n * jk/upload-pack-hook:\n mingw: fix regression in t1308-config-set\n\nOK, so it was a hot-fix that consists of a single commit. What did\nwe need to hot-fix? A hot-fix is typically queued as a direct\nfollow-up to what is needed to be fixed. When did we merge the\nparent of the fix?\n\n$ git when-merged b738396^ master\nrefs/heads/master 1e4bf907890e094f1c1c8c5086387e7d5fdb0655\n\nAnd that merge commit on 'master' shows us the series that needed to\nbe fixed up.\n\n$ git show 1e4bf907890\ncommit 1e4bf907890e094f1c1c8c5086387e7d5fdb0655\nMerge: 7a738b40f6 20b20a22f8\nAuthor: Junio C Hamano \nDate: Wed Jul 6 13:38:11 2016 -0700\n\n Merge branch 'jk/upload-pack-hook'\n\n \"upload-pack\" allows a custom \"git pack-objects\" replacement when\n responding to \"fetch/clone\" via the uploadpack.packObjectsHook.\n\n * jk/upload-pack-hook:\n upload-pack: provide a hook for running pack-objects\n t1308: do not get fooled by symbolic links to the source tree\n config: add a notion of \"scope\"\n config: return configset value for current_config_ functions\n config: set up config_source for command-line config\n git_config_parse_parameter: refactor cleanup code\n git_config_with_options: drop \"found\" counting\n\nYou learned from the above that the jk/upload-pack-hook topic was\ndeveloped as a 7-patch series, reviewed, tested and got merged to\n'master' on Jul 6th. Unfortunately a test in the series had a\nportability issue that wasn't discovered while it was being reviewed\nand tested, and a hot-fix was queued on top and merged to 'master'\nabout a week later. If we wanted to merge the topic to the\nmaintenance track, we cannot just merge the original 7-patch series.\nWe need to merge the whole thing, including the 8th one that is the\nhot-fix.\n"}]}