jn/shortlog (Re: What's cooking in git.git (May 2010, #01; Sun, 2))

From

Jonathan Nieder <jrnieder@gmail.com>

Date

May 4, 2010, 00:25 UTC

Message-ID

<20100504002526.GA7061@progeny.tock>

In-Reply-To

<1272912875.3537.6.camel@dreddbeard>

Hi,

Will Palmer wrote:

> Junio C Hamano wrote:

>> * jn/shortlog (2010-04-26) 4 commits
>>  . pretty: Respect --abbrev option
>>  . shortlog: Document and test --format option
>>  . t4201 (shortlog): Test output format with multiple authors
>>  . t4201 (shortlog): guard setup with test_expect_success
>> 
>> This seems to cause intermittent test failure for me especially when run
>> under "make -j4".
>> 
>> * wp/pretty-enhancement (2010-04-30) 5 commits

[...]

> Does it still happen with the latest (3-commit) series?

I think it was the shortlog tests series[1].

> Haven't been able to reproduce here (just running make -m4 in a
> while-loop all night) Any specific tests failing?

In t4201-shortlog.sh:

@@ -1,10 +0,0 @@
-A U Thor (5):
-      SUBJECT
-      SUBJECT
-      SUBJECT
-      SUBJECT
-      SUBJECT
-
-Someone else (1):
-      SUBJECT
-

* FAIL 2: default output format

		git shortlog >log &&
		fuzz log >log.predictable &&
		test_cmp expect.template log.predictable

--- expect      2010-05-04 00:17:41.625754445 +0000
+++ log.predictable     2010-05-04 00:17:41.629754567 +0000
@@ -1,10 +0,0 @@
-A U Thor (5):
-      OBJECT_NAME
-      OBJECT_NAME
-      OBJECT_NAME
-      OBJECT_NAME
-      OBJECT_NAME
-
-Someone else (1):
-      OBJECT_NAME
-

* FAIL 3: pretty format

	sed s/SUBJECT/OBJID/ expect.template >expect &&
	git shortlog --format="%h" --abbrev=5 >log &&
	fuzz log >log.predictable &&
	test_cmp expect log.predictable

--- expect      2010-05-04 00:17:41.637754532 +0000
+++ log.predictable     2010-05-04 00:17:41.645754776 +0000
@@ -1,10 +0,0 @@
-A U Thor (5):
-      OBJID
-      OBJID
-      OBJID
-      OBJID
-      OBJID
-
-Someone else (1):
-      OBJID
-
* FAIL 4: --abbrev

		sed s/SUBJECT/OBJID/ expect.template >expect &&
		git shortlog --format="%h" --abbrev=5 >log &&
		fuzz log >log.predictable &&
		test_cmp expect log.predictable

--- expect      2010-05-04 00:17:41.657754653 +0000
+++ log.predictable     2010-05-04 00:17:41.661754495 +0000
@@ -1,10 +0,0 @@
-A U Thor (5):
-      two lines
-      two lines
-      two lines
-      two lines
-      two lines
-
-Someone else (1):
-      two lines
-

* FAIL 5: output from user-defined format is re-wrapped
        
		sed "s/SUBJECT/two lines/" expect.template >expect &&
		git shortlog --format="two%nlines" >log &&
		fuzz log >log.predictable &&
		test_cmp expect log.predictable

Jonathan

[1] http://thread.gmane.org/gmane.comp.version-control.git/145769/focus=145801