diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t6006-rev-list-format.sh | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t6006-rev-list-format.sh')
| -rwxr-xr-x | third_party/git/t/t6006-rev-list-format.sh | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/third_party/git/t/t6006-rev-list-format.sh b/third_party/git/t/t6006-rev-list-format.sh index 7e82e43a63..da113d975b 100755 --- a/third_party/git/t/t6006-rev-list-format.sh +++ b/third_party/git/t/t6006-rev-list-format.sh @@ -32,7 +32,6 @@ changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t $test_encoding) truncate_count=20 test_expect_success 'setup' ' - test_oid_init && : >foo && git add foo && git config i18n.commitEncoding $test_encoding && @@ -110,35 +109,31 @@ commit $head1 EOF # we don't test relative here -test_format author %an%n%ae%n%al%n%ad%n%aD%n%at <<EOF +test_format author %an%n%ae%n%ad%n%aD%n%at <<EOF commit $head2 -$GIT_AUTHOR_NAME -$GIT_AUTHOR_EMAIL -$TEST_AUTHOR_LOCALNAME +A U Thor +author@example.com Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 commit $head1 -$GIT_AUTHOR_NAME -$GIT_AUTHOR_EMAIL -$TEST_AUTHOR_LOCALNAME +A U Thor +author@example.com Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 EOF -test_format committer %cn%n%ce%n%cl%n%cd%n%cD%n%ct <<EOF +test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<EOF commit $head2 -$GIT_COMMITTER_NAME -$GIT_COMMITTER_EMAIL -$TEST_COMMITTER_LOCALNAME +C O Mitter +committer@example.com Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 commit $head1 -$GIT_COMMITTER_NAME -$GIT_COMMITTER_EMAIL -$TEST_COMMITTER_LOCALNAME +C O Mitter +committer@example.com Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 @@ -415,7 +410,7 @@ test_expect_success 'empty email' ' test_tick && C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) && A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) && - verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700" + verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" ' test_expect_success 'del LF before empty (1)' ' @@ -464,10 +459,9 @@ test_expect_success '--abbrev' ' ' test_expect_success '%H is not affected by --abbrev-commit' ' - expected=$(($(test_oid hexsz) + 1)) && git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual && len=$(wc -c <actual) && - test $len = $expected + test $len = 41 ' test_expect_success '%h is not affected by --abbrev-commit' ' @@ -501,14 +495,15 @@ test_expect_success '%gd shortens ref name' ' ' test_expect_success 'reflog identity' ' - echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect && + echo "C O Mitter:committer@example.com" >expect && git log -g -1 --format="%gn:%ge" >actual && test_cmp expect actual ' test_expect_success 'oneline with empty message' ' - git commit --allow-empty --cleanup=verbatim -m "$LF" && - git commit --allow-empty --allow-empty-message && + git commit -m "dummy" --allow-empty && + git commit -m "dummy" --allow-empty && + git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. && git rev-list --oneline HEAD >test.txt && test_line_count = 5 test.txt && git rev-list --oneline --graph HEAD >testg.txt && |