On Mon, Jun 04, 2018 at 10:57:30PM +0900, Junio C Hamano wrote: > * jk/index-pack-maint (2018-06-01) 2 commits > (merged to 'next' on 2018-06-04 at c553a485e8) > + index-pack: handle --strict checks of non-repo packs > + prepare_commit_graft: treat non-repository as a noop > > "index-pack --strict" has been taught to make sure that it runs the > final object integrity checks after making the freshly indexed > packfile available to itself. > > Will cook in 'next'.
This second patch fixes a regression in v2.18.0-rc1 and in v2.17.1. I don't know if we'd want to consider it for v2.18 or not (it should be able to be applied independently from the first). > * jk/branch-l-0-deprecation (2018-05-25) 5 commits > (merged to 'next' on 2018-05-30 at a94574dfd5) > + branch: customize "-l" warning in list mode > + branch: issue "-l" deprecation warning after pager starts > (merged to 'next' on 2018-04-11 at 9b2b0305dd) > + branch: deprecate "-l" option > + t: switch "branch -l" to "branch --create-reflog" > + t3200: unset core.logallrefupdates when testing reflog creation > (this branch is used by jk/branch-l-1-removal and > jk/branch-l-2-reincarnation.) > > The "-l" option in "git branch -l" is an unfortunate short-hand for > "--create-reflog", but many users, both old and new, somehow expect > it to be something else, perhaps "--list". This step deprecates > the short-hand and warns about the future removal of the it when it > is used. > > Will cook in 'next'. > Perhaps merge to 'master' immediately after 2.18 release? FWIW, I plan to re-roll this according to the discussion (with the intent that this would just get ejected when 'next' is rewound). But there is no rush, since that is all post-release. So you can see if I get around to it or not by then. ;) -Peff
