]> Pileus Git - ~andy/git/commitdiff
Merge branch 'nd/diffstat-gramnum'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:43:19 +0000 (22:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:43:19 +0000 (22:43 -0800)
* nd/diffstat-gramnum:
  Use correct grammar in diffstat summary line

1  2 
t/t5150-request-pull.sh

diff --combined t/t5150-request-pull.sh
index 7c1dc641dec809fe314dcba7a4946154e8422f9b,ec5f7368f9e492ef2926b95243a393798ab4de4a..2af8947eebb3e9ee45f83acb398335ec163a521c
@@@ -95,7 -95,7 +95,7 @@@ test_expect_success 'setup: two script
        b
        : diffstat
        n
-       / [0-9]* files changed/ {
+       / [0-9]* files* changed/ {
                a\\
        DIFFSTAT
                b
@@@ -179,7 -179,11 +179,7 @@@ test_expect_success 'request names an a
                read repository &&
                read branch
        } <digest &&
 -      {
 -              test "$branch" = full ||
 -              test "$branch" = master ||
 -              test "$branch" = for-upstream
 -      }
 +      test "$branch" = tags/full
  
  '