[PATCH 4/6] revert: Make commit descriptions in insn sheet optional
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:52:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Change the instruction sheet format subtly so that a description of the commit after the object name is optional. As a result, an instruction sheet like this is now perfectly valid: pick 35b0426 pick fbd5bbcbc2e pick 7362160f Suggested-by: Jonathan Nieder <redacted> Acked-by: Jonathan Nieder <redacted> Signed-off-by: Ramkumar Ramachandra <redacted> --- builtin/revert.c | 19 ++++++++----------- t/t3510-cherry-pick-sequence.sh | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 6451089..aa6c34e 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c@@ -692,26 +692,23 @@ static struct commit *parse_insn_line(char *start, struct replay_opts *opts) unsigned char commit_sha1[20]; char sha1_abbrev[40]; enum replay_action action; - int insn_len = 0; - char *p, *q; + const char *p, *q; + p = start; if (!prefixcmp(start, "pick ")) { action = CHERRY_PICK; - insn_len = strlen("pick"); - p = start + insn_len + 1; + p += strlen("pick "); } else if (!prefixcmp(start, "revert ")) { action = REVERT; - insn_len = strlen("revert"); - p = start + insn_len + 1; + p += strlen("revert "); } else return NULL; - q = strchr(p, ' '); - if (!q || q - p + 1 > sizeof(sha1_abbrev)) + q = p + strcspn(p, " \n"); + if (q - p + 1 > sizeof(sha1_abbrev)) return NULL; - q++; - - strlcpy(sha1_abbrev, p, q - p); + memcpy(sha1_abbrev, p, q - p); + sha1_abbrev[q - p] = '\0'; /* * Verify that the action matches up with the one in
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 2113308..39b55c1 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh@@ -225,4 +225,18 @@ test_expect_success 'malformed instruction sheet 3' ' test_must_fail git cherry-pick --continue ' +test_expect_success 'commit descriptions in insn sheet are optional' ' + pristine_detach initial && + test_must_fail git cherry-pick base..anotherpick && + echo "c" >foo && + git add foo && + git commit && + cut -d" " -f1,2 .git/sequencer/todo >new_sheet && + cp new_sheet .git/sequencer/todo && + git cherry-pick --continue && + test_path_is_missing .git/sequencer && + git rev-list HEAD >commits + test_line_count = 4 commits +' + test_done
--
1.7.4.1