mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: remove unused code paths from git_rebase__interactive__preserve_merges

Browse Source 
Since git_rebase__interactive__preserve_merges is now always called with
$preserve_merges = t we can remove the unused code paths.

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:28 -07:00
committed by Junio C Hamano
parent c04549b263
commit ca3d446e44
1 changed files with 69 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
git-rebase--interactive.sh
View File

@ -982,8 +982,6 @@ git_rebase__interactive__preserve_merges () {
setup_reflog_action setup_reflog_action
init_basic_state init_basic_state
if test t = "$preserve_merges"
then
if test -z "$rebase_root" if test -z "$rebase_root"
then then
mkdir "$rewritten" && mkdir "$rewritten" &&
@ -997,22 +995,14 @@ git_rebase__interactive__preserve_merges () {
echo $onto > "$rewritten"/root || echo $onto > "$rewritten"/root ||
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 # No cherry-pick because our first pass is to determine
# parents to rewrite and skipping dropped commits would # parents to rewrite and skipping dropped commits would
# prematurely end our probe # prematurely end our probe
merges_option= merges_option=
else
merges_option="--no-merges --cherry-pick"
fi
init_revisions_and_shortrevisions init_revisions_and_shortrevisions
if test t != "$preserve_merges"
then
git rebase--helper --make-script ${keep_empty:+--keep-empty} \
$revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
die "$(gettext "Could not generate todo list")"
else
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 $merges_option --format="%m%H ${format:-%s}" \
@ -1048,11 +1038,8 @@ git_rebase__interactive__preserve_merges () {
printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo" printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
fi fi
done done
fi
# Watch for commits that been dropped by --cherry-pick # Watch for commits that been dropped by --cherry-pick
if test t = "$preserve_merges"
then
mkdir "$dropped" mkdir "$dropped"
# Save all non-cherry-picked changes # Save all non-cherry-picked changes
git rev-list $revisions --left-right --cherry-pick | \ git rev-list $revisions --left-right --cherry-pick | \
@ -1075,7 +1062,6 @@ git_rebase__interactive__preserve_merges () {
rm "$rewritten"/$rev rm "$rewritten"/$rev
fi fi
done done
fi
complete_action complete_action
} }