From ac1cd545050a4aaa61e5b3f1dda5e278ba5e40b1 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Mon, 17 Dec 2012 11:44:40 +0000 Subject: Drop committer info from git tag environment; update tag test outputs The committer information in the environment used to run git in morph tag is not needed. In morph build it makes sense as morph commits without the user knowing. With morph tag, it's the user that decides to create the commit and tag. There is something weird going on, where morph tag may end up generating commits with different SHA1s on different machines. The full log output in the morph tag tests might help investigate what happens. --- tests.branching/morph-tag-creates-commit-and-tag.script | 2 +- tests.branching/morph-tag-creates-commit-and-tag.stdout | 16 ++++++++++------ tests.branching/morph-tag-fails-if-tag-exists.stderr | 4 +--- tests.branching/morph-tag-tag-works-as-expected.script | 2 +- tests.branching/morph-tag-tag-works-as-expected.stdout | 16 ++++++++++------ .../morph-tag-works-with-multiple-morphs-repos.script | 2 +- .../morph-tag-works-with-multiple-morphs-repos.stdout | 10 ++++++---- 7 files changed, 30 insertions(+), 22 deletions(-) (limited to 'tests.branching') diff --git a/tests.branching/morph-tag-creates-commit-and-tag.script b/tests.branching/morph-tag-creates-commit-and-tag.script index cf53363a..e66d981f 100755 --- a/tests.branching/morph-tag-creates-commit-and-tag.script +++ b/tests.branching/morph-tag-creates-commit-and-tag.script @@ -36,4 +36,4 @@ cd "$DATADIR/workspace" # including that the commit and tag are created, that the commit message is # set correctly and that all references are petrified. "$SRCDIR/scripts/test-morph" foreach -- git show example-tag -"$SRCDIR/scripts/test-morph" foreach -- git log example-tag +"$SRCDIR/scripts/test-morph" foreach -- git log --format=fuller example-tag diff --git a/tests.branching/morph-tag-creates-commit-and-tag.stdout b/tests.branching/morph-tag-creates-commit-and-tag.stdout index 38bca41b..8c36ede3 100644 --- a/tests.branching/morph-tag-creates-commit-and-tag.stdout +++ b/tests.branching/morph-tag-creates-commit-and-tag.stdout @@ -5,7 +5,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Message -commit 7cab6b5f121518b3ecd585c4af3c5bc267947bae +commit 2f0a16ffe676335e6914f1c6117fc0cbe261eacf Author: developer Date: Tue Jul 31 16:51:54 2012 +0000 @@ -42,14 +42,18 @@ index f3f64b4..d26675d 100644 ] } test:morphs -commit 7cab6b5f121518b3ecd585c4af3c5bc267947bae -Author: developer -Date: Tue Jul 31 16:51:54 2012 +0000 +commit 2f0a16ffe676335e6914f1c6117fc0cbe261eacf +Author: developer +AuthorDate: Tue Jul 31 16:51:54 2012 +0000 +Commit: developer +CommitDate: Tue Jul 31 16:51:54 2012 +0000 Message commit 48d38ef3f39857d7dba4ed1ffc51653c6bed4906 -Author: developer -Date: Tue Jul 31 16:51:54 2012 +0000 +Author: developer +AuthorDate: Tue Jul 31 16:51:54 2012 +0000 +Commit: developer +CommitDate: Tue Jul 31 16:51:54 2012 +0000 initial diff --git a/tests.branching/morph-tag-fails-if-tag-exists.stderr b/tests.branching/morph-tag-fails-if-tag-exists.stderr index 66c71252..b774dfba 100644 --- a/tests.branching/morph-tag-fails-if-tag-exists.stderr +++ b/tests.branching/morph-tag-fails-if-tag-exists.stderr @@ -1,3 +1 @@ -ERROR: Command failed: git tag -a example-tag -m Second 70d7adfe89033309e0494efbe6df3e4a5604e558 -fatal: tag 'example-tag' already exists - +ERROR: test:morphs: Tag "example-tag" already exists diff --git a/tests.branching/morph-tag-tag-works-as-expected.script b/tests.branching/morph-tag-tag-works-as-expected.script index 04edf543..14c2ad3e 100755 --- a/tests.branching/morph-tag-tag-works-as-expected.script +++ b/tests.branching/morph-tag-tag-works-as-expected.script @@ -43,4 +43,4 @@ cd "$DATADIR/workspace" # List all tags and show the second one. "$SRCDIR/scripts/test-morph" foreach -- git tag -l "$SRCDIR/scripts/test-morph" foreach -- git show tagged-tag -"$SRCDIR/scripts/test-morph" foreach -- git log tagged-tag +"$SRCDIR/scripts/test-morph" foreach -- git log --format=fuller tagged-tag diff --git a/tests.branching/morph-tag-tag-works-as-expected.stdout b/tests.branching/morph-tag-tag-works-as-expected.stdout index 58d77714..ec12ba66 100644 --- a/tests.branching/morph-tag-tag-works-as-expected.stdout +++ b/tests.branching/morph-tag-tag-works-as-expected.stdout @@ -8,7 +8,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Second -commit f7f04d63ec5e494cf5b4fd2e94ad5f2f26265c3f +commit a96154002b3ffe71bd120e38682edbbe40b8453b Author: developer Date: Tue Jul 31 16:51:54 2012 +0000 @@ -45,14 +45,18 @@ index f3f64b4..2981e9b 100644 ] } test:morphs -commit f7f04d63ec5e494cf5b4fd2e94ad5f2f26265c3f -Author: developer -Date: Tue Jul 31 16:51:54 2012 +0000 +commit a96154002b3ffe71bd120e38682edbbe40b8453b +Author: developer +AuthorDate: Tue Jul 31 16:51:54 2012 +0000 +Commit: developer +CommitDate: Tue Jul 31 16:51:54 2012 +0000 Second commit 48d38ef3f39857d7dba4ed1ffc51653c6bed4906 -Author: developer -Date: Tue Jul 31 16:51:54 2012 +0000 +Author: developer +AuthorDate: Tue Jul 31 16:51:54 2012 +0000 +Commit: developer +CommitDate: Tue Jul 31 16:51:54 2012 +0000 initial diff --git a/tests.branching/morph-tag-works-with-multiple-morphs-repos.script b/tests.branching/morph-tag-works-with-multiple-morphs-repos.script index a5625fd4..c80c0564 100755 --- a/tests.branching/morph-tag-works-with-multiple-morphs-repos.script +++ b/tests.branching/morph-tag-works-with-multiple-morphs-repos.script @@ -120,4 +120,4 @@ cd "$DATADIR/workspace" GIT_DIR="$DATADIR/workspace/master/repos:morphs1/.git" \ git show tag-across-multiple-repos GIT_DIR="$DATADIR/workspace/master/repos:morphs1/.git" \ - git log -n1 -p --stat tag-across-multiple-repos + git log --format=fuller -n1 -p --stat tag-across-multiple-repos diff --git a/tests.branching/morph-tag-works-with-multiple-morphs-repos.stdout b/tests.branching/morph-tag-works-with-multiple-morphs-repos.stdout index 91b36f99..98be9086 100644 --- a/tests.branching/morph-tag-works-with-multiple-morphs-repos.stdout +++ b/tests.branching/morph-tag-works-with-multiple-morphs-repos.stdout @@ -14,7 +14,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 create tag -commit 8fe8196c4eb87e5967d7b08eb8da9d7d0764c25d +commit ddcf257bd01b46424dc570e72aa8946b6dfdbc5f Author: developer Date: Tue Jul 31 16:51:54 2012 +0000 @@ -89,9 +89,11 @@ index 27806c1..c5e4d98 100644 } ] } -commit 8fe8196c4eb87e5967d7b08eb8da9d7d0764c25d -Author: developer -Date: Tue Jul 31 16:51:54 2012 +0000 +commit ddcf257bd01b46424dc570e72aa8946b6dfdbc5f +Author: developer +AuthorDate: Tue Jul 31 16:51:54 2012 +0000 +Commit: developer +CommitDate: Tue Jul 31 16:51:54 2012 +0000 create tag --- -- cgit v1.2.1