On Fri, Apr 26, 2019 at 02:41:38PM +0900, Junio C Hamano wrote: > Taylor Blau <me@xxxxxxxxxxxx> writes: > > > On Thu, Apr 25, 2019 at 07:15:06PM +0900, Junio C Hamano wrote: > >> * tb/unexpected (2019-04-10) 7 commits > >> (merged to 'next' on 2019-04-25 at c49927fca0) > >> + rev-list: detect broken root trees > >> + rev-list: let traversal die when --missing is not in use > >> + get_commit_tree(): return NULL for broken tree > >> + list-objects.c: handle unexpected non-tree entries > >> + list-objects.c: handle unexpected non-blob entries > >> + t: introduce tests for unexpected object types > >> + t: move 'hex2oct' into test-lib-functions.sh > >> > >> Code tightening against a "wrong" object appearing where an object > >> of a different type is expected, instead of blindly assuming that > >> the connection between objects are correctly made. > >> > >> Will merge to 'master'. > > > > Thanks for picking this up. Before you merge to master, I want to make > > sure that the whole series was taken in. > > > > I can see the first four of these landed on 'next' (in > > 5c07647d98...b49e74eac4), but I'm having some difficulty finding the > > later three. > > > > Did you pick these up as well? > > Sorry, but I do not follow. > > $ git log --oneline master..c49927fca0^2 > 97dd512af7 rev-list: detect broken root trees > ee4dfee227 rev-list: let traversal die when --missing is not in use > 834876630b get_commit_tree(): return NULL for broken tree > b49e74eac4 list-objects.c: handle unexpected non-tree entries > 23c204455b list-objects.c: handle unexpected non-blob entries > 0616617c7e t: introduce tests for unexpected object types > 5c07647d98 t: move 'hex2oct' into test-lib-functions.sh > > Do you mean you do not have b49e74eac4..c49927fca0? I do not think > the topic was merged in multiple steps (iow, at c49927fca0^ the > whole 7 commits were not in 'next', and after c49927fca0, all 7 are > in). So I am not sure what you are asking. IOW, if you have b49e74 > in your copy of 'next', it is impossible not to have the others. Ah, I _can_ see the merge in my local copy (fetched from https://github.com/git/git) as c49927fca0 (Merge branch 'tb/unexpected' into next, 2019-04-25). I looked for the commits themselves with: $ git log --author=Taylor on 'next', but only found the first four. I'm sure there's a logical explanation of why this happened, but I'm not sure what it is :-). > The merge itself can be seen at one of the authoritative repositories > > https://git.kernel.org/pub/scm/git/git.git/commit/?h=next&id=c49927fca0de4c213ae9b21dcb7eafb80e453d27 > > Unfortunately, I do not know how to ask GitHub web UI to give us a > simple "log --oneline" equivalent of list like gitweb did (sadly > cgit is not much better wrt this), but I think clicking on the > parent link starting from here > > https://github.com/git/git/commit/c49927fca0de4c213ae9b21dcb7eafb80e453d27 > > and remembering (or writing down X-<) the commit names would > eventually give us the equivalent. > > In any case, thanks for working on this topic. Thanks for explaining, and it was my pleasure. Thanks, Taylor
