undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: remove merges_option and a blank line

Browse Source 
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>
This commit is contained in:
Wink Saville 2018-03-23 14:25:29 -07:00 committed by Junio C Hamano
parent ca3d446e44
commit f24cd4189d
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-rebase--interactive.sh
View File

@ -961,8 +961,6 @@ git_rebase__interactive () {
setup_reflog_action setup_reflog_action
init_basic_state init_basic_state
merges_option="--no-merges --cherry-pick"
init_revisions_and_shortrevisions init_revisions_and_shortrevisions
git rebase--helper --make-script ${keep_empty:+--keep-empty} \ git rebase--helper --make-script ${keep_empty:+--keep-empty} \
@ -996,22 +994,16 @@ git_rebase__interactive__preserve_merges () {
die "$(gettext "Could not init rewritten commits")" die "$(gettext "Could not init rewritten commits")"
fi fi
# No cherry-pick because our first pass is to determine
# parents to rewrite and skipping dropped commits would
# prematurely end our probe
merges_option=
init_revisions_and_shortrevisions init_revisions_and_shortrevisions
format=$(git config --get rebase.instructionFormat) format=$(git config --get rebase.instructionFormat)
# the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse # the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
git rev-list $merges_option --format="%m%H ${format:-%s}" \ git rev-list --format="%m%H ${format:-%s}" \
--reverse --left-right --topo-order \ --reverse --left-right --topo-order \
$revisions ${restrict_revision+^$restrict_revision} | \ $revisions ${restrict_revision+^$restrict_revision} | \
sed -n "s/^>//p" | sed -n "s/^>//p" |
while read -r sha1 rest while read -r sha1 rest
do do
if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1 if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
then then
comment_out="$comment_char " comment_out="$comment_char "