Merge branch 'cc/pretty-contents-size' into master

gitster · gitster · commit 4083971673cc · 2020-08-01T13:49:14.000-07:00
Brown-paper-bag fix.

* cc/pretty-contents-size:
  t6300: fix issues related to %(contents:size)
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
@@ -66,9 +66,9 @@ test_atom() {
 		esac
 		# Leave $expect unquoted to lose possible leading whitespaces
 		echo $expect >expected
-		test_expect_${4:-sucess} $PREREQ "basic atom: $1 contents:size" '
+		test_expect_${4:-success} $PREREQ "basic atom: $1 contents:size" '
 			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
-			test_cmp expect actual
+			test_cmp expected actual
 		'
 	fi
 }

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ test_atom() {`
`66`	`66`	`esac`
`67`	`67`	`# Leave $expect unquoted to lose possible leading whitespaces`
`68`	`68`	`echo $expect >expected`
`69`		`- test_expect_${4:-sucess} $PREREQ "basic atom: $1 contents:size" '`
	`69`	`+ test_expect_${4:-success} $PREREQ "basic atom: $1 contents:size" '`
`70`	`70`	`git for-each-ref --format="%(contents:size)" "$ref" >actual &&`
`71`		`- test_cmp expect actual`
	`71`	`+ test_cmp expected actual`
`72`	`72`	`'`
`73`	`73`	`fi`
`74`	`74`	`}`