rebase: remove merges_option and a blank line
merges_option is unused in git_rebase__interactive and always empty in git_rebase__interactive__preserve_merges so it can be removed. Signed-off-by: Wink Saville <wink@saville.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Wink Saville committed
Mar 23, 2018 at 14:25 UTC
f24cd4189dd778ba2d9bc7444d6a142642b106b9
1 file changed
+1
-9
git-rebase--interactive.sh
+1
-9
@@ -961,8 +961,6 @@ git_rebase__interactive () {
961
setup_reflog_action
962
init_basic_state
963
964
- merges_option="--no-merges --cherry-pick"
965
-
964
init_revisions_and_shortrevisions
965
966
git rebase--helper --make-script ${keep_empty:+--keep-empty} \
@@ -996,22 +994,16 @@ git_rebase__interactive__preserve_merges () {
994
die "$(gettext "Could not init rewritten commits")"
995
fi
996
999
- # No cherry-pick because our first pass is to determine
1000
- # parents to rewrite and skipping dropped commits would
1001
- # prematurely end our probe
1002
- merges_option=
1003
-
997
init_revisions_and_shortrevisions
998
999
format=$(git config --get rebase.instructionFormat)
1000
# the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
1008
- git rev-list $merges_option --format="%m%H ${format:-%s}" \
1001
+ git rev-list --format="%m%H ${format:-%s}" \
1002
--reverse --left-right --topo-order \
1003
$revisions ${restrict_revision+^$restrict_revision} | \
1004
sed -n "s/^>//p" |
1005
while read -r sha1 rest
1006
do
1014
-
1007
if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
1008
then
1009
comment_out="$comment_char "