| commit | ef64bb328df9c131c6c454ad65169fa3972da512 | |
| author | Alban Gruin <alban.gruin@gmail.com> | |
| Mon, 28 May 2018 12:34:20 +0000 (28 14:34 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jun 2018 00:34:48 +0000 (1 09:34 +0900) | ||
| tree | bbf4785068ae5d8ebec27aa3f6edc8a830c8703e | treesnapshot (tar.gz zip) |
| parent | c42abfe785729587643dec5e7bba414dc3943817 | commitdiff |
rebase: strip unused code in git-rebase--preserve-merges.sh
This removes the code coming from git-rebase--interactive.sh that is not
needed by preserve-merges, and changes the header comment accordingly.
In a following commit, the -p code from git-rebase--interactive.sh will
be stripped out. As preserve-merges’ successor is already in the works,
this will be the only script to be converted.
This also seems to fix a bug where a failure in
`pick_one_preserving_merges()` would fallback to the non-preserve-merges
`pick_one()`.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
This removes the code coming from git-rebase--interactive.sh that is not
needed by preserve-merges, and changes the header comment accordingly.
In a following commit, the -p code from git-rebase--interactive.sh will
be stripped out. As preserve-merges’ successor is already in the works,
this will be the only script to be converted.
This also seems to fix a bug where a failure in
`pick_one_preserving_merges()` would fallback to the non-preserve-merges
`pick_one()`.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
| git-rebase--preserve-merges.sh | diffblobblamehistory |