git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/6] t3404 & t3411: undo copy&paste

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 27, 2009, 22:34 UTC
Message-ID
<alpine.DEB.1.00.0901272334210.3586@pacific.mpi-cbg.de>
In-Reply-To
<7v7i4g31lj.fsf@gitster.siamese.dyndns.org>

Rather than copying and pasting, which is prone to lead to fixes missing in one version, move the fake-editor generator to t/t3404/.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/lib-rebase.sh                          |   36 ++++++++++++++++++++++++++++
 t/t3404-rebase-interactive.sh            |   37 +++--------------------------
 t/t3411-rebase-preserve-around-merges.sh |   38 +++--------------------------
 3 files changed, 44 insertions(+), 67 deletions(-)
 create mode 100644 t/lib-rebase.sh
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
new file mode 100644
index 0000000..762ffcf
--- /dev/null
+++ b/t/lib-rebase.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set_fake_editor () {
+	echo "#!$SHELL_PATH" >fake-editor.sh
+	cat >> fake-editor.sh <<\EOF
+case "$1" in
+*/COMMIT_EDITMSG)
+	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"
+cat "$1".tmp
+action=pick
+for line in $FAKE_LINES; do
+	case $line in
+	squash|edit)
+		action="$line";;
+	*)
+		echo sed -n "${line}s/^pick/$action/p"
+		sed -n "${line}p" < "$1".tmp
+		sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
+		action=pick;;
+	esac
+done
+EOF
+
+	test_set_editor "$(pwd)/fake-editor.sh"
+	chmod a+x fake-editor.sh
+}
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 2cc8e7a..3592403 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -10,6 +10,10 @@ that the result still makes sense.
 '
 . ./test-lib.sh
 
+. ../lib-rebase.sh
+
+set_fake_editor
+
 # set up two branches like this:
 #
 # A - B - C - D - E
@@ -61,39 +65,6 @@ test_expect_success 'setup' '
 	git tag I
 '
 
-echo "#!$SHELL_PATH" >fake-editor.sh
-cat >> fake-editor.sh <<\EOF
-case "$1" in
-*/COMMIT_EDITMSG)
-	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"
-cat "$1".tmp
-action=pick
-for line in $FAKE_LINES; do
-	case $line in
-	squash|edit)
-		action="$line";;
-	*)
-		echo sed -n "${line}s/^pick/$action/p"
-		sed -n "${line}p" < "$1".tmp
-		sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
-		action=pick;;
-	esac
-done
-EOF
-
-test_set_editor "$(pwd)/fake-editor.sh"
-chmod a+x fake-editor.sh
-
 test_expect_success 'no changes are a nop' '
 	git rebase -i F &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh
index aacfaae..6a1586a 100755
--- a/t/t3411-rebase-preserve-around-merges.sh
+++ b/t/t3411-rebase-preserve-around-merges.sh
@@ -5,44 +5,14 @@
 
 test_description='git rebase preserve merges
 
-This test runs git rebase with and tries to squash a commit from after a merge
-to before the merge.
+This test runs git rebase with -p and tries to squash a commit from after
+a merge to before the merge.
 '
 . ./test-lib.sh
 
-# Copy/paste from t3404-rebase-interactive.sh
-echo "#!$SHELL_PATH" >fake-editor.sh
-cat >> fake-editor.sh <<\EOF
-case "$1" in
-*/COMMIT_EDITMSG)
-	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"
-cat "$1".tmp
-action=pick
-for line in $FAKE_LINES; do
-	case $line in
-	squash|edit)
-		action="$line";;
-	*)
-		echo sed -n "${line}s/^pick/$action/p"
-		sed -n "${line}p" < "$1".tmp
-		sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
-		action=pick;;
-	esac
-done
-EOF
+. ../lib-rebase.sh
 
-test_set_editor "$(pwd)/fake-editor.sh"
-chmod a+x fake-editor.sh
+set_fake_editor
 
 # set up two branches like this:
 #

-- 
1.6.1.482.g7d54be
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 12 of 30 in “Heads up: rebase -i -p will be made sane again”
  1. Johannes SchindelinJan 27, 2009
  2. Stephen HabermanJan 27, 2009
  3. 0/6 Simplifications of some 'rebase' testsJohannes Schindelin, Jan 27, 2009
  4. 1/6 t3404 & t3411: undo copy&pasteJohannes Schindelin, Jan 27, 2009
  5. Junio C HamanoJan 27, 2009
  6. Johannes SchindelinJan 27, 2009
  7. Junio C HamanoJan 27, 2009
  8. Johannes SchindelinJan 27, 2009
  9. 0/6 rebase simplificationsJohannes Schindelin, Jan 27, 2009
  10. Junio C HamanoJan 27, 2009
  11. Johannes SchindelinJan 27, 2009
  12. 1/6 t3404 & t3411: undo copy&pasteJohannes Schindelin, Jan 27, 2009
  13. 2/6 lib-rebase.sh: Document what set_fake_editor() doesJohannes Schindelin, Jan 27, 2009
  14. 3/6 test-lib.sh: introduce test_commit() and test_merge() helpersJohannes Schindelin, Jan 27, 2009
  15. 4/6 Simplify t3410Johannes Schindelin, Jan 27, 2009
  16. 5/6 Simplify t3411Johannes Schindelin, Jan 27, 2009
  17. 6/6 Simplify t3412Johannes Schindelin, Jan 27, 2009
  18. 2/6 lib-rebase.sh: Document what set_fake_editor() doesJohannes Schindelin, Jan 27, 2009
  19. Junio C HamanoJan 27, 2009
  20. Johannes SchindelinJan 27, 2009
  21. 3/6 lib-rebase.sh: introduce test_commit() and test_merge() helpersJohannes Schindelin, Jan 27, 2009
  22. Junio C HamanoJan 27, 2009
  23. 4/6 Simplify t3410Johannes Schindelin, Jan 27, 2009
  24. 5/6 Simplify t3411Johannes Schindelin, Jan 27, 2009
  25. 6/6 Simplify t3412Johannes Schindelin, Jan 27, 2009
  26. Johannes SchindelinJan 27, 2009
  27. Johannes SchindelinJan 28, 2009
  28. Stephen HabermanJan 28, 2009
  29. Johannes SchindelinJan 28, 2009
  30. Stephen HabermanJan 28, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.