Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2006, Junio C Hamano |
| 4 | # |
| 5 | |
| 6 | test_description='fmt-merge-msg test' |
| 7 | |
| 8 | . ./test-lib.sh |
| 9 | |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 10 | test_expect_success setup ' |
| 11 | echo one >one && |
| 12 | git add one && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 13 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 14 | git commit -m "Initial" && |
| 15 | |
Stephen Boyd | 419fe5b | 2010-03-24 00:15:58 -0700 | [diff] [blame] | 16 | git clone . remote && |
| 17 | |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 18 | echo uno >one && |
| 19 | echo dos >two && |
| 20 | git add two && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 21 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 22 | git commit -a -m "Second" && |
| 23 | |
| 24 | git checkout -b left && |
| 25 | |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 26 | echo "c1" >one && |
| 27 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 28 | git commit -a -m "Common #1" && |
| 29 | |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 30 | echo "c2" >one && |
| 31 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 32 | git commit -a -m "Common #2" && |
| 33 | |
| 34 | git branch right && |
| 35 | |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 36 | echo "l3" >two && |
| 37 | test_tick && |
Junio C Hamano | 418a143 | 2012-03-13 10:00:00 -0700 | [diff] [blame] | 38 | GIT_COMMITTER_NAME="Another Committer" \ |
| 39 | GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #3" && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 40 | |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 41 | echo "l4" >two && |
| 42 | test_tick && |
Junio C Hamano | 418a143 | 2012-03-13 10:00:00 -0700 | [diff] [blame] | 43 | GIT_COMMITTER_NAME="Another Committer" \ |
| 44 | GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #4" && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 45 | |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 46 | echo "l5" >two && |
| 47 | test_tick && |
Junio C Hamano | 418a143 | 2012-03-13 10:00:00 -0700 | [diff] [blame] | 48 | GIT_COMMITTER_NAME="Another Committer" \ |
| 49 | GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #5" && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 50 | git tag tag-l5 && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 51 | |
| 52 | git checkout right && |
| 53 | |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 54 | echo "r3" >three && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 55 | git add three && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 56 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 57 | git commit -a -m "Right #3" && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 58 | git tag tag-r3 && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 59 | |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 60 | echo "r4" >three && |
| 61 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 62 | git commit -a -m "Right #4" && |
| 63 | |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 64 | echo "r5" >three && |
| 65 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 66 | git commit -a -m "Right #5" && |
| 67 | |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 68 | git checkout -b long && |
| 69 | i=0 && |
| 70 | while test $i -lt 30 |
| 71 | do |
| 72 | test_commit $i one && |
| 73 | i=$(($i+1)) |
| 74 | done && |
| 75 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 76 | git show-branch && |
| 77 | |
| 78 | apos="'\''" |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 79 | ' |
| 80 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 81 | test_expect_success 'message for merging local branch' ' |
| 82 | echo "Merge branch ${apos}left${apos}" >expected && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 83 | |
| 84 | git checkout master && |
| 85 | git fetch . left && |
| 86 | |
| 87 | git fmt-merge-msg <.git/FETCH_HEAD >actual && |
Junio C Hamano | 3af8286 | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 88 | test_cmp expected actual |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 89 | ' |
| 90 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 91 | test_expect_success 'message for merging external branch' ' |
| 92 | echo "Merge branch ${apos}left${apos} of $(pwd)" >expected && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 93 | |
| 94 | git checkout master && |
Johannes Sixt | 4114156 | 2009-03-13 23:35:24 +0100 | [diff] [blame] | 95 | git fetch "$(pwd)" left && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 96 | |
| 97 | git fmt-merge-msg <.git/FETCH_HEAD >actual && |
Junio C Hamano | 3af8286 | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 98 | test_cmp expected actual |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 99 | ' |
| 100 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 101 | test_expect_success '[merge] summary/log configuration' ' |
| 102 | cat >expected <<-EOF && |
| 103 | Merge branch ${apos}left${apos} |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 104 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 105 | # By Another Author (3) and A U Thor (2) |
| 106 | # Via Another Committer |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 107 | * left: |
| 108 | Left #5 |
| 109 | Left #4 |
| 110 | Left #3 |
| 111 | Common #2 |
| 112 | Common #1 |
| 113 | EOF |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 114 | |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 115 | git config merge.log true && |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 116 | test_might_fail git config --unset-all merge.summary && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 117 | |
| 118 | git checkout master && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 119 | test_tick && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 120 | git fetch . left && |
| 121 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 122 | git fmt-merge-msg <.git/FETCH_HEAD >actual1 && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 123 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 124 | test_might_fail git config --unset-all merge.log && |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 125 | git config merge.summary true && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 126 | |
| 127 | git checkout master && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 128 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 129 | git fetch . left && |
| 130 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 131 | git fmt-merge-msg <.git/FETCH_HEAD >actual2 && |
| 132 | |
| 133 | test_cmp expected actual1 && |
| 134 | test_cmp expected actual2 |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 135 | ' |
| 136 | |
Ramkumar Ramachandra | b928cbf | 2010-09-08 23:29:56 +0530 | [diff] [blame] | 137 | test_expect_success 'setup: clear [merge] configuration' ' |
| 138 | test_might_fail git config --unset-all merge.log && |
| 139 | test_might_fail git config --unset-all merge.summary |
| 140 | ' |
| 141 | |
| 142 | test_expect_success 'setup FETCH_HEAD' ' |
| 143 | git checkout master && |
| 144 | test_tick && |
| 145 | git fetch . left |
| 146 | ' |
| 147 | |
| 148 | test_expect_success 'merge.log=3 limits shortlog length' ' |
| 149 | cat >expected <<-EOF && |
| 150 | Merge branch ${apos}left${apos} |
| 151 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 152 | # By Another Author (3) and A U Thor (2) |
| 153 | # Via Another Committer |
Ramkumar Ramachandra | b928cbf | 2010-09-08 23:29:56 +0530 | [diff] [blame] | 154 | * left: (5 commits) |
| 155 | Left #5 |
| 156 | Left #4 |
| 157 | Left #3 |
| 158 | ... |
| 159 | EOF |
| 160 | |
| 161 | git -c merge.log=3 fmt-merge-msg <.git/FETCH_HEAD >actual && |
| 162 | test_cmp expected actual |
| 163 | ' |
| 164 | |
| 165 | test_expect_success 'merge.log=5 shows all 5 commits' ' |
| 166 | cat >expected <<-EOF && |
| 167 | Merge branch ${apos}left${apos} |
| 168 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 169 | # By Another Author (3) and A U Thor (2) |
| 170 | # Via Another Committer |
Ramkumar Ramachandra | b928cbf | 2010-09-08 23:29:56 +0530 | [diff] [blame] | 171 | * left: |
| 172 | Left #5 |
| 173 | Left #4 |
| 174 | Left #3 |
| 175 | Common #2 |
| 176 | Common #1 |
| 177 | EOF |
| 178 | |
| 179 | git -c merge.log=5 fmt-merge-msg <.git/FETCH_HEAD >actual && |
| 180 | test_cmp expected actual |
| 181 | ' |
| 182 | |
| 183 | test_expect_success 'merge.log=0 disables shortlog' ' |
| 184 | echo "Merge branch ${apos}left${apos}" >expected |
| 185 | git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual && |
| 186 | test_cmp expected actual |
| 187 | ' |
| 188 | |
Ramkumar Ramachandra | bd2549c | 2010-09-08 23:29:57 +0530 | [diff] [blame] | 189 | test_expect_success '--log=3 limits shortlog length' ' |
| 190 | cat >expected <<-EOF && |
| 191 | Merge branch ${apos}left${apos} |
| 192 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 193 | # By Another Author (3) and A U Thor (2) |
| 194 | # Via Another Committer |
Ramkumar Ramachandra | bd2549c | 2010-09-08 23:29:57 +0530 | [diff] [blame] | 195 | * left: (5 commits) |
| 196 | Left #5 |
| 197 | Left #4 |
| 198 | Left #3 |
| 199 | ... |
| 200 | EOF |
| 201 | |
| 202 | git fmt-merge-msg --log=3 <.git/FETCH_HEAD >actual && |
| 203 | test_cmp expected actual |
| 204 | ' |
| 205 | |
| 206 | test_expect_success '--log=5 shows all 5 commits' ' |
| 207 | cat >expected <<-EOF && |
| 208 | Merge branch ${apos}left${apos} |
| 209 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 210 | # By Another Author (3) and A U Thor (2) |
| 211 | # Via Another Committer |
Ramkumar Ramachandra | bd2549c | 2010-09-08 23:29:57 +0530 | [diff] [blame] | 212 | * left: |
| 213 | Left #5 |
| 214 | Left #4 |
| 215 | Left #3 |
| 216 | Common #2 |
| 217 | Common #1 |
| 218 | EOF |
| 219 | |
| 220 | git fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual && |
| 221 | test_cmp expected actual |
| 222 | ' |
| 223 | |
| 224 | test_expect_success '--no-log disables shortlog' ' |
| 225 | echo "Merge branch ${apos}left${apos}" >expected && |
| 226 | git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual && |
| 227 | test_cmp expected actual |
| 228 | ' |
| 229 | |
| 230 | test_expect_success '--log=0 disables shortlog' ' |
| 231 | echo "Merge branch ${apos}left${apos}" >expected && |
| 232 | git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual && |
| 233 | test_cmp expected actual |
| 234 | ' |
| 235 | |
Jonathan Nieder | 2102440 | 2010-08-17 18:00:34 -0500 | [diff] [blame] | 236 | test_expect_success 'fmt-merge-msg -m' ' |
| 237 | echo "Sync with left" >expected && |
| 238 | cat >expected.log <<-EOF && |
| 239 | Sync with left |
| 240 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 241 | # By Another Author (3) and A U Thor (2) |
| 242 | # Via Another Committer |
Jonathan Nieder | 2102440 | 2010-08-17 18:00:34 -0500 | [diff] [blame] | 243 | * ${apos}left${apos} of $(pwd): |
| 244 | Left #5 |
| 245 | Left #4 |
| 246 | Left #3 |
| 247 | Common #2 |
| 248 | Common #1 |
| 249 | EOF |
| 250 | |
| 251 | test_might_fail git config --unset merge.log && |
| 252 | test_might_fail git config --unset merge.summary && |
| 253 | git checkout master && |
| 254 | git fetch "$(pwd)" left && |
| 255 | git fmt-merge-msg -m "Sync with left" <.git/FETCH_HEAD >actual && |
| 256 | git fmt-merge-msg --log -m "Sync with left" \ |
| 257 | <.git/FETCH_HEAD >actual.log && |
| 258 | git config merge.log true && |
| 259 | git fmt-merge-msg -m "Sync with left" \ |
| 260 | <.git/FETCH_HEAD >actual.log-config && |
| 261 | git fmt-merge-msg --no-log -m "Sync with left" \ |
| 262 | <.git/FETCH_HEAD >actual.nolog && |
| 263 | |
| 264 | test_cmp expected actual && |
| 265 | test_cmp expected.log actual.log && |
| 266 | test_cmp expected.log actual.log-config && |
| 267 | test_cmp expected actual.nolog |
| 268 | ' |
| 269 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 270 | test_expect_success 'setup: expected shortlog for two branches' ' |
| 271 | cat >expected <<-EOF |
| 272 | Merge branches ${apos}left${apos} and ${apos}right${apos} |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 273 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 274 | # By Another Author (3) and A U Thor (2) |
| 275 | # Via Another Committer |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 276 | * left: |
| 277 | Left #5 |
| 278 | Left #4 |
| 279 | Left #3 |
| 280 | Common #2 |
| 281 | Common #1 |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 282 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 283 | * right: |
| 284 | Right #5 |
| 285 | Right #4 |
| 286 | Right #3 |
| 287 | Common #2 |
| 288 | Common #1 |
| 289 | EOF |
| 290 | ' |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 291 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 292 | test_expect_success 'shortlog for two branches' ' |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 293 | git config merge.log true && |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 294 | test_might_fail git config --unset-all merge.summary && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 295 | git checkout master && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 296 | test_tick && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 297 | git fetch . left right && |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 298 | git fmt-merge-msg <.git/FETCH_HEAD >actual1 && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 299 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 300 | test_might_fail git config --unset-all merge.log && |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 301 | git config merge.summary true && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 302 | git checkout master && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 303 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 304 | git fetch . left right && |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 305 | git fmt-merge-msg <.git/FETCH_HEAD >actual2 && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 306 | |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 307 | git config merge.log yes && |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 308 | test_might_fail git config --unset-all merge.summary && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 309 | git checkout master && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 310 | test_tick && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 311 | git fetch . left right && |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 312 | git fmt-merge-msg <.git/FETCH_HEAD >actual3 && |
SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 313 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 314 | test_might_fail git config --unset-all merge.log && |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 315 | git config merge.summary yes && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 316 | git checkout master && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 317 | test_tick && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 318 | git fetch . left right && |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 319 | git fmt-merge-msg <.git/FETCH_HEAD >actual4 && |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 320 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 321 | test_cmp expected actual1 && |
| 322 | test_cmp expected actual2 && |
| 323 | test_cmp expected actual3 && |
| 324 | test_cmp expected actual4 |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 325 | ' |
| 326 | |
Stephen Boyd | 4c8d4c1 | 2009-05-23 11:53:11 -0700 | [diff] [blame] | 327 | test_expect_success 'merge-msg -F' ' |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 328 | test_might_fail git config --unset-all merge.log && |
Stephen Boyd | 4c8d4c1 | 2009-05-23 11:53:11 -0700 | [diff] [blame] | 329 | git config merge.summary yes && |
Stephen Boyd | 4c8d4c1 | 2009-05-23 11:53:11 -0700 | [diff] [blame] | 330 | git checkout master && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 331 | test_tick && |
Stephen Boyd | 4c8d4c1 | 2009-05-23 11:53:11 -0700 | [diff] [blame] | 332 | git fetch . left right && |
Stephen Boyd | 4c8d4c1 | 2009-05-23 11:53:11 -0700 | [diff] [blame] | 333 | git fmt-merge-msg -F .git/FETCH_HEAD >actual && |
| 334 | test_cmp expected actual |
| 335 | ' |
| 336 | |
| 337 | test_expect_success 'merge-msg -F in subdirectory' ' |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 338 | test_might_fail git config --unset-all merge.log && |
Stephen Boyd | 4c8d4c1 | 2009-05-23 11:53:11 -0700 | [diff] [blame] | 339 | git config merge.summary yes && |
Stephen Boyd | 4c8d4c1 | 2009-05-23 11:53:11 -0700 | [diff] [blame] | 340 | git checkout master && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 341 | test_tick && |
Stephen Boyd | 4c8d4c1 | 2009-05-23 11:53:11 -0700 | [diff] [blame] | 342 | git fetch . left right && |
| 343 | mkdir sub && |
| 344 | cp .git/FETCH_HEAD sub/FETCH_HEAD && |
| 345 | ( |
| 346 | cd sub && |
| 347 | git fmt-merge-msg -F FETCH_HEAD >../actual |
| 348 | ) && |
| 349 | test_cmp expected actual |
| 350 | ' |
| 351 | |
Stephen Boyd | 419fe5b | 2010-03-24 00:15:58 -0700 | [diff] [blame] | 352 | test_expect_success 'merge-msg with nothing to merge' ' |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 353 | test_might_fail git config --unset-all merge.log && |
Stephen Boyd | 419fe5b | 2010-03-24 00:15:58 -0700 | [diff] [blame] | 354 | git config merge.summary yes && |
| 355 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 356 | >empty && |
| 357 | |
Stephen Boyd | 419fe5b | 2010-03-24 00:15:58 -0700 | [diff] [blame] | 358 | ( |
| 359 | cd remote && |
| 360 | git checkout -b unrelated && |
Stephen Boyd | 6183a6a | 2010-03-24 00:15:59 -0700 | [diff] [blame] | 361 | test_tick && |
Stephen Boyd | 419fe5b | 2010-03-24 00:15:58 -0700 | [diff] [blame] | 362 | git fetch origin && |
| 363 | git fmt-merge-msg <.git/FETCH_HEAD >../actual |
| 364 | ) && |
| 365 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 366 | test_cmp empty actual |
Stephen Boyd | 419fe5b | 2010-03-24 00:15:58 -0700 | [diff] [blame] | 367 | ' |
| 368 | |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 369 | test_expect_success 'merge-msg tag' ' |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 370 | cat >expected <<-EOF && |
| 371 | Merge tag ${apos}tag-r3${apos} |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 372 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 373 | * tag ${apos}tag-r3${apos}: |
| 374 | Right #3 |
| 375 | Common #2 |
| 376 | Common #1 |
| 377 | EOF |
| 378 | |
| 379 | test_might_fail git config --unset-all merge.log && |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 380 | git config merge.summary yes && |
| 381 | |
| 382 | git checkout master && |
| 383 | test_tick && |
| 384 | git fetch . tag tag-r3 && |
| 385 | |
| 386 | git fmt-merge-msg <.git/FETCH_HEAD >actual && |
| 387 | test_cmp expected actual |
| 388 | ' |
| 389 | |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 390 | test_expect_success 'merge-msg two tags' ' |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 391 | cat >expected <<-EOF && |
| 392 | Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos} |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 393 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 394 | * tag ${apos}tag-r3${apos}: |
| 395 | Right #3 |
| 396 | Common #2 |
| 397 | Common #1 |
| 398 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 399 | # By Another Author (3) and A U Thor (2) |
| 400 | # Via Another Committer |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 401 | * tag ${apos}tag-l5${apos}: |
| 402 | Left #5 |
| 403 | Left #4 |
| 404 | Left #3 |
| 405 | Common #2 |
| 406 | Common #1 |
| 407 | EOF |
| 408 | |
| 409 | test_might_fail git config --unset-all merge.log && |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 410 | git config merge.summary yes && |
| 411 | |
| 412 | git checkout master && |
| 413 | test_tick && |
| 414 | git fetch . tag tag-r3 tag tag-l5 && |
| 415 | |
| 416 | git fmt-merge-msg <.git/FETCH_HEAD >actual && |
| 417 | test_cmp expected actual |
| 418 | ' |
| 419 | |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 420 | test_expect_success 'merge-msg tag and branch' ' |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 421 | cat >expected <<-EOF && |
| 422 | Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos} |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 423 | |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 424 | * tag ${apos}tag-r3${apos}: |
| 425 | Right #3 |
| 426 | Common #2 |
| 427 | Common #1 |
| 428 | |
Junio C Hamano | 9830a9c | 2012-06-06 14:24:28 -0700 | [diff] [blame^] | 429 | # By Another Author (3) and A U Thor (2) |
| 430 | # Via Another Committer |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 431 | * left: |
| 432 | Left #5 |
| 433 | Left #4 |
| 434 | Left #3 |
| 435 | Common #2 |
| 436 | Common #1 |
| 437 | EOF |
| 438 | |
| 439 | test_might_fail git config --unset-all merge.log && |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 440 | git config merge.summary yes && |
| 441 | |
| 442 | git checkout master && |
| 443 | test_tick && |
| 444 | git fetch . tag tag-r3 left && |
| 445 | |
| 446 | git fmt-merge-msg <.git/FETCH_HEAD >actual && |
| 447 | test_cmp expected actual |
| 448 | ' |
| 449 | |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 450 | test_expect_success 'merge-msg lots of commits' ' |
Jonathan Nieder | d834c96 | 2010-08-17 01:57:40 -0500 | [diff] [blame] | 451 | { |
| 452 | cat <<-EOF && |
| 453 | Merge branch ${apos}long${apos} |
| 454 | |
| 455 | * long: (35 commits) |
| 456 | EOF |
| 457 | |
| 458 | i=29 && |
| 459 | while test $i -gt 9 |
| 460 | do |
| 461 | echo " $i" && |
| 462 | i=$(($i-1)) |
| 463 | done && |
| 464 | echo " ..." |
| 465 | } >expected && |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 466 | |
| 467 | git checkout master && |
| 468 | test_tick && |
| 469 | git fetch . long && |
| 470 | |
Stephen Boyd | 6d6f6e6 | 2010-03-24 00:16:00 -0700 | [diff] [blame] | 471 | git fmt-merge-msg <.git/FETCH_HEAD >actual && |
| 472 | test_cmp expected actual |
| 473 | ' |
| 474 | |
Junio C Hamano | 30a95f3 | 2006-07-03 18:09:54 -0700 | [diff] [blame] | 475 | test_done |