Re: [GSoC][PATCH v6 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in C
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Aug 22, 2018, 21:14 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1808222310220.73@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20180810165147.4779-19-alban.gruin@gmail.com>
Hi Alban,
thank you for your tireless work on this!
One thing that needs to be fixed, though:
On Fri, 10 Aug 2018, Alban Gruin wrote:
Show 12 quoted lines
> +run_interactive () {
> + GIT_CHERRY_PICK_HELP="$resolvemsg"
> + export GIT_CHERRY_PICK_HELP
> +
> + test -n "$keep_empty" && keep_empty="--keep-empty"
> + test -n "$rebase_merges" && rebase_merges="--rebase-merges"
> + test -n "$rebase_cousins" && rebase_cousins="--rebase-cousins"
> + test -n "$autosquash" && autosquash="--autosquash"
> + test -n "$verbose" && verbose="--verbose"
> + test -n "$force_rebase" && force_rebase="--no-ff"
> + test -n "$restrict_revisions" && \
> + restrict_revisions="--restrict-revisions=^$restrict_revisions"I made this same mistake over and over again, myself. For some reason, John Keeping decided to use the singular form "revision" in 1e0dacdbdb75 (rebase: omit patch-identical commits with --fork-point, 2014-07-16), not the plural.
So you will need to squash this in:
-- snipsnap --
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh index fb0395af5b1..7600765f541 100755 --- a/git-legacy-rebase.sh +++ b/git-legacy-rebase.sh @@ -145,8 +145,8 @@ run_interactive () { test -n "$autosquash" && autosquash="--autosquash" test -n "$verbose" && verbose="--verbose" test -n "$force_rebase" && force_rebase="--no-ff" - test -n "$restrict_revisions" && \ - restrict_revisions="--restrict-revisions=^$restrict_revisions" + test -n "$restrict_revision" && \ + restrict_revision="--restrict-revision=^$restrict_revision" test -n "$upstream" && upstream="--upstream=$upstream" test -n "$onto" && onto="--onto=$onto" test -n "$squash_onto" && squash_onto="--squash-onto=$squash_onto"