summaryrefslogtreecommitdiff
path: root/t/lib-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-07-31 08:18:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-31 12:24:07 -0700
commit5dcdd7409ad3b3e8d5e79871bfb9d5f4215d4a13 (patch)
tree8e41a30296e2341cb162e0424abb1fc247b30186 /t/lib-read-tree-m-3way.sh
parentrebase -r: support merge strategies other than `recursive` (diff)
downloadtgif-5dcdd7409ad3b3e8d5e79871bfb9d5f4215d4a13.tar.xz
t/lib-rebase: prepare for testing `git rebase --rebase-merges`
The format of the todo list is quite a bit different in the `--rebase-merges` mode; Let's prepare the fake editor to handle those todo lists properly, too. The original idea was that we keep the original command unless overridden, and because the original todo lists only had `pick` lines anyway, we could be sloppy and "override" the command by the same command (i.e. use the sed replacement pattern "pick" instead of "&"). This actually would not have worked with `fixup` and `squash` commands, but it would appear that we never tried to use the fake editor with `--autosquash`. However, in the next commit we want to use the fake editor in conjunction with `--rebase-merges`, so let's use the correct sed replacement pattern. Technically, it is not necessary to take care of the `fakesha` thing (where we reuse the sed replacement pattern to craft a new todo command), at least for now, as the only user of that thing overrides the `action` anyway. Nevertheless, for completeness' sake, we do take care of it. Helped-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions