Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
rebase: remove merges_option and a blank line
author
Wink Saville
<wink@saville.com>
Fri, 23 Mar 2018 21:25:29 +0000
(14:25 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 23 Mar 2018 22:28:24 +0000
(15:28 -0700)
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>
git-rebase--interactive.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ca3d446
)
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index ddbd126f2cad0cc68695d12d9d4d9c598075d18a..50323fc27351666440e76ae50806ee480e998da3 100644
(file)
--- a/
git-rebase--interactive.sh
+++ b/
git-rebase--interactive.sh
@@
-961,8
+961,6
@@
git_rebase__interactive () {
setup_reflog_action
init_basic_state
setup_reflog_action
init_basic_state
- merges_option="--no-merges --cherry-pick"
-
init_revisions_and_shortrevisions
git rebase--helper --make-script ${keep_empty:+--keep-empty} \
init_revisions_and_shortrevisions
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")"
fi
die "$(gettext "Could not init rewritten commits")"
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
format=$(git config --get rebase.instructionFormat)
# the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
init_revisions_and_shortrevisions
format=$(git config --get rebase.instructionFormat)
# 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 \
$revisions ${restrict_revision+^$restrict_revision} | \
sed -n "s/^>//p" |
while read -r sha1 rest
do
--reverse --left-right --topo-order \
$revisions ${restrict_revision+^$restrict_revision} | \
sed -n "s/^>//p" |
while read -r sha1 rest
do
-
if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
then
comment_out="$comment_char "
if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
then
comment_out="$comment_char "