{"thread":{"id":"32209","subject":"[PATCH 0.5/4] t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs","startedAt":"2012-11-27T09:06:25Z","lastAt":"2012-11-27T09:12:03Z","messageCount":2,"participants":["Ramkumar Ramachandra"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"203981","messageId":"CALkWK0=0SfOuKRZvgt=BOBsKTXtaO5Y7-wAWK4XftE_aY9idyA@mail.gmail.com","threadId":"32209","inReplyTo":null,"subject":"[PATCH 0.5/4] t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2012-11-27T09:06:25Z","receivedAt":"2012-11-27T09:06:25Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"The expected SHA-1 digests are always available in variables.  Use\nthem instead of hardcoding.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Oops, I forgot to send this part.  It comes before part 1, and it's\nessential to make tests pass.\n\n t/t4041-diff-submodule-option.sh | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh\nindex 57e8a9d..5377639 100755\n--- a/t/t4041-diff-submodule-option.sh\n+++ b/t/t4041-diff-submodule-option.sh\n@@ -62,7 +62,7 @@ test_expect_success '--submodule=short overrides\ndiff.submodule' \"\n \tcat >expected <<-EOF &&\n diff --git a/sm1 b/sm1\n new file mode 160000\n-index 0000000..a2c4dab\n+index 0000000..$head1\n --- /dev/null\n +++ b/sm1\n @@ -0,0 +1 @@\n@@ -77,7 +77,7 @@ test_expect_success 'diff.submodule does not affect\nplumbing' '\n \tcat >expected <<-EOF &&\n \tdiff --git a/sm1 b/sm1\n \tnew file mode 160000\n-\tindex 0000000..a2c4dab\n+\tindex 0000000..$head1\n \t--- /dev/null\n \t+++ b/sm1\n \t@@ -0,0 +1 @@\n@@ -173,10 +173,10 @@ mv sm1-bak sm1\n test_expect_success 'typechanged submodule(submodule->blob), --cached' \"\n \tgit diff --submodule=log --cached >actual &&\n \tcat >expected <<-EOF &&\n-Submodule sm1 41fbea9...0000000 (submodule deleted)\n+Submodule sm1 $head4...0000000 (submodule deleted)\n diff --git a/sm1 b/sm1\n new file mode 100644\n-index 0000000..9da5fb8\n+index 0000000..$head5\n --- /dev/null\n +++ b/sm1\n @@ -0,0 +1 @@\n@@ -190,7 +190,7 @@ test_expect_success 'typechanged\nsubmodule(submodule->blob)' \"\n \tcat >expected <<-EOF &&\n diff --git a/sm1 b/sm1\n deleted file mode 100644\n-index 9da5fb8..0000000\n+index $head5..0000000\n --- a/sm1\n +++ /dev/null\n @@ -1 +0,0 @@\n-- \n1.7.12.1.428.g652398a.dirty\n"},{"id":"203982","messageId":"CALkWK0=-zCJnsmoOSJWKnK7fGVwq+yFi47VKotH37GurgxzvCw@mail.gmail.com","threadId":"32209","inReplyTo":"CALkWK0=0SfOuKRZvgt=BOBsKTXtaO5Y7-wAWK4XftE_aY9idyA@mail.gmail.com","subject":"Re: [PATCH 0.5/4] t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2012-11-27T09:12:03Z","receivedAt":"2012-11-27T09:12:03Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Ugh, line wrapping breaks my patch.  I've attached a copy.\n\nRam\n\n\nFrom 90bc75b78a6dd5e59d2055b05c065447bf051bb6 Mon Sep 17 00:00:00 2001\nFrom: Ramkumar Ramachandra <artagnon@gmail.com>\nDate: Mon, 26 Nov 2012 19:24:28 +0530\nSubject: [PATCH] t4041 (diff-submodule-option): don't hardcode SHA-1 in\n expected outputs\n\nThe expected SHA-1 digests are always available in variables.  Use\nthem instead of hardcoding.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n t/t4041-diff-submodule-option.sh | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh\nindex 57e8a9d..5377639 100755\n--- a/t/t4041-diff-submodule-option.sh\n+++ b/t/t4041-diff-submodule-option.sh\n@@ -62,7 +62,7 @@ test_expect_success '--submodule=short overrides diff.submodule' \"\n \tcat >expected <<-EOF &&\n diff --git a/sm1 b/sm1\n new file mode 160000\n-index 0000000..a2c4dab\n+index 0000000..$head1\n --- /dev/null\n +++ b/sm1\n @@ -0,0 +1 @@\n@@ -77,7 +77,7 @@ test_expect_success 'diff.submodule does not affect plumbing' '\n \tcat >expected <<-EOF &&\n \tdiff --git a/sm1 b/sm1\n \tnew file mode 160000\n-\tindex 0000000..a2c4dab\n+\tindex 0000000..$head1\n \t--- /dev/null\n \t+++ b/sm1\n \t@@ -0,0 +1 @@\n@@ -173,10 +173,10 @@ mv sm1-bak sm1\n test_expect_success 'typechanged submodule(submodule->blob), --cached' \"\n \tgit diff --submodule=log --cached >actual &&\n \tcat >expected <<-EOF &&\n-Submodule sm1 41fbea9...0000000 (submodule deleted)\n+Submodule sm1 $head4...0000000 (submodule deleted)\n diff --git a/sm1 b/sm1\n new file mode 100644\n-index 0000000..9da5fb8\n+index 0000000..$head5\n --- /dev/null\n +++ b/sm1\n @@ -0,0 +1 @@\n@@ -190,7 +190,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' \"\n \tcat >expected <<-EOF &&\n diff --git a/sm1 b/sm1\n deleted file mode 100644\n-index 9da5fb8..0000000\n+index $head5..0000000\n --- a/sm1\n +++ /dev/null\n @@ -1 +0,0 @@\n-- \n1.7.12.1.428.g652398a.dirty\n\n"}]}