From: Phillip Wood <phillip.wood@dunelm.org.uk>
Check that the argument to the "label" and "update-ref" commands is a valid refname when the todo list is parsed rather than waiting until the command is executed. This means that the user can deal with any errors at the beginning of the rebase rather than having it stop halfway through due to a typo in a label name. The "update-ref" command is changed to reject single level refs as it is all to easy to type "update-ref branch" which is incorrect rather than "update-ref refs/heads/branch"
Note that it is not straight forward to check the arguments to "reset" and "merge" commands as they may be any revision, not just a refname and we do not have an equivalent of check_refname_format() for revisions.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
rebase -i: check labels and refs when parsing todo list
Hopefully detecting these errors when the user edits the todo list will
give a better experience.Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1482%2Fphillipwood%2Frebase-check-labels-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1482/phillipwood/rebase-check-labels-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1482
sequencer.c | 37 ++++++++++++++++++++++++++++++++++- t/t3404-rebase-interactive.sh | 25 ++++++++++++++++++++++- 2 files changed, 60 insertions(+), 2 deletions(-)
Show changes to 2 files +60 −2
sequencer.c, t/t3404-rebase-interactive.sh
diff --git a/sequencer.c b/sequencer.c index 3e4a1972897..b4b5c3f331d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2477,6 +2477,26 @@ static int is_command(enum todo_command command, const char **bol) (*bol = p)); } +static int check_label_or_ref_arg(enum todo_command command, const char *arg) +{ + int allow_onelevel = + command == TODO_LABEL ? REFNAME_ALLOW_ONELEVEL : 0; + + if ((command == TODO_LABEL && !strcmp(arg, "#")) || + check_refname_format(arg, allow_onelevel)) { + if (command == TODO_LABEL) + error(_("'%s' is not a valid label"), arg); + else if (check_refname_format(arg, REFNAME_ALLOW_ONELEVEL)) + error(_("'%s' is not a valid refname"), arg); + else + error(_("update-ref requires a fully qualified refname e.g. refs/heads/%s"), + arg); + return -1; + } + + return 0; +} + static int parse_insn_line(struct repository *r, struct todo_item *item, const char *buf, const char *bol, char *eol) { @@ -2523,8 +2543,23 @@ static int parse_insn_line(struct repository *r, struct todo_item *item, return error(_("missing arguments for %s"), command_to_string(item->command)); - if (item->command == TODO_EXEC || item->command == TODO_LABEL || + if (item->command == TODO_LABEL || item->command == TODO_RESET || item->command == TODO_UPDATE_REF) { + int ret = 0; + + item->commit = NULL; + item->arg_offset = bol - buf; + item->arg_len = (int)(eol - bol); + if (item->command != TODO_RESET) { + saved = *eol; + *eol = '\0'; + ret = check_label_or_ref_arg(item->command, bol); + *eol = saved; + } + return ret; + } + + if (item->command == TODO_EXEC) { item->commit = NULL; item->arg_offset = bol - buf; item->arg_len = (int)(eol - bol); diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 462cefd25df..2cf2d2b8a24 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -2120,7 +2120,30 @@ test_expect_success '--update-refs: check failed ref update' ' tail -n 6 err >err.last && sed -e "s/Rebasing.*Successfully/Successfully/g" -e "s/^\t//g" \ <err.last >err.trimmed && - test_cmp expect err.trimmed + test_cmp expect err.trimmed && + git rebase --abort +' + +test_expect_success 'bad labels and refs rejected when parsing todo list' ' + cat >todo <<-\EOF && + exec >execed + label # + label :invalid + update-ref :bad + update-ref topic + EOF + rm -f execed && + ( + set_replace_editor todo && + test_must_fail git rebase -i HEAD 2>err + ) && + grep "'\''#'\'' is not a valid label" err && + grep "'\'':invalid'\'' is not a valid label" err && + grep "'\'':bad'\'' is not a valid refname" err && + grep "update-ref requires a fully qualified refname e.g. refs/heads/topic" \ + err && + test_path_is_missing execed && + git rebase --abort ' # This must be the last test in this file base-commit: b1485644f936ee83a995ec24d23f713f4230a1ae
-- gitgitgadget
