components/developer/git/patches/0015-test-grep-null-RE.patch

   1 https://www.illumos.org/issues/16561
   2 https://lore.kernel.org/git/ZkeJx97qdLoaC2H-@telcontar/
   3
   4 --- git-2.45.1/t/t4150-am.sh.orig
   5 +++ git-2.45.1/t/t4150-am.sh
   6 @@ -1218,7 +1218,7 @@
   7         test_path_is_missing .git/rebase-apply &&
   8         git show empty-commit --format="%B" >expected &&
   9         git show HEAD --format="%B" >actual &&
  10 -       grep -f actual expected &&
  11 +       ggrep -f actual expected &&
  12         grep "Creating an empty commit: empty commit" output
  13  '
  14
  15 @@ -1244,7 +1244,7 @@
  16         test_path_is_missing .git/rebase-apply &&
  17         git show empty-commit --format="%B" >expected &&
  18         git show HEAD --format="%B" >actual &&
  19 -       grep -f actual expected
  20 +       ggrep -f actual expected
  21  '
  22
  23  test_expect_success 'create an non-empty commit when the index IS changed though "--allow-empty" is given' '
  24 @@ -1255,7 +1255,7 @@
  25         git am --allow-empty &&
  26         git show empty-commit --format="%B" >expected &&
  27         git show HEAD --format="%B" >actual &&
  28 -       grep -f actual expected &&
  29 +       ggrep -f actual expected &&
  30         git diff HEAD^..HEAD --name-only
  31  '
  32