{"thread":{"id":"50325","subject":"[PATCH 1/2] Add tests for describe with --work-tree","startedAt":"2019-01-26T10:41:17Z","lastAt":"2019-01-26T10:41:17Z","messageCount":1,"participants":["Sebastian Staudt"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"367703","messageId":"CA+xP2SZ6RJj3Eii-=D6eSfkqHFtyskSvUFU=Qg358eTd+-SeNQ@mail.gmail.com","threadId":"50325","inReplyTo":null,"subject":"[PATCH 1/2] Add tests for describe with --work-tree","fromName":"Sebastian Staudt","fromEmail":"koraktor@gmail.com","sentAt":"2019-01-26T10:40:35Z","receivedAt":"2019-01-26T10:41:17Z","isPatch":true,"sender":{"key":"koraktor@gmail.com","avatar":"https://avatars.githubusercontent.com/u/66112?v=4"},"body":"The dirty ones are already passing, but just because describe is comparing\nwith the wrong working tree.\n\nSigned-off-by: Sebastian Staudt <koraktor@gmail.com>\n---\n t/t6120-describe.sh | 24 ++++++++++++++++++++++++\n 1 file changed, 24 insertions(+)\n\ndiff --git a/t/t6120-describe.sh b/t/t6120-describe.sh\nindex d639d94696..9a6bd1541f 100755\n--- a/t/t6120-describe.sh\n+++ b/t/t6120-describe.sh\n@@ -28,6 +28,24 @@ check_describe () {\n     '\n }\n\n+check_describe_worktree () {\n+  cd \"$TEST_DIRECTORY\"\n+    expect=\"$1\"\n+    shift\n+    R=$(git --git-dir \"$TRASH_DIRECTORY/.git\" --work-tree\n\"$TRASH_DIRECTORY\" describe \"$@\" 2>err.actual)\n+    S=$?\n+    cat err.actual >&3\n+    test_expect_success \"describe with --work-tree $*\" '\n+    test $S = 0 &&\n+    case \"$R\" in\n+    $expect)    echo happy ;;\n+    *)    echo \"Oops - $R is not $expect\";\n+        false ;;\n+    esac\n+    '\n+  cd \"$TRASH_DIRECTORY\"\n+}\n+\n test_expect_success setup '\n\n     test_tick &&\n@@ -145,14 +163,20 @@ check_describe A-* HEAD\n\n check_describe \"A-*[0-9a-f]\" --dirty\n\n+check_describe_worktree \"A-*[0-9a-f]\" --dirty\n+\n test_expect_success 'set-up dirty work tree' '\n     echo >>file\n '\n\n check_describe \"A-*[0-9a-f]-dirty\" --dirty\n\n+check_describe_worktree \"A-*[0-9a-f]-dirty\" --dirty\n+\n check_describe \"A-*[0-9a-f].mod\" --dirty=.mod\n\n+check_describe_worktree \"A-*[0-9a-f].mod\" --dirty=.mod\n+\n test_expect_success 'describe --dirty HEAD' '\n     test_must_fail git describe --dirty HEAD\n '\n--\n2.20.1\n"}]}