rebase -i: match whole word in is_command()
When matching an unabbreviated command is_command() only does a prefix match which means it parses "pickled" as TODO_PICK. parse_insn_line() does error out because is_command() only advances as far as the end of "pick" so it looks like the command name is not followed by a space but the error message is "missing arguments for pick" rather than telling the user that the "pickled" is not a valid command. Fix this by ensuring the match is follow by whitespace or the end of the string as we already do for abbreviated commands. The (*bol = p) at the end of the condition is a bit cute for my taste but I decided to leave it be for now. Rather than add new tests the existing tests for bad commands are adapted to use a bad command name that triggers the prefix matching bug. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Feb 23, 2023 at 20:55 UTC
7aed2c0565bb1a7b4524f93e35a29770286ea630
3 files changed
+14
-12
sequencer.c
+6
-6
@@ -2469,12 +2469,11 @@ static int is_command(enum todo_command command, const char **bol)
2469
{
2470
const char *str = todo_command_info[command].str;
2471
const char nick = todo_command_info[command].c;
2472
- const char *p = *bol + 1;
2472
+ const char *p = *bol;
2473
2474
- return skip_prefix(*bol, str, bol) ||
2475
- ((nick && **bol == nick) &&
2476
- (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || !*p) &&
2477
- (*bol = p));
2474
+ return (skip_prefix(p, str, &p) || (nick && *p++ == nick)) &&
2475
+ (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || !*p) &&
2476
+ (*bol = p);
2477
}
2478
2479
static int parse_insn_line(struct repository *r, struct todo_item *item,
@@ -2503,7 +2502,8 @@ static int parse_insn_line(struct repository *r, struct todo_item *item,
2502
break;
2503
}
2504
if (i >= TODO_COMMENT)
2506
- return -1;
2505
+ return error(_("invalid command '%.*s'"),
2506
+ (int)strcspn(bol, " \t\r\n"), bol);
2507
2508
/* Eat up extra spaces/ tabs before object name */
2509
padding = strspn(bol, " \t");
t/lib-rebase.sh
+1
-1
@@ -60,7 +60,7 @@ set_fake_editor () {
60
">")
61
echo >> "$1";;
62
bad)
63
- action="badcmd";;
63
+ action="pickled";;
64
fakesha)
65
test \& != "$action" || action=pick
66
echo "$action XXXXXXX False commit" >> "$1"
t/t3404-rebase-interactive.sh
+7
-5
@@ -1449,14 +1449,15 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = ig
1449
1450
test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = warn' '
1451
cat >expect <<-EOF &&
1452
- error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
1452
+ error: invalid command '\''pickled'\''
1453
+ error: invalid line 1: pickled $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
1454
Warning: some commits may have been dropped accidentally.
1455
Dropped commits (newer to older):
1456
- $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
1457
- $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
1458
To avoid this message, use "drop" to explicitly remove a commit.
1459
EOF
1459
- head -n4 expect >expect.2 &&
1460
+ head -n5 expect >expect.2 &&
1461
tail -n1 expect >>expect.2 &&
1462
tail -n4 expect.2 >expect.3 &&
1463
test_config rebase.missingCommitsCheck warn &&
@@ -1467,7 +1468,7 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa
1468
git rebase -i --root &&
1469
cp .git/rebase-merge/git-rebase-todo.backup orig &&
1470
FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
1470
- head -n6 actual.2 >actual &&
1471
+ head -n7 actual.2 >actual &&
1472
test_cmp expect actual &&
1473
cp orig .git/rebase-merge/git-rebase-todo &&
1474
FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
@@ -1483,7 +1484,8 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa
1484
1485
test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = error' '
1486
cat >expect <<-EOF &&
1486
- error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
1487
+ error: invalid command '\''pickled'\''
1488
+ error: invalid line 1: pickled $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
1489
Warning: some commits may have been dropped accidentally.
1490
Dropped commits (newer to older):
1491
- $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
@@ -1583,7 +1585,7 @@ test_expect_success 'static check of bad command' '
1585
set_fake_editor &&
1586
test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
1587
git rebase -i --root 2>actual &&
1586
- test_i18ngrep "badcmd $(git rev-list --oneline -1 primary~1)" \
1588
+ test_i18ngrep "pickled $(git rev-list --oneline -1 primary~1)" \
1589
actual &&
1590
test_i18ngrep "You can fix this with .git rebase --edit-todo.." \
1591
actual &&