* [PATCH] lib-rebase: use write_script
@ 2013-06-27 18:30 Andrew Pimlott
2013-06-27 18:37 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Pimlott @ 2013-06-27 18:30 UTC (permalink / raw)
To: git; +Cc: Andrew Pimlott
Signed-off-by: Andrew Pimlott <andrew@pimlott.net>
---
t/lib-rebase.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 0b41155..7b42199 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -24,8 +24,7 @@
# ">" -- Add a blank line.
set_fake_editor () {
- echo "#!$SHELL_PATH" >fake-editor.sh
- cat >> fake-editor.sh <<\EOF
+ write_script fake-editor.sh <<\EOF
case "$1" in
*/COMMIT_EDITMSG)
test -z "$EXPECT_HEADER_COUNT" ||
@@ -65,7 +64,6 @@ cat "$1"
EOF
test_set_editor "$(pwd)/fake-editor.sh"
- chmod a+x fake-editor.sh
}
# After set_cat_todo_editor, rebase -i will write the todo list (ignoring
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] lib-rebase: use write_script
2013-06-27 18:30 [PATCH] lib-rebase: use write_script Andrew Pimlott
@ 2013-06-27 18:37 ` Junio C Hamano
2013-06-27 19:02 ` Andrew Pimlott
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2013-06-27 18:37 UTC (permalink / raw)
To: Andrew Pimlott; +Cc: git
Andrew Pimlott <andrew@pimlott.net> writes:
> Signed-off-by: Andrew Pimlott <andrew@pimlott.net>
> ---
> t/lib-rebase.sh | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
> index 0b41155..7b42199 100644
> --- a/t/lib-rebase.sh
> +++ b/t/lib-rebase.sh
> @@ -24,8 +24,7 @@
> # ">" -- Add a blank line.
>
> set_fake_editor () {
> - echo "#!$SHELL_PATH" >fake-editor.sh
> - cat >> fake-editor.sh <<\EOF
> + write_script fake-editor.sh <<\EOF
> case "$1" in
> */COMMIT_EDITMSG)
> test -z "$EXPECT_HEADER_COUNT" ||
> @@ -65,7 +64,6 @@ cat "$1"
> EOF
>
> test_set_editor "$(pwd)/fake-editor.sh"
> - chmod a+x fake-editor.sh
> }
>
> # After set_cat_todo_editor, rebase -i will write the todo list (ignoring
Thanks, but it should probably be
write_script fake-editor.sh <<-\EOF
case "$1" in
...
EOF
test_set_editor ...
if the aim is to modernize this part.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] lib-rebase: use write_script
2013-06-27 18:37 ` Junio C Hamano
@ 2013-06-27 19:02 ` Andrew Pimlott
2013-06-27 20:50 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Pimlott @ 2013-06-27 19:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Excerpts from Junio C Hamano's message of Thu Jun 27 11:37:31 -0700 2013:
> Thanks, but it should probably be
>
> write_script fake-editor.sh <<-\EOF
> case "$1" in
> ...
> EOF
>
> test_set_editor ...
>
> if the aim is to modernize this part.
Yes, the goal is to make that file consistently use the current
practice. (My syntax highlighting doesn't like it, but...) I should
update the function I introduced first. I will re-submit the rebase -i
--autosquash patch and wait for acceptance before trying to fix other
things.
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] lib-rebase: use write_script
2013-06-27 19:02 ` Andrew Pimlott
@ 2013-06-27 20:50 ` Junio C Hamano
2013-07-01 16:23 ` Andrew Pimlott
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2013-06-27 20:50 UTC (permalink / raw)
To: Andrew Pimlott; +Cc: git
Andrew Pimlott <andrew@pimlott.net> writes:
> I should update the function I introduced first. I will re-submit
> the rebase -i --autosquash patch and wait for acceptance before
> trying to fix other things.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] lib-rebase: use write_script
2013-06-27 20:50 ` Junio C Hamano
@ 2013-07-01 16:23 ` Andrew Pimlott
2013-07-01 16:56 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Pimlott @ 2013-07-01 16:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Excerpts from Junio C Hamano's message of Thu Jun 27 13:50:45 -0700 2013:
> Andrew Pimlott <andrew@pimlott.net> writes:
>
> > I should update the function I introduced first. I will re-submit
> > the rebase -i --autosquash patch and wait for acceptance before
> > trying to fix other things.
>
> Thanks.
Applies on top of rebase -i patch already accepted. Mostly whitespace
changes.
Thanks for your other help.
Andrew
---8<---
Subject: [PATCH] lib-rebase: style: use write_script, <<-\EOF
Signed-off-by: Andrew Pimlott <andrew@pimlott.net>
---
t/lib-rebase.sh | 74 +++++++++++++++++++++++++++----------------------------
1 file changed, 36 insertions(+), 38 deletions(-)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 7f119e2..8ff87fb 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -24,48 +24,46 @@
# ">" -- Add a blank line.
set_fake_editor () {
- echo "#!$SHELL_PATH" >fake-editor.sh
- cat >> fake-editor.sh <<\EOF
-case "$1" in
-*/COMMIT_EDITMSG)
- test -z "$EXPECT_HEADER_COUNT" ||
- test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" ||
+ write_script fake-editor.sh <<-\EOF
+ case "$1" in
+ */COMMIT_EDITMSG)
+ test -z "$EXPECT_HEADER_COUNT" ||
+ test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" ||
+ exit
+ test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
+ test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
exit
- test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
- test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
- exit
- ;;
-esac
-test -z "$EXPECT_COUNT" ||
- test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
- exit
-test -z "$FAKE_LINES" && exit
-grep -v '^#' < "$1" > "$1".tmp
-rm -f "$1"
-echo 'rebase -i script before editing:'
-cat "$1".tmp
-action=pick
-for line in $FAKE_LINES; do
- case $line in
- squash|fixup|edit|reword)
- action="$line";;
- exec*)
- echo "$line" | sed 's/_/ /g' >> "$1";;
- "#")
- echo '# comment' >> "$1";;
- ">")
- echo >> "$1";;
- *)
- sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
- action=pick;;
+ ;;
esac
-done
-echo 'rebase -i script after editing:'
-cat "$1"
-EOF
+ test -z "$EXPECT_COUNT" ||
+ test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
+ exit
+ test -z "$FAKE_LINES" && exit
+ grep -v '^#' < "$1" > "$1".tmp
+ rm -f "$1"
+ echo 'rebase -i script before editing:'
+ cat "$1".tmp
+ action=pick
+ for line in $FAKE_LINES; do
+ case $line in
+ squash|fixup|edit|reword)
+ action="$line";;
+ exec*)
+ echo "$line" | sed 's/_/ /g' >> "$1";;
+ "#")
+ echo '# comment' >> "$1";;
+ ">")
+ echo >> "$1";;
+ *)
+ sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
+ action=pick;;
+ esac
+ done
+ echo 'rebase -i script after editing:'
+ cat "$1"
+ EOF
test_set_editor "$(pwd)/fake-editor.sh"
- chmod a+x fake-editor.sh
}
# After set_cat_todo_editor, rebase -i will write the todo list (ignoring
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-07-01 16:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-27 18:30 [PATCH] lib-rebase: use write_script Andrew Pimlott
2013-06-27 18:37 ` Junio C Hamano
2013-06-27 19:02 ` Andrew Pimlott
2013-06-27 20:50 ` Junio C Hamano
2013-07-01 16:23 ` Andrew Pimlott
2013-07-01 16:56 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).