Re: [PATCH v5 7/7] replace: add test for --graft with signed commit

[Christian Couder]

On Wed, Jul 2, 2014 at 11:22 PM, Junio C Hamano gits...@pobox.com wrote:
 Christian Couder chrisc...@tuxfamily.org writes:


 +test_expect_success GPG 'set up a signed commit' '
 + echo line 17  hello 
 + echo line 18  hello 

 Style?

Yeah, I will change it to:

 echo line 17 hello 
 echo line 18 hello 

 + git add hello 
 + test_tick 
 + git commit --quiet -S -m hello: 2 more lines in a signed commit 
 + HASH8=$(git rev-parse --verify HEAD) 
 + git verify-commit $HASH8
 +'
 +
 +test_expect_success GPG '--graft with a signed commit' '
 + git cat-file commit $HASH8 orig 
 + git replace --graft $HASH8 
 + git cat-file commit $HASH8 repl 
 + test_must_fail grep gpgsig repl 
 + diff -u orig repl | grep ^-parent $HASH7 
 + diff -u orig repl | grep ^-gpgsig -BEGIN PGP SIGNATURE- 

 Almost the same comment as the one for 2/7 applies here.

Ok, I will find a way to make it better.

Thanks,
Christian.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v5 7/7] replace: add test for --graft with signed commit

[Christian Couder]

Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
 t/t6050-replace.sh | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index ca45a84..80b85e3 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -7,6 +7,7 @@ test_description='Tests replace refs functionality'
 exec /dev/null
 
 . ./test-lib.sh
+. $TEST_DIRECTORY/lib-gpg.sh
 
 add_and_commit_file()
 {
@@ -363,4 +364,25 @@ test_expect_success '--graft with and without already 
replaced object' '
git replace -d $HASH5
 '
 
+test_expect_success GPG 'set up a signed commit' '
+   echo line 17  hello 
+   echo line 18  hello 
+   git add hello 
+   test_tick 
+   git commit --quiet -S -m hello: 2 more lines in a signed commit 
+   HASH8=$(git rev-parse --verify HEAD) 
+   git verify-commit $HASH8
+'
+
+test_expect_success GPG '--graft with a signed commit' '
+   git cat-file commit $HASH8 orig 
+   git replace --graft $HASH8 
+   git cat-file commit $HASH8 repl 
+   test_must_fail grep gpgsig repl 
+   diff -u orig repl | grep ^-parent $HASH7 
+   diff -u orig repl | grep ^-gpgsig -BEGIN PGP SIGNATURE- 
+   test_must_fail git verify-commit $HASH8 
+   git replace -d $HASH8
+'
+
 test_done
-- 
2.0.0.421.g786a89d.dirty

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html