Start the merging-rebase to upstream/maint

Browse Source

This commit starts the rebase of 151f34340d to ad36dc8b4b

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>

...

This commit is contained in:

Johannes Schindelin

2017-01-18 12:57:41 +01:00

parent ad36dc8b4b e11df2efb3

commit 5c76d3ceb2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available