diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2010-01-12 16:38:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-12 12:34:07 -0800 |
| commit | 05c95dbe44b42f9c3f7efe6793d311a26e1b8181 (patch) | |
| tree | ec502ce0a12c1e54ef1619d00d2f9f22215b7572 /t/lib-rebase.sh | |
| parent | f64b4856243a9ea9445068a0989c71a8915c3862 (diff) | |
| download | git-05c95dbe44b42f9c3f7efe6793d311a26e1b8181.tar.gz | |
lib-rebase: Allow comments and blank lines to be added to the rebase script
(For testing "rebase -i"): Support new action types in $FAKE_LINES to
allow comments and blank lines to be added to the "rebase -i" command
list.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 0fce5952ce..0db8250c58 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -5,13 +5,20 @@ # - override the commit message with $FAKE_COMMIT_MESSAGE, # - amend the commit message with $FAKE_COMMIT_AMEND # - check that non-commit messages have a certain line count with $EXPECT_COUNT -# - rewrite a rebase -i script with $FAKE_LINES in the form +# - rewrite a rebase -i script as directed by $FAKE_LINES. +# $FAKE_LINES consists of a sequence of words separated by spaces. +# The following word combinations are possible: # -# "[<lineno1>] [<lineno2>]..." +# "<lineno>" -- add a "pick" line with the SHA1 taken from the +# specified line. # -# If a line number is prefixed with "squash", "fixup", "edit", or -# "reword", the respective line's command will be replaced with the -# specified one. +# "<cmd> <lineno>" -- add a line with the specified command +# ("squash", "fixup", "edit", or "reword") and the SHA1 taken +# from the specified line. +# +# "#" -- Add a comment line. +# +# ">" -- Add a blank line. set_fake_editor () { echo "#!$SHELL_PATH" >fake-editor.sh @@ -36,6 +43,10 @@ for line in $FAKE_LINES; do case $line in squash|fixup|edit|reword) action="$line";; + "#") + echo '# comment' >> "$1";; + ">") + echo >> "$1";; *) sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1" action=pick;; |