> * sb/object-store-replace (2018-05-10) 2 commits > (merged to 'next' on 2018-05-16 at 41bbedcc81) > + replace-object.c: remove the_repository from prepare_replace_object > + object.c: free replace map in raw_object_store_clear > > Hotfix. > > Will merge to 'master'. Please do not. (Or do, but then be prepared for another hotfix.) The commit sb/object-store-replace^ needs more free'ing and shall be replaced with https://public-inbox.org/git/20180510195849.28023-4-sbeller@xxxxxxxxxx/ I'll resend shortly. > > * sb/submodule-merge-in-merge-recursive (2018-05-16) 3 commits > - merge-recursive: give notice when submodule commit gets fast-forwarded > - merge-recursive: i18n submodule merge output and respect verbosity > - submodule.c: move submodule merging to merge-recursive.c > > By code restructuring of submodule merge in merge-recursive, > informational messages from the codepath are now given using the > same mechanism as other output, and honor the merge.verbosity > configuration. The code also learned to give a few new messages > when a submodule three-way merge resolves cleanly when one side > records a descendant of the commit chosen by the other side. > > Will merge to 'next'. Merging would be ok, but I would rather not. A resend will be only for cosmetic effect, as I messed up the last commit So, please hold in pu. > * sb/diff-color-move-more (2018-04-25) 7 commits > - diff.c: add --color-moved-ignore-space-delta option > - diff.c: decouple white space treatment from move detection algorithm > - diff.c: add a blocks mode for moved code detection > - diff.c: adjust hash function signature to match hashmap expectation > - diff.c: do not pass diff options as keydata to hashmap > - xdiff/xdiffi.c: remove unneeded function declarations > - xdiff/xdiff.h: remove unused flags > > "git diff --color-moved" feature has further been tweaked. > > Will merge to 'next'. I did not get around to fix it up, there are still review comments outstanding. (The test is broken in the last commit.) Please hold in pu; Thanks, Stefan
