mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-06 17:23:00 +01:00

108 lines

2.2 KiB

Bash

Raw Normal View History

add tests for various blame formats We don't seem to have any tests for "blame --porcelain". Let's at least do a trivial test on a simple example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-09 15:33:30 +02:00			`#!/bin/sh`

			`test_description='blame output in various formats on a simple case'`
			`. ./test-lib.sh`

			`test_expect_success 'setup' '`
			`echo a >file &&`
t: fix trivial &&-chain breakage These are tests which are missing a link in their &&-chain, but during a setup phase. We may fail to notice failure in commands that build the test environment, but these are typically not expected to fail at all (but it's still good to double-check that our test environment is what we expect). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-03-20 11:07:15 +01:00			`git add file &&`
add tests for various blame formats We don't seem to have any tests for "blame --porcelain". Let's at least do a trivial test on a simple example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-09 15:33:30 +02:00			`test_tick &&`
			`git commit -m one &&`
			`echo b >>file &&`
			`echo c >>file &&`
			`echo d >>file &&`
			`test_tick &&`
			`git commit -a -m two`
			`'`

			`cat >expect <<'EOF'`
			`^baf5e0b (A U Thor 2005-04-07 15:13:13 -0700 1) a`
			`8825379d (A U Thor 2005-04-07 15:14:13 -0700 2) b`
			`8825379d (A U Thor 2005-04-07 15:14:13 -0700 3) c`
			`8825379d (A U Thor 2005-04-07 15:14:13 -0700 4) d`
			`EOF`
			`test_expect_success 'normal blame output' '`
			`git blame file >actual &&`
			`test_cmp expect actual`
			`'`

			`ID1=baf5e0b3869e0b2b2beb395a3720c7b51eac94fc`
			`COMMIT1='author A U Thor`
			`author-mail <author@example.com>`
			`author-time 1112911993`
			`author-tz -0700`
			`committer C O Mitter`
			`committer-mail <committer@example.com>`
			`committer-time 1112911993`
			`committer-tz -0700`
			`summary one`
			`boundary`
			`filename file'`
			`ID2=8825379dfb8a1267b58e8e5bcf69eec838f685ec`
			`COMMIT2='author A U Thor`
			`author-mail <author@example.com>`
			`author-time 1112912053`
			`author-tz -0700`
			`committer C O Mitter`
			`committer-mail <committer@example.com>`
			`committer-time 1112912053`
			`committer-tz -0700`
			`summary two`
			`previous baf5e0b3869e0b2b2beb395a3720c7b51eac94fc file`
			`filename file'`

			`cat >expect <<EOF`
			`$ID1 1 1 1`
			`$COMMIT1`
			`a`
			`$ID2 2 2 3`
			`$COMMIT2`
			`b`
			`$ID2 3 3`
			`c`
			`$ID2 4 4`
			`d`
			`EOF`
			`test_expect_success 'blame --porcelain output' '`
			`git blame --porcelain file >actual &&`
			`test_cmp expect actual`
			`'`

blame: add --line-porcelain output format This is just like --porcelain, except that we always output the commit information for each line, not just the first time it is referenced. This can make quick and dirty scripts much easier to write; see the example added to the blame documentation. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-09 15:34:42 +02:00			`cat >expect <<EOF`
			`$ID1 1 1 1`
			`$COMMIT1`
			`a`
			`$ID2 2 2 3`
			`$COMMIT2`
			`b`
			`$ID2 3 3`
			`$COMMIT2`
			`c`
			`$ID2 4 4`
			`$COMMIT2`
			`d`
			`EOF`
			`test_expect_success 'blame --line-porcelain output' '`
			`git blame --line-porcelain file >actual &&`
			`test_cmp expect actual`
			`'`

commit.c: make find_commit_subject() more robust Just like the pretty printing machinery, we should simply ignore blank lines at the beginning of the commit messages. This discrepancy was noticed when an early version of the rebase--helper produced commit objects with more than one empty line between the header and the commit message. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2016-06-22 22:20:20 +02:00			`test_expect_success '--porcelain detects first non-blank line as subject' '`
			`(`
			`GIT_INDEX_FILE=.git/tmp-index &&`
			`export GIT_INDEX_FILE &&`
			`echo "This is it" >single-file &&`
			`git add single-file &&`
			`tree=$(git write-tree) &&`
			`commit=$(printf "%s\n%s\n%s\n\n\n \noneline\n\nbody\n" \`
			`"tree $tree" \`
			`"author A <a@b.c> 123456789 +0000" \`
			`"committer C <c@d.e> 123456789 +0000" \|`
			`git hash-object -w -t commit --stdin) &&`
			`git blame --porcelain $commit -- single-file >output &&`
			`grep "^summary oneline$" output`
			`)`
			`'`

add tests for various blame formats We don't seem to have any tests for "blame --porcelain". Let's at least do a trivial test on a simple example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-09 15:33:30 +02:00			`test_done`