Commit 5c76d3c
committed
Start the merging-rebase to upstream/maint
This commit starts the rebase of 151f343 to ad36dc8
Sadly, v3 of the mingw-isatty-fixup branch was not picked up by upstream
Git, but v2 instead. A follow-up patch has been sent to rectify the
situation.
Also, the "Avoid a segmentation fault with renaming merges"'s latest
iteration was not picked up (the latest revision did not try to be
overzealous about warning the user when there is a warning elsewhere
already), but there are more worthy things to fight for. The other parts
of the `cherry-pick-segfault` patch series made it into `maint` unharmed,
though.
Likewise, the "mailinfo: remove misguided assert() statement" patch was
fixed differently upstream, so that patch was dropped also.
The `unc-alternates` topic branch was dropped, as it has been made
obsolete by a more general fix in `normalize_path_copy(): fix pushing to
//server/share/dir on Windows`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>File tree
0 file changed
+0
-0
lines changed0 file changed
+0
-0
lines changed
0 commit comments