Thread (1 message) 1 message, 1 author, 2018-08-23

Re: [PATCH] t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'

From: Junio C Hamano <hidden>
Date: 2018-08-23 16:20:31

SZEDER Gábor [off-list ref] writes:
quoted hunk
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 25a77ee5cb..592865d019 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -47,7 +47,7 @@ set_fake_editor () {
 	action=pick
 	for line in $FAKE_LINES; do
 		case $line in
-		squash|fixup|edit|reword|drop)
+		pick|squash|fixup|edit|reword|drop)
 			action="$line";;
 		exec*)
 			echo "$line" | sed 's/_/ /g' >> "$1";;
There is a large comment before the function that says

    ...
    #   The following word combinations are possible:
    #
    #   "<lineno>" -- add a "pick" line with the SHA1 taken from the
    #       specified line.
    #
    #   "<cmd> <lineno>" -- add a line with the specified command
    #       ("squash", "fixup", "edit", "reword" or "drop") and the SHA1 taken
    #       from the specified line.
    #
    #   "exec_cmd_with_args" -- add an "exec cmd with args" line.
    ...

which probably needs an update, too.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help