git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script
@ 2022-04-19  1:31 Jack McGuinness via GitGitGadget
  2022-04-19  1:31 ` [PATCH 1/3] " Jack McGuinness via GitGitGadget
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Jack McGuinness via GitGitGadget @ 2022-04-19  1:31 UTC (permalink / raw)
  To: git; +Cc: Jack McGuinness

I am using this thread to redo my previous attempt to modernize, where I
mistakenly replaced spaces with tabs incorrectly, and to complete the rest
of the modernization of t4202. I am really new to gitgitgadget, and
contributing to open source in general, so I expect I will mess up again,
but hopefully I can get manage to get through it when i do.

Thank you Derrick Stolee for reviewing my last patch, it's clear I still
have a lot of work to do on understanding style and bash scripting. Thanks
for checking this, -Jack McGuinness jmcguinness2@ucmerced.edu

Jack McGuinness (3):
  [GSoC][Patch] area: t4202-log.sh, modernizing test script
  [GSoC][Patch] area: t4202-log.sh, modernizing test script p2
  [GSoC][Patch] area: t4202-log.sh, modernizing test script p3

 t/t4202-log.sh | 156 +++++++++++++++++++++++++------------------------
 1 file changed, 80 insertions(+), 76 deletions(-)


base-commit: 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1220%2FJackMcGu%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1220/JackMcGu/master-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1220
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script
  2022-04-19  1:31 [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Jack McGuinness via GitGitGadget
@ 2022-04-19  1:31 ` Jack McGuinness via GitGitGadget
  2022-04-19  1:31 ` [PATCH 2/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script p2 Jack McGuinness via GitGitGadget
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Jack McGuinness via GitGitGadget @ 2022-04-19  1:31 UTC (permalink / raw)
  To: git; +Cc: Jack McGuinness, Jack McGuinness

From: Jack McGuinness <jmcguinness2@ucmerced.edu>

Replace test body spaces with tabs where appropiate
Remove blank lines at start and and of test bodies.

Signed-off-by: Jack McGuinness <jmcguinness2@ucmerced.edu>
---
 t/t4202-log.sh | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index be07407f855..c5d191356f1 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -15,7 +15,6 @@ test_cmp_graph () {
 }
 
 test_expect_success setup '
-
 	echo one >one &&
 	git add one &&
 	test_tick &&
@@ -44,31 +43,26 @@ test_expect_success setup '
 	git rm a/two &&
 	test_tick &&
 	git commit -m sixth
-
 '
 
 printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial" > expect
 test_expect_success 'pretty' '
-
 	git log --pretty="format:%s" > actual &&
 	test_cmp expect actual
 '
 
 printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial\n" > expect
 test_expect_success 'pretty (tformat)' '
-
 	git log --pretty="tformat:%s" > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'pretty (shortcut)' '
-
 	git log --pretty="%s" > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'format' '
-
 	git log --format="%s" > actual &&
 	test_cmp expect actual
 '
@@ -83,13 +77,11 @@ cat > expect << EOF
 EOF
 
 test_expect_success 'format %w(11,1,2)' '
-
 	git log -2 --format="%w(11,1,2)This is the %s commit." > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'format %w(,1,2)' '
-
 	git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." > actual &&
 	test_cmp expect actual
 '
@@ -103,47 +95,37 @@ $(git rev-parse --short :/second ) second
 $(git rev-parse --short :/initial) initial
 EOF
 test_expect_success 'oneline' '
-
 	git log --oneline > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'diff-filter=A' '
-
 	git log --no-renames --pretty="format:%s" --diff-filter=A HEAD > actual &&
 	git log --no-renames --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
 	printf "fifth\nfourth\nthird\ninitial" > expect &&
 	test_cmp expect actual &&
 	test_cmp expect actual-separate
-
 '
 
 test_expect_success 'diff-filter=M' '
-
 	git log --pretty="format:%s" --diff-filter=M HEAD >actual &&
 	printf "second" >expect &&
 	test_cmp expect actual
-
 '
 
 test_expect_success 'diff-filter=D' '
-
 	git log --no-renames --pretty="format:%s" --diff-filter=D HEAD >actual &&
 	printf "sixth\nthird" >expect &&
 	test_cmp expect actual
-
 '
 
 test_expect_success 'diff-filter=R' '
-
 	git log -M --pretty="format:%s" --diff-filter=R HEAD >actual &&
 	printf "third" >expect &&
 	test_cmp expect actual
-
 '
 
 test_expect_success 'multiple --diff-filter bits' '
-
 	git log -M --pretty="format:%s" --diff-filter=R HEAD >expect &&
 	git log -M --pretty="format:%s" --diff-filter=Ra HEAD >actual &&
 	test_cmp expect actual &&
@@ -152,19 +134,15 @@ test_expect_success 'multiple --diff-filter bits' '
 	git log -M --pretty="format:%s" \
 		--diff-filter=a --diff-filter=R HEAD >actual &&
 	test_cmp expect actual
-
 '
 
 test_expect_success 'diff-filter=C' '
-
 	git log -C -C --pretty="format:%s" --diff-filter=C HEAD >actual &&
 	printf "fourth" >expect &&
 	test_cmp expect actual
-
 '
 
 test_expect_success 'git log --follow' '
-
 	git log --follow --pretty="format:%s" ichi >actual &&
 	printf "third\nsecond\ninitial" >expect &&
 	test_cmp expect actual
@@ -879,7 +857,7 @@ test_expect_success 'multiple decorate-refs' '
 	git log -n6 --decorate=short --pretty="tformat:%f%d" \
 		--decorate-refs="heads/octopus*" \
 		--decorate-refs="tags/reach" >actual &&
-    test_cmp expect.decorate actual
+	test_cmp expect.decorate actual
 '
 
 test_expect_success 'decorate-refs-exclude with glob' '
@@ -2190,10 +2168,10 @@ test_expect_success 'log --decorate includes all levels of tag annotated tags' '
 '
 
 test_expect_success 'log --end-of-options' '
-       git update-ref refs/heads/--source HEAD &&
-       git log --end-of-options --source >actual &&
-       git log >expect &&
-       test_cmp expect actual
+	git update-ref refs/heads/--source HEAD &&
+	git log --end-of-options --source >actual &&
+	git log >expect &&
+	test_cmp expect actual
 '
 
 test_expect_success 'set up commits with different authors' '
-- 
gitgitgadget


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script p2
  2022-04-19  1:31 [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Jack McGuinness via GitGitGadget
  2022-04-19  1:31 ` [PATCH 1/3] " Jack McGuinness via GitGitGadget
@ 2022-04-19  1:31 ` Jack McGuinness via GitGitGadget
  2022-04-19  1:31 ` [PATCH 3/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script p3 Jack McGuinness via GitGitGadget
  2022-04-19  5:26 ` [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Bagas Sanjaya
  3 siblings, 0 replies; 7+ messages in thread
From: Jack McGuinness via GitGitGadget @ 2022-04-19  1:31 UTC (permalink / raw)
  To: git; +Cc: Jack McGuinness, Jack McGuinness

From: Jack McGuinness <jmcguinness2@ucmerced.edu>

Remove whitespace after redirect operator.

Signed-off-by: Jack McGuinness <jmcguinness2@ucmerced.edu>
---
 t/t4202-log.sh | 62 +++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index c5d191356f1..fe3976829bb 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -45,29 +45,29 @@ test_expect_success setup '
 	git commit -m sixth
 '
 
-printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial" > expect
+printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial" >expect
 test_expect_success 'pretty' '
-	git log --pretty="format:%s" > actual &&
+	git log --pretty="format:%s" >actual &&
 	test_cmp expect actual
 '
 
-printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial\n" > expect
+printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial\n" >expect
 test_expect_success 'pretty (tformat)' '
-	git log --pretty="tformat:%s" > actual &&
+	git log --pretty="tformat:%s" >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'pretty (shortcut)' '
-	git log --pretty="%s" > actual &&
+	git log --pretty="%s" >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'format' '
-	git log --format="%s" > actual &&
+	git log --format="%s" >actual &&
 	test_cmp expect actual
 '
 
-cat > expect << EOF
+cat >expect << EOF
  This is
   the sixth
   commit.
@@ -77,16 +77,16 @@ cat > expect << EOF
 EOF
 
 test_expect_success 'format %w(11,1,2)' '
-	git log -2 --format="%w(11,1,2)This is the %s commit." > actual &&
+	git log -2 --format="%w(11,1,2)This is the %s commit." >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'format %w(,1,2)' '
-	git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." > actual &&
+	git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." >actual &&
 	test_cmp expect actual
 '
 
-cat > expect << EOF
+cat >expect << EOF
 $(git rev-parse --short :/sixth  ) sixth
 $(git rev-parse --short :/fifth  ) fifth
 $(git rev-parse --short :/fourth ) fourth
@@ -95,14 +95,14 @@ $(git rev-parse --short :/second ) second
 $(git rev-parse --short :/initial) initial
 EOF
 test_expect_success 'oneline' '
-	git log --oneline > actual &&
+	git log --oneline >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'diff-filter=A' '
-	git log --no-renames --pretty="format:%s" --diff-filter=A HEAD > actual &&
-	git log --no-renames --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
-	printf "fifth\nfourth\nthird\ninitial" > expect &&
+	git log --no-renames --pretty="format:%s" --diff-filter=A HEAD >actual &&
+	git log --no-renames --pretty="format:%s" --diff-filter A HEAD >actual-separate &&
+	printf "fifth\nfourth\nthird\ninitial" >expect &&
 	test_cmp expect actual &&
 	test_cmp expect actual-separate
 '
@@ -174,43 +174,43 @@ test_expect_success 'git config log.follow is overridden by --no-follow' '
 
 # Note that these commits are intentionally listed out of order.
 last_three="$(git rev-parse :/fourth :/sixth :/fifth)"
-cat > expect << EOF
+cat >expect << EOF
 $(git rev-parse --short :/sixth ) sixth
 $(git rev-parse --short :/fifth ) fifth
 $(git rev-parse --short :/fourth) fourth
 EOF
 test_expect_success 'git log --no-walk <commits> sorts by commit time' '
-	git log --no-walk --oneline $last_three > actual &&
+	git log --no-walk --oneline $last_three >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git log --no-walk=sorted <commits> sorts by commit time' '
-	git log --no-walk=sorted --oneline $last_three > actual &&
+	git log --no-walk=sorted --oneline $last_three >actual &&
 	test_cmp expect actual
 '
 
-cat > expect << EOF
+cat >expect << EOF
 === $(git rev-parse --short :/sixth ) sixth
 === $(git rev-parse --short :/fifth ) fifth
 === $(git rev-parse --short :/fourth) fourth
 EOF
 test_expect_success 'git log --line-prefix="=== " --no-walk <commits> sorts by commit time' '
-	git log --line-prefix="=== " --no-walk --oneline $last_three > actual &&
+	git log --line-prefix="=== " --no-walk --oneline $last_three >actual &&
 	test_cmp expect actual
 '
 
-cat > expect << EOF
+cat >expect << EOF
 $(git rev-parse --short :/fourth) fourth
 $(git rev-parse --short :/sixth ) sixth
 $(git rev-parse --short :/fifth ) fifth
 EOF
 test_expect_success 'git log --no-walk=unsorted <commits> leaves list of commits as given' '
-	git log --no-walk=unsorted --oneline $last_three > actual &&
+	git log --no-walk=unsorted --oneline $last_three >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git show <commits> leaves list of commits as given' '
-	git show --oneline -s $last_three > actual &&
+	git show --oneline -s $last_three >actual &&
 	test_cmp expect actual
 '
 
@@ -227,7 +227,7 @@ test_expect_success 'log --grep' '
 	test_cmp expect actual
 '
 
-cat > expect << EOF
+cat >expect << EOF
 second
 initial
 EOF
@@ -514,7 +514,7 @@ test_expect_success '-c color.grep.matchSelected log --grep' '
 	test_cmp expect actual
 '
 
-cat > expect <<EOF
+cat >expect <<EOF
 * Second
 * sixth
 * fifth
@@ -528,7 +528,7 @@ test_expect_success 'simple log --graph' '
 	test_cmp_graph
 '
 
-cat > expect <<EOF
+cat >expect <<EOF
 123 * Second
 123 * sixth
 123 * fifth
@@ -550,7 +550,7 @@ test_expect_success 'set up merge history' '
 	git merge side
 '
 
-cat > expect <<\EOF
+cat >expect <<\EOF
 *   Merge branch 'side'
 |\
 | * side-2
@@ -569,7 +569,7 @@ test_expect_success 'log --graph with merge' '
 	test_cmp_graph --date-order
 '
 
-cat > expect <<\EOF
+cat >expect <<\EOF
 | | | *   Merge branch 'side'
 | | | |\
 | | | | * side-2
@@ -588,7 +588,7 @@ test_expect_success 'log --graph --line-prefix="| | | " with merge' '
 	test_cmp_graph --line-prefix="| | | " --date-order
 '
 
-cat > expect.colors <<\EOF
+cat >expect.colors <<\EOF
 *   Merge branch 'side'
 <BLUE>|<RESET><CYAN>\<RESET>
 <BLUE>|<RESET> * side-2
@@ -618,7 +618,7 @@ test_expect_success 'diff-tree --graph' '
 	grep "one" actual
 '
 
-cat > expect <<\EOF
+cat >expect <<\EOF
 *   commit main
 |\  Merge: A B
 | | Author: A U Thor <author@example.com>
@@ -699,7 +699,7 @@ test_expect_success 'set up more tangled history' '
 	git merge reach
 '
 
-cat > expect <<\EOF
+cat >expect <<\EOF
 *   Merge tag 'reach'
 |\
 | \
@@ -1822,7 +1822,7 @@ test_expect_success GPGSM 'log x509 fingerprint' '
 '
 
 test_expect_success GPGSM 'log OpenPGP fingerprint' '
-	echo "D4BE22311AD3131E5EDA29A461092E85B7227189" > expect &&
+	echo "D4BE22311AD3131E5EDA29A461092E85B7227189" >expect &&
 	git log -n1 --format="%GP" signed-subkey >actual &&
 	test_cmp expect actual
 '
-- 
gitgitgadget


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script p3
  2022-04-19  1:31 [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Jack McGuinness via GitGitGadget
  2022-04-19  1:31 ` [PATCH 1/3] " Jack McGuinness via GitGitGadget
  2022-04-19  1:31 ` [PATCH 2/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script p2 Jack McGuinness via GitGitGadget
@ 2022-04-19  1:31 ` Jack McGuinness via GitGitGadget
  2022-04-19  5:26 ` [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Bagas Sanjaya
  3 siblings, 0 replies; 7+ messages in thread
From: Jack McGuinness via GitGitGadget @ 2022-04-19  1:31 UTC (permalink / raw)
  To: git; +Cc: Jack McGuinness, Jack McGuinness

From: Jack McGuinness <jmcguinness2@ucmerced.edu>

Split up multiple lines on one line to multiple
Fix style of cd & echo in subshell

Signed-off-by: Jack McGuinness <jmcguinness2@ucmerced.edu>
---
 t/t4202-log.sh | 62 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index fe3976829bb..604b275d6a8 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -1756,13 +1756,20 @@ test_expect_success '--walk-reflogs --graph --no-graph works' '
 
 test_expect_success 'dotdot is a parent directory' '
 	mkdir -p a/b &&
-	( echo sixth && echo fifth ) >expect &&
-	( cd a/b && git log --format=%s .. ) >actual &&
+	(
+		echo sixth &&
+		echo fifth
+	) >expect &&
+	(
+		cd a/b &&
+		git log --format=%s ..
+	) >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success GPG 'setup signed branch' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b signed main &&
 	echo foo >foo &&
 	git add foo &&
@@ -1770,7 +1777,8 @@ test_expect_success GPG 'setup signed branch' '
 '
 
 test_expect_success GPG 'setup signed branch with subkey' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b signed-subkey main &&
 	echo foo >foo &&
 	git add foo &&
@@ -1778,7 +1786,8 @@ test_expect_success GPG 'setup signed branch with subkey' '
 '
 
 test_expect_success GPGSM 'setup signed branch x509' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b signed-x509 main &&
 	echo foo >foo &&
 	git add foo &&
@@ -1790,7 +1799,8 @@ test_expect_success GPGSM 'setup signed branch x509' '
 test_expect_success GPGSSH 'setup sshkey signed branch' '
 	test_config gpg.format ssh &&
 	test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b signed-ssh main &&
 	echo foo >foo &&
 	git add foo &&
@@ -1802,16 +1812,24 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed commits with keys ha
 	touch file &&
 	git add file &&
 
-	echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+	echo expired >file &&
+	test_tick &&
+	git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
 	git tag expired-signed &&
 
-	echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+	echo notyetvalid >file &&
+	test_tick &&
+	git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
 	git tag notyetvalid-signed &&
 
-	echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+	echo timeboxedvalid >file &&
+	test_tick &&
+	git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
 	git tag timeboxedvalid-signed &&
 
-	echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+	echo timeboxedinvalid >file &&
+	test_tick &&
+	git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
 	git tag timeboxedinvalid-signed
 '
 
@@ -1878,7 +1896,8 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log shows failure with commit date
 '
 
 test_expect_success GPG 'log --graph --show-signature for merged tag' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b plain main &&
 	echo aaa >bar &&
 	git add bar &&
@@ -1897,7 +1916,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
 '
 
 test_expect_success GPG 'log --graph --show-signature for merged tag in shallow clone' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b plain-shallow main &&
 	echo aaa >bar &&
 	git add bar &&
@@ -1917,7 +1937,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag in shallow
 '
 
 test_expect_success GPG 'log --graph --show-signature for merged tag with missing key' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b plain-nokey main &&
 	echo aaa >bar &&
 	git add bar &&
@@ -1936,7 +1957,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag with missin
 '
 
 test_expect_success GPG 'log --graph --show-signature for merged tag with bad signature' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b plain-bad main &&
 	echo aaa >bar &&
 	git add bar &&
@@ -1958,7 +1980,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag with bad si
 '
 
 test_expect_success GPG 'log --show-signature for merged tag with GPG failure' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	git checkout -b plain-fail main &&
 	echo aaa >bar &&
 	git add bar &&
@@ -1977,7 +2000,8 @@ test_expect_success GPG 'log --show-signature for merged tag with GPG failure' '
 '
 
 test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	test_config gpg.format x509 &&
 	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
 	git checkout -b plain-x509 main &&
@@ -1998,7 +2022,8 @@ test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
 '
 
 test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 missing key' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	test_config gpg.format x509 &&
 	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
 	git checkout -b plain-x509-nokey main &&
@@ -2019,7 +2044,8 @@ test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 miss
 '
 
 test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' '
-	test_when_finished "git reset --hard && git checkout main" &&
+	test_when_finished "git reset --hard &&
+	git checkout main" &&
 	test_config gpg.format x509 &&
 	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
 	git checkout -b plain-x509-bad main &&
-- 
gitgitgadget

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script
  2022-04-19  1:31 [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Jack McGuinness via GitGitGadget
                   ` (2 preceding siblings ...)
  2022-04-19  1:31 ` [PATCH 3/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script p3 Jack McGuinness via GitGitGadget
@ 2022-04-19  5:26 ` Bagas Sanjaya
  2022-04-19  5:34   ` Jack McGuinness
  3 siblings, 1 reply; 7+ messages in thread
From: Bagas Sanjaya @ 2022-04-19  5:26 UTC (permalink / raw)
  To: Jack McGuinness via GitGitGadget, git; +Cc: Jack McGuinness

On 4/19/22 08:31, Jack McGuinness via GitGitGadget wrote:
> Jack McGuinness (3):
>   [GSoC][Patch] area: t4202-log.sh, modernizing test script
>   [GSoC][Patch] area: t4202-log.sh, modernizing test script p2
>   [GSoC][Patch] area: t4202-log.sh, modernizing test script p3
> 
>  t/t4202-log.sh | 156 +++++++++++++++++++++++++------------------------
>  1 file changed, 80 insertions(+), 76 deletions(-)
> 

I think the subject prefix of this patch series can be just
[GSOC] [PATCH] instead.

-- 
An old man doll... just what I always wanted! - Clara

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script
  2022-04-19  5:26 ` [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Bagas Sanjaya
@ 2022-04-19  5:34   ` Jack McGuinness
  2022-04-25  9:45     ` Christian Couder
  0 siblings, 1 reply; 7+ messages in thread
From: Jack McGuinness @ 2022-04-19  5:34 UTC (permalink / raw)
  To: Bagas Sanjaya, Jack McGuinness via GitGitGadget,
	git@vger.kernel.org

Hi, thank you for the advice. I wanted it to be that way myself, however I was using gitgitgadget to email it, and my PR was composed of three different commits, which caused it to automatically be formatted that way. I tried finding a way to remove it, but I had no luck, If you know how I would love to know!

Thanks for your time,
-Jack McGuinness <jmcguinness2@ucmerced.edu>

________________________________________
From: Bagas Sanjaya <bagasdotme@gmail.com>
Sent: Monday, April 18, 2022 10:26 PM
To: Jack McGuinness via GitGitGadget; git@vger.kernel.org
Cc: Jack McGuinness
Subject: Re: [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script

On 4/19/22 08:31, Jack McGuinness via GitGitGadget wrote:
> Jack McGuinness (3):
>   [GSoC][Patch] area: t4202-log.sh, modernizing test script
>   [GSoC][Patch] area: t4202-log.sh, modernizing test script p2
>   [GSoC][Patch] area: t4202-log.sh, modernizing test script p3
>
>  t/t4202-log.sh | 156 +++++++++++++++++++++++++------------------------
>  1 file changed, 80 insertions(+), 76 deletions(-)
>

I think the subject prefix of this patch series can be just
[GSOC] [PATCH] instead.

--
An old man doll... just what I always wanted! - Clara

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script
  2022-04-19  5:34   ` Jack McGuinness
@ 2022-04-25  9:45     ` Christian Couder
  0 siblings, 0 replies; 7+ messages in thread
From: Christian Couder @ 2022-04-25  9:45 UTC (permalink / raw)
  To: Jack McGuinness
  Cc: Bagas Sanjaya, Jack McGuinness via GitGitGadget,
	git@vger.kernel.org

Hi,

On Tue, Apr 19, 2022 at 8:33 AM Jack McGuinness
<jmcguinness2@ucmerced.edu> wrote:
>
> Hi, thank you for the advice. I wanted it to be that way myself, however I was using gitgitgadget to email it, and my PR was composed of three different commits, which caused it to automatically be formatted that way. I tried finding a way to remove it, but I had no luck, If you know how I would love to know!

I don't use gitgitgadget, so I cannot help you much on this. The
approach I would take if I had to use it would be to find patches on
the mailing list that were sent using gitgitgadget by experienced
developers using it, then find and see how the corresponding PRs look
like on GitHub, and try to imitate those PRs.

Anyway, it would be nice if you could try again taking into account
Junio's suggestions in:

https://lore.kernel.org/git/xmqqmtggs2nv.fsf@gitster.g/

I also have some suggestions below.

> To: Jack McGuinness via GitGitGadget; git@vger.kernel.org
> Cc: Jack McGuinness
> Subject: Re: [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script

This is your second attempt so it would be nice if it had a "v2"
marker in it like "[PATCH v2 0/3] [GSoC]" instead of "[PATCH 0/3]
[GSoC][Patch]". (Your next attempt should use "v3".)

> On 4/19/22 08:31, Jack McGuinness via GitGitGadget wrote:
> > Jack McGuinness (3):
> >   [GSoC][Patch] area: t4202-log.sh, modernizing test script
> >   [GSoC][Patch] area: t4202-log.sh, modernizing test script p2
> >   [GSoC][Patch] area: t4202-log.sh, modernizing test script p3

Junio already commented on the "area: t4202-log.sh" part of the
subject, so I won't repeat him.

About the "modernizing test script ..." part, it would be nice if the
different patches would be a bit more specific about what each one is
doing and "p2" or "p3" is redundant with the "2/3" or "3/3" added by
GitGitGadget. For example it could be replaced with "remove whitespace
after redirect" for the second patch.

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-04-25  9:46 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-19  1:31 [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Jack McGuinness via GitGitGadget
2022-04-19  1:31 ` [PATCH 1/3] " Jack McGuinness via GitGitGadget
2022-04-19  1:31 ` [PATCH 2/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script p2 Jack McGuinness via GitGitGadget
2022-04-19  1:31 ` [PATCH 3/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script p3 Jack McGuinness via GitGitGadget
2022-04-19  5:26 ` [PATCH 0/3] [GSoC][Patch] area: t4202-log.sh, modernizing test script Bagas Sanjaya
2022-04-19  5:34   ` Jack McGuinness
2022-04-25  9:45     ` Christian Couder

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).