t/t4014-format-patch.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Junio C Hamano
   4 #
   5
   6 test_description='Format-patch skipping already incorporated patches'
   7
   8 . ./test-lib.sh
   9
  10 test_expect_success setup '
  11
  12         for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
  13         cat file >elif &&
  14         git add file elif &&
  15         git commit -m Initial &&
  16         git checkout -b side &&
  17
  18         for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
  19         chmod +x elif &&
  20         git update-index file elif &&
  21         git update-index --chmod=+x elif &&
  22         git commit -m "Side changes #1" &&
  23
  24         for i in D E F; do echo "$i"; done >>file &&
  25         git update-index file &&
  26         git commit -m "Side changes #2" &&
  27         git tag C2 &&
  28
  29         for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
  30         git update-index file &&
  31         git commit -m "Side changes #3 with \\n backslash-n in it." &&
  32
  33         git checkout master &&
  34         git diff-tree -p C2 | git apply --index &&
  35         git commit -m "Master accepts moral equivalent of #2"
  36
  37 '
  38
  39 test_expect_success "format-patch --ignore-if-in-upstream" '
  40
  41         git format-patch --stdout master..side >patch0 &&
  42         cnt=`grep "^From " patch0 | wc -l` &&
  43         test $cnt = 3
  44
  45 '
  46
  47 test_expect_success "format-patch --ignore-if-in-upstream" '
  48
  49         git format-patch --stdout \
  50                 --ignore-if-in-upstream master..side >patch1 &&
  51         cnt=`grep "^From " patch1 | wc -l` &&
  52         test $cnt = 2
  53
  54 '
  55
  56 test_expect_success "format-patch result applies" '
  57
  58         git checkout -b rebuild-0 master &&
  59         git am -3 patch0 &&
  60         cnt=`git rev-list master.. | wc -l` &&
  61         test $cnt = 2
  62 '
  63
  64 test_expect_success "format-patch --ignore-if-in-upstream result applies" '
  65
  66         git checkout -b rebuild-1 master &&
  67         git am -3 patch1 &&
  68         cnt=`git rev-list master.. | wc -l` &&
  69         test $cnt = 2
  70 '
  71
  72 test_expect_success 'commit did not screw up the log message' '
  73
  74         git cat-file commit side | grep "^Side .* with .* backslash-n"
  75
  76 '
  77
  78 test_expect_success 'format-patch did not screw up the log message' '
  79
  80         grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
  81         grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
  82
  83 '
  84
  85 test_expect_success 'replay did not screw up the log message' '
  86
  87         git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
  88
  89 '
  90
  91 test_expect_success 'extra headers' '
  92
  93         git config format.headers "To: R. E. Cipient <rcipient@example.com>
  94 " &&
  95         git config --add format.headers "Cc: S. E. Cipient <scipient@example.com>
  96 " &&
  97         git format-patch --stdout master..side > patch2 &&
  98         sed -e "/^$/Q" patch2 > hdrs2 &&
  99         grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs2 &&
 100         grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs2
 101
 102 '
 103
 104 test_expect_failure 'extra headers without newlines' '
 105
 106         git config --replace-all format.headers "To: R. E. Cipient <rcipient@example.com>" &&
 107         git config --add format.headers "Cc: S. E. Cipient <scipient@example.com>" &&
 108         git format-patch --stdout master..side >patch3 &&
 109         sed -e "/^$/Q" patch3 > hdrs3 &&
 110         grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs3 &&
 111         grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs3
 112
 113 '
 114
 115 test_expect_failure 'extra headers with multiple To:s' '
 116
 117         git config --replace-all format.headers "To: R. E. Cipient <rcipient@example.com>" &&
 118         git config --add format.headers "To: S. E. Cipient <scipient@example.com>" &&
 119         git format-patch --stdout master..side > patch4 &&
 120         sed -e "/^$/Q" patch4 > hdrs4 &&
 121         grep "^To: R. E. Cipient <rcipient@example.com>,$" hdrs4 &&
 122         grep "^ *S. E. Cipient <scipient@example.com>$" hdrs4
 123 '
 124
 125 test_expect_success 'multiple files' '
 126
 127         rm -rf patches/ &&
 128         git checkout side &&
 129         git format-patch -o patches/ master &&
 130         ls patches/0001-Side-changes-1.patch patches/0002-Side-changes-2.patch patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
 131 '
 132
 133 test_expect_success 'thread' '
 134
 135         rm -rf patches/ &&
 136         git checkout side &&
 137         git format-patch --thread -o patches/ master &&
 138         FIRST_MID=$(grep "Message-Id:" patches/0001-* | sed "s/^[^<]*\(<[^>]*>\).*$/\1/") &&
 139         for i in patches/0002-* patches/0003-*
 140         do
 141           grep "References: $FIRST_MID" $i &&
 142           grep "In-Reply-To: $FIRST_MID" $i
 143         done
 144 '
 145
 146 test_expect_success 'thread in-reply-to' '
 147
 148         rm -rf patches/ &&
 149         git checkout side &&
 150         git format-patch --in-reply-to="<test.message>" --thread -o patches/ master &&
 151         FIRST_MID="<test.message>" &&
 152         for i in patches/*
 153         do
 154           grep "References: $FIRST_MID" $i &&
 155           grep "In-Reply-To: $FIRST_MID" $i
 156         done
 157 '
 158
 159 test_expect_success 'thread cover-letter' '
 160
 161         rm -rf patches/ &&
 162         git checkout side &&
 163         git format-patch --cover-letter --thread -o patches/ master &&
 164         FIRST_MID=$(grep "Message-Id:" patches/0000-* | sed "s/^[^<]*\(<[^>]*>\).*$/\1/") &&
 165         for i in patches/0001-* patches/0002-* patches/0003-*
 166         do
 167           grep "References: $FIRST_MID" $i &&
 168           grep "In-Reply-To: $FIRST_MID" $i
 169         done
 170 '
 171
 172 test_expect_success 'thread cover-letter in-reply-to' '
 173
 174         rm -rf patches/ &&
 175         git checkout side &&
 176         git format-patch --cover-letter --in-reply-to="<test.message>" --thread -o patches/ master &&
 177         FIRST_MID="<test.message>" &&
 178         for i in patches/*
 179         do
 180           grep "References: $FIRST_MID" $i &&
 181           grep "In-Reply-To: $FIRST_MID" $i
 182         done
 183 '
 184
 185 test_expect_success 'excessive subject' '
 186
 187         rm -rf patches/ &&
 188         git checkout side &&
 189         for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >>file &&
 190         git update-index file &&
 191         git commit -m "This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
 192         git format-patch -o patches/ master..side &&
 193         ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
 194 '
 195
 196 test_done