From: Koosha Khajehmoogahi Date: Mon, 13 Apr 2015 15:29:27 GMT Subject: [PATCH v3 4/5] t4202-log: add tests for --merges= Message-ID: <1428938968-19013-4-git-send-email-koosha@posteo.de> In-Reply-To: <1428938968-19013-1-git-send-email-koosha@posteo.de> From: Eric Sunshine Signed-off-by: Koosha Khajehmoogahi --- t/t4202-log.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 1b2e981..3edcd81 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -270,6 +270,35 @@ cat > expect <<\EOF * initial EOF +test_expect_success 'setup merges=' ' + git log --min-parents=2 --pretty=tformat:%s >expect_only && + git log --max-parents=1 --pretty=tformat:%s >expect_hide && + git log --min-parents=-1 --pretty=tformat:%s >expect_show +' + +test_log_merges() { + expect=expect_$1 + config=${2:+-c log.merges=$2} + option=${3:+--merges=$3} + option=${4:-$option} + test_expect_success "merges${config:+ $config}${option:+ $option}" " + git $config log $option --pretty=tformat:%s >actual && + test_cmp $expect actual + " +} + +states="show only hide" +for c in '' $states +do + for o in '' $states + do + test_log_merges ${o:-${c:-show}} "$c" "$o" + done +done + +test_log_merges hide show '' --no-merges +test_log_merges only hide '' '--merges --max-parents=2' + test_expect_success 'log --graph with merge' ' git log --graph --date-order --pretty=tformat:%s | sed "s/ *\$//" >actual && -- 2.3.3.263.g095251d.dirty