{"thread":{"id":"13172","subject":"[PATCH 3/1] Add tests for `branch --[no-]merged`","startedAt":"2008-04-18T16:30:15Z","lastAt":"2008-04-18T16:30:15Z","messageCount":1,"participants":["Lars Hjemli"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"74726","messageId":"1208536215-11921-1-git-send-email-hjemli@gmail.com","threadId":"13172","inReplyTo":null,"subject":"[PATCH 3/1] Add tests for `branch --[no-]merged`","fromName":"Lars Hjemli","fromEmail":"hjemli@gmail.com","sentAt":"2008-04-18T16:30:15Z","receivedAt":"2008-04-18T16:30:15Z","isPatch":true,"sender":{"key":"hjemli@gmail.com","avatar":null},"body":"Signed-off-by: Lars Hjemli <hjemli@gmail.com>\n---\n\nA bit late, but here's a testscript for the new options (shamelessly based\non t3201).\n\n t/t3202-branch-merged.sh |   68 ++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 68 insertions(+), 0 deletions(-)\n create mode 100755 t/t3202-branch-merged.sh\n\ndiff --git a/t/t3202-branch-merged.sh b/t/t3202-branch-merged.sh\nnew file mode 100755\nindex 0000000..2710923\n--- /dev/null\n+++ b/t/t3202-branch-merged.sh\n@@ -0,0 +1,68 @@\n+#!/bin/sh\n+\n+test_description='branch --merged/--no-merged'\n+\n+. ./test-lib.sh\n+\n+test_expect_success setup '\n+\n+\t>file &&\n+\tgit add file &&\n+\ttest_tick &&\n+\tgit commit -m initial &&\n+\tgit branch side &&\n+\n+\techo 1 >file &&\n+\ttest_tick &&\n+\tgit commit -a -m \"second on master\" &&\n+\n+\tgit checkout side &&\n+\techo 1 >file &&\n+\ttest_tick &&\n+\tgit commit -a -m \"second on side\" &&\n+\n+\tgit merge master\n+\n+'\n+\n+test_expect_success 'side: branch --merged' '\n+\n+\tgit branch --merged >actual &&\n+\t{\n+\t\techo \"  master\" &&\n+\t\techo \"* side\"\n+\t} >expect &&\n+\ttest_cmp expect actual\n+\n+'\n+\n+test_expect_success 'side: branch --no-merged' '\n+\n+\tgit branch --no-merged >actual &&\n+\t>expect &&\n+\ttest_cmp expect actual\n+\n+'\n+\n+test_expect_success 'master: branch --merged' '\n+\n+\tgit checkout master &&\n+\tgit branch --merged >actual &&\n+\t{\n+\t\techo \"* master\"\n+\t} >expect &&\n+\ttest_cmp expect actual\n+\n+'\n+\n+test_expect_success 'master: branch --no-merged' '\n+\n+\tgit branch --no-merged >actual &&\n+\t{\n+\t\techo \"  side\"\n+\t} >expect &&\n+\ttest_cmp expect actual\n+\n+'\n+\n+test_done\n-- \n1.5.5.74.g74a72\n"}]}