Ramsay Jones | 00f66f0 | 2010-12-21 18:50:47 +0000 | [diff] [blame] | 1 | #!/bin/sh |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 2 | |
| 3 | test_description='git rebase - test patch id computation' |
| 4 | |
| 5 | . ./test-lib.sh |
| 6 | |
Junio C Hamano | b687cd6 | 2014-06-09 14:03:10 -0700 | [diff] [blame] | 7 | count () { |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 8 | i=0 |
| 9 | while test $i -lt $1 |
| 10 | do |
| 11 | echo "$i" |
| 12 | i=$(($i+1)) |
| 13 | done |
| 14 | } |
| 15 | |
Junio C Hamano | b687cd6 | 2014-06-09 14:03:10 -0700 | [diff] [blame] | 16 | scramble () { |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 17 | i=0 |
| 18 | while read x |
| 19 | do |
| 20 | if test $i -ne 0 |
| 21 | then |
| 22 | echo "$x" |
| 23 | fi |
Ramsay Jones | 00f66f0 | 2010-12-21 18:50:47 +0000 | [diff] [blame] | 24 | i=$((($i+1) % 10)) |
Junio C Hamano | b687cd6 | 2014-06-09 14:03:10 -0700 | [diff] [blame] | 25 | done <"$1" >"$1.new" |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 26 | mv -f "$1.new" "$1" |
| 27 | } |
| 28 | |
Junio C Hamano | b687cd6 | 2014-06-09 14:03:10 -0700 | [diff] [blame] | 29 | run () { |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 30 | echo \$ "$@" |
| 31 | /usr/bin/time "$@" >/dev/null |
| 32 | } |
| 33 | |
| 34 | test_expect_success 'setup' ' |
Ramkumar Ramachandra | 0238038 | 2011-12-08 18:40:17 +0530 | [diff] [blame] | 35 | git commit --allow-empty -m initial && |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 36 | git tag root |
| 37 | ' |
| 38 | |
Junio C Hamano | b687cd6 | 2014-06-09 14:03:10 -0700 | [diff] [blame] | 39 | do_tests () { |
| 40 | nlines=$1 pr=${2-} |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 41 | |
| 42 | test_expect_success $pr "setup: $nlines lines" " |
| 43 | rm -f .gitattributes && |
| 44 | git checkout -q -f master && |
| 45 | git reset --hard root && |
| 46 | count $nlines >file && |
| 47 | git add file && |
| 48 | git commit -q -m initial && |
| 49 | git branch -f other && |
| 50 | |
| 51 | scramble file && |
| 52 | git add file && |
| 53 | git commit -q -m 'change big file' && |
| 54 | |
| 55 | git checkout -q other && |
| 56 | : >newfile && |
| 57 | git add newfile && |
| 58 | git commit -q -m 'add small file' && |
| 59 | |
| 60 | git cherry-pick master >/dev/null 2>&1 |
| 61 | " |
| 62 | |
| 63 | test_debug " |
| 64 | run git diff master^\! |
| 65 | " |
| 66 | |
| 67 | test_expect_success $pr 'setup attributes' " |
| 68 | echo 'file binary' >.gitattributes |
| 69 | " |
| 70 | |
| 71 | test_debug " |
| 72 | run git format-patch --stdout master && |
| 73 | run git format-patch --stdout --ignore-if-in-upstream master |
| 74 | " |
| 75 | |
Jeff King | 577dfd0 | 2016-05-13 16:47:18 -0400 | [diff] [blame] | 76 | test_expect_success $pr 'detect upstream patch' ' |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 77 | git checkout -q master && |
| 78 | scramble file && |
| 79 | git add file && |
Jeff King | 577dfd0 | 2016-05-13 16:47:18 -0400 | [diff] [blame] | 80 | git commit -q -m "change big file again" && |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 81 | git checkout -q other^{} && |
| 82 | git rebase master && |
Denton Liu | 1c9fd32 | 2020-01-06 23:53:09 -0500 | [diff] [blame] | 83 | git rev-list master...HEAD~ >revs && |
| 84 | test_must_be_empty revs |
Jeff King | 577dfd0 | 2016-05-13 16:47:18 -0400 | [diff] [blame] | 85 | ' |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 86 | |
Jeff King | 577dfd0 | 2016-05-13 16:47:18 -0400 | [diff] [blame] | 87 | test_expect_success $pr 'do not drop patch' ' |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 88 | git branch -f squashed master && |
| 89 | git checkout -q -f squashed && |
| 90 | git reset -q --soft HEAD~2 && |
| 91 | git commit -q -m squashed && |
| 92 | git checkout -q other^{} && |
| 93 | test_must_fail git rebase squashed && |
brian m. carlson | 2da1b05 | 2020-03-20 21:52:41 +0000 | [diff] [blame] | 94 | git rebase --quit |
Jeff King | 577dfd0 | 2016-05-13 16:47:18 -0400 | [diff] [blame] | 95 | ' |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 96 | } |
| 97 | |
Junio C Hamano | b687cd6 | 2014-06-09 14:03:10 -0700 | [diff] [blame] | 98 | do_tests 500 |
| 99 | do_tests 50000 EXPENSIVE |
Clemens Buchacher | beb1721 | 2010-09-19 11:59:27 +0200 | [diff] [blame] | 100 | |
| 101 | test_done |