Thread (17 messages) 17 messages, 2 authors, 2023-07-24
STALE1064d
Revisions (4)
  1. v2 [diff vs current]
  2. v3 [diff vs current]
  3. v4 current
  4. v5 [diff vs current]

[PATCH v4 0/1] sequencer: finish parsing the todo list despite an invalid first line

From: Alex Henrie <hidden>
Date: 2023-07-21 06:10:39

Changes from v3:
- Rebase onto HEAD~4 instead of --root (which was the original motivation
  for sending a new patch and I forgot to include that change; I probably
  shouldn't be doing Git development late at night...)

Alex Henrie (1):
  sequencer: finish parsing the todo list despite an invalid first line

 sequencer.c                   |  2 +-
 t/t3404-rebase-interactive.sh | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

Range-diff against v3:
1:  b1af2df3f5 ! 1:  f6fcdcd9a9 sequencer: finish parsing the todo list despite an invalid first line
    @@ t/t3404-rebase-interactive.sh: test_expect_success 'static check of bad command'
     +	rebase_setup_and_clean fixup-first &&
     +	(
     +		set_fake_editor &&
    -+		test_must_fail env FAKE_LINES="fixup 1 2 3 4 5" \
    -+			       git rebase -i --root 2>actual &&
    ++		test_must_fail env FAKE_LINES="fixup 1 2 3 4" \
    ++			       git rebase -i HEAD~4 2>actual &&
     +		grep "cannot .fixup. without a previous commit" actual &&
     +		grep "You can fix this with .git rebase --edit-todo.." actual &&
     +		grep -v "^#" .git/rebase-merge/git-rebase-todo >orig &&
-- 
2.41.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help