development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-20 17:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib-rebase: Allow comments and blank lines to be added to the rebase script

Browse source 
(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>
This commit is contained in:
Michael Haggerty 2010-01-12 16:38:35 +01:00 committed by Junio C Hamano
parent f64b485624
commit 05c95dbe44
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
t/lib-rebase.sh
View file

@ -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;;