From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Philippe Blain <levraiphilippeblain@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Elijah Newren <newren@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH v2 0/2] rebase -i: a couple of small improvements
Date: Thu, 23 Sep 2021 15:26:19 +0000 [thread overview]
Message-ID: <pull.1034.v2.git.1632410782.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1034.git.1631108472.gitgitgadget@gmail.com>
Thanks for the feedback on V1. I have decided to split this series so I'm
just posting a re-roll of the first two patches here. The only change is to
reword the commit message of the first patch as suggested by Eric and Dscho
Cover letter for V1: Fix the re-reading of the todo list after an exec or
reword command and stop forking "git checkout" when checking out "onto"
Phillip Wood (2):
sequencer.c: factor out a function
rebase: fix todo-list rereading
sequencer.c | 47 +++++++++++++++++++++++++++--------------------
sequencer.h | 1 -
2 files changed, 27 insertions(+), 21 deletions(-)
base-commit: 66262451ec94d30ac4b80eb3123549cf7a788afd
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1034%2Fphillipwood%2Fwip%2Frebase-reread-todo-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1034/phillipwood/wip/rebase-reread-todo-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1034
Range-diff vs v1:
1: 53cde4825b4 ! 1: 98ebefc140e sequencer.c: factor out a function
@@ Commit message
sequencer.c: factor out a function
This code is heavily indented and obscures the high level logic within
- the loop. Lets move it to its own function before modifying it in the
- next commit.
+ the loop. Let's move it to its own function before modifying it in the
+ next commit. Note that there is a subtle change in behavior if the
+ todo list cannot be reread. Previously todo_list->current was
+ incremented before returning, now it returns immediately.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
2: 3b17a4e3d3f = 2: 0d89c506192 rebase: fix todo-list rereading
3: 614555fc10f < -: ----------- reset_head(): mark oid parameter as const
4: 39ad40c9297 < -: ----------- rebase -i: don't fork git checkout
5: c8a92d4242b < -: ----------- rebase: remove unused parameter
--
gitgitgadget
next prev parent reply other threads:[~2021-09-23 15:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 13:41 [PATCH 0/5] rebase -i: a couple of small improvements Phillip Wood via GitGitGadget
2021-09-08 13:41 ` [PATCH 1/5] sequencer.c: factor out a function Phillip Wood via GitGitGadget
2021-09-08 17:51 ` Eric Sunshine
2021-09-09 10:10 ` Phillip Wood
2021-09-09 10:44 ` Johannes Schindelin
2021-09-08 13:41 ` [PATCH 2/5] rebase: fix todo-list rereading Phillip Wood via GitGitGadget
2021-09-09 10:48 ` Johannes Schindelin
2021-09-08 13:41 ` [PATCH 3/5] reset_head(): mark oid parameter as const Phillip Wood via GitGitGadget
2021-09-08 13:41 ` [PATCH 4/5] rebase -i: don't fork git checkout Phillip Wood via GitGitGadget
2021-09-08 18:14 ` Philippe Blain
2021-09-09 10:09 ` Phillip Wood
2021-09-09 12:40 ` Philippe Blain
2021-09-09 13:57 ` Phillip Wood
2021-09-09 15:01 ` Elijah Newren
2021-09-10 12:07 ` Philippe Blain
2021-09-15 15:44 ` Phillip Wood
2021-09-09 10:53 ` Johannes Schindelin
2021-09-09 12:44 ` Philippe Blain
2021-09-09 21:43 ` Johannes Schindelin
2021-09-10 10:46 ` Johannes Schindelin
2021-09-10 11:58 ` Philippe Blain
2021-09-09 15:03 ` Elijah Newren
2021-09-08 13:41 ` [PATCH 5/5] rebase: remove unused parameter Phillip Wood via GitGitGadget
2021-09-09 10:54 ` Johannes Schindelin
2021-09-09 14:04 ` Phillip Wood
2021-09-23 15:26 ` Phillip Wood via GitGitGadget [this message]
2021-09-23 15:26 ` [PATCH v2 1/2] sequencer.c: factor out a function Phillip Wood via GitGitGadget
2021-09-23 15:26 ` [PATCH v2 2/2] rebase: fix todo-list rereading Phillip Wood via GitGitGadget
2021-09-24 16:13 ` Junio C Hamano
2021-09-28 10:20 ` Phillip Wood
2021-09-24 19:24 ` [PATCH v2 0/2] rebase -i: a couple of small improvements Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1034.v2.git.1632410782.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).