migrate interactive rebase integration tests

This commit is contained in:
Jesse Duffield 2023-02-22 19:36:31 +11:00
parent 526c9dea9b
commit 78f3a7a478
353 changed files with 536 additions and 972 deletions

View file

@ -1,30 +0,0 @@
# This is a combination of 3 commits.
# This is the 1st commit message:
file1
# This is the commit message #2:
file2
# The commit message #3 will be skipped:
# file4
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Tue Apr 6 11:39:15 2021 +1000
#
# interactive rebase in progress; onto ecfc580
# Last commands done (3 commands done):
# squash faaf373 file2
# fixup 578ebf1 file4
# No commands remaining.
# You are currently rebasing branch 'master' on 'ecfc580'.
#
# Changes to be committed:
# new file: file1
# new file: file2
# new file: file4
#

View file

@ -1 +0,0 @@
ref: refs/heads/master

View file

@ -1 +0,0 @@
47614f63053804bc596291b8f7cff3b460b1b3ee

View file

@ -1,10 +0,0 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
email = CI@example.com
name = CI

View file

@ -1 +0,0 @@
Unnamed repository; edit this file 'description' to name the repository.

View file

@ -1,7 +0,0 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~
.DS_Store

View file

@ -1,9 +0,0 @@
0000000000000000000000000000000000000000 ecfc5809e3397bbda6bd4c9f47267a8c5f22346c CI <CI@example.com> 1617673155 +1000 commit (initial): file0
ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI <CI@example.com> 1617673155 +1000 commit: file1
47614f63053804bc596291b8f7cff3b460b1b3ee faaf373a925c1e335894ebf4343a00a917f04edc CI <CI@example.com> 1617673155 +1000 commit: file2
faaf373a925c1e335894ebf4343a00a917f04edc 578ebf1736e797b78fb670c718ebf177936eb2ef CI <CI@example.com> 1617673155 +1000 commit: file4
578ebf1736e797b78fb670c718ebf177936eb2ef ecfc5809e3397bbda6bd4c9f47267a8c5f22346c CI <CI@example.com> 1617673156 +1000 rebase -i (start): checkout ecfc5809e3397bbda6bd4c9f47267a8c5f22346c
ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI <CI@example.com> 1617673156 +1000 rebase -i: fast-forward
47614f63053804bc596291b8f7cff3b460b1b3ee e8ece6af94d443b67962124243509d8f61a29758 CI <CI@example.com> 1617673159 +1000 rebase -i (squash): # This is a combination of 2 commits.
e8ece6af94d443b67962124243509d8f61a29758 1824d7294d6d3524d83510db27086177a6db97bf CI <CI@example.com> 1617673159 +1000 rebase -i (fixup): file1
1824d7294d6d3524d83510db27086177a6db97bf 1824d7294d6d3524d83510db27086177a6db97bf CI <CI@example.com> 1617673159 +1000 rebase -i (finish): returning to refs/heads/master

View file

@ -1,5 +0,0 @@
0000000000000000000000000000000000000000 ecfc5809e3397bbda6bd4c9f47267a8c5f22346c CI <CI@example.com> 1617673155 +1000 commit (initial): file0
ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI <CI@example.com> 1617673155 +1000 commit: file1
47614f63053804bc596291b8f7cff3b460b1b3ee faaf373a925c1e335894ebf4343a00a917f04edc CI <CI@example.com> 1617673155 +1000 commit: file2
faaf373a925c1e335894ebf4343a00a917f04edc 578ebf1736e797b78fb670c718ebf177936eb2ef CI <CI@example.com> 1617673155 +1000 commit: file4
578ebf1736e797b78fb670c718ebf177936eb2ef 1824d7294d6d3524d83510db27086177a6db97bf CI <CI@example.com> 1617673159 +1000 rebase -i (finish): refs/heads/master onto ecfc5809e3397bbda6bd4c9f47267a8c5f22346c

View file

@ -1,2 +0,0 @@
x+)JMU03c040031QHヒフI5`ーアコイ燹ヨカwチ<77>w.ス<><EFBDBD>モ[H
矢y<E79FA2>5<EFBFBD>来ミ(桍ァ ^-ンW(x9

View file

@ -1,3 +0,0 @@
x…ÎËj1 Юý, Á<>ñ+”È*ûþ€lË<6C><C38B>xÆôóëÒ)”n
Z]]k)KÅÍS߈À“shyŠ.9™’ÄrÒ\XCÙ:ÎI¢ŒìŽ­(æ¨÷¤”·!$4!MÑçÉJcÑE<C391>¥T“‰ \®ðr¹žéËýFÇXË+­ZÃ³àœ³Ž§:ýÃýÎÙÞæ¥Á„qûRW¨äW0ÊÚñ—ê3<C3AA>h}_A¡Öð<C396>NŒååFýß?
r‡}yy_

View file

@ -1 +0,0 @@
1824d7294d6d3524d83510db27086177a6db97bf

View file

@ -1 +0,0 @@
test0

View file

@ -1 +0,0 @@
test1

View file

@ -1 +0,0 @@
test2

View file

@ -1 +0,0 @@
test3

View file

@ -1 +0,0 @@
{"KeyEvents":[{"Timestamp":595,"Mod":0,"Key":259,"Ch":0},{"Timestamp":780,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1044,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1187,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1483,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2492,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2763,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3125,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3419,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4132,"Mod":0,"Key":256,"Ch":109},{"Timestamp":4555,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5260,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

View file

@ -1,26 +0,0 @@
#!/bin/sh
set -e
cd $1
git init
git config user.email "CI@example.com"
git config user.name "CI"
echo test0 > file0
git add .
git commit -am file0
echo test1 > file1
git add .
git commit -am file1
echo test2 > file2
git add .
git commit -am file2
echo test3 > file4
git add .
git commit -am file4

View file

@ -1 +0,0 @@
{ "description": "basic rebase of commits", "speed": 10 }

View file

@ -1,16 +0,0 @@
file4-changed-again
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# interactive rebase in progress; onto 4aedafb
# Last commands done (2 commands done):
# edit 26d430f file4-added
# pick c390128 file4-changed-again
# Next command to do (1 remaining command):
# pick bce4745 file4-changed
# You are currently rebasing branch 'master' on '4aedafb'.
#
# Changes to be committed:
# modified: file4
#

View file

@ -1 +0,0 @@
ref: refs/heads/master

View file

@ -1,4 +0,0 @@
file4-changed
# Conflicts:
# file4

View file

@ -1 +0,0 @@
26d430fb59900099e9992a3c79f30e42309cdce3

View file

@ -1 +0,0 @@
bce4745137c540943900ca78e4b31dd1315bf57c

View file

@ -1,10 +0,0 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
email = CI@example.com
name = CI

View file

@ -1 +0,0 @@
Unnamed repository; edit this file 'description' to name the repository.

View file

@ -1,7 +0,0 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~
.DS_Store

View file

@ -1,10 +0,0 @@
0000000000000000000000000000000000000000 f94292928d0bc034fe88c753306b1959300e1264 CI <CI@example.com> 1617673301 +1000 commit (initial): file0
f94292928d0bc034fe88c753306b1959300e1264 61baf480bb5ddfad6d66c785b321d4aadd5367b4 CI <CI@example.com> 1617673301 +1000 commit: file1
61baf480bb5ddfad6d66c785b321d4aadd5367b4 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI <CI@example.com> 1617673301 +1000 commit: file2
4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI <CI@example.com> 1617673301 +1000 commit: file4-added
26d430fb59900099e9992a3c79f30e42309cdce3 bce4745137c540943900ca78e4b31dd1315bf57c CI <CI@example.com> 1617673301 +1000 commit: file4-changed
bce4745137c540943900ca78e4b31dd1315bf57c c3901284a9e7fc063d6fa7f0c5797d031445ba45 CI <CI@example.com> 1617673301 +1000 commit: file4-changed-again
c3901284a9e7fc063d6fa7f0c5797d031445ba45 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI <CI@example.com> 1617673303 +1000 rebase -i (start): checkout 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf
4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI <CI@example.com> 1617673303 +1000 rebase -i: fast-forward
26d430fb59900099e9992a3c79f30e42309cdce3 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI <CI@example.com> 1617673309 +1000 rebase -i (continue): file4-changed-again
c36e808d2fa61e16952b7d0ffb8f18d08156cc94 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI <CI@example.com> 1617673311 +1000 rebase -i (finish): returning to refs/heads/master

View file

@ -1,7 +0,0 @@
0000000000000000000000000000000000000000 f94292928d0bc034fe88c753306b1959300e1264 CI <CI@example.com> 1617673301 +1000 commit (initial): file0
f94292928d0bc034fe88c753306b1959300e1264 61baf480bb5ddfad6d66c785b321d4aadd5367b4 CI <CI@example.com> 1617673301 +1000 commit: file1
61baf480bb5ddfad6d66c785b321d4aadd5367b4 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI <CI@example.com> 1617673301 +1000 commit: file2
4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI <CI@example.com> 1617673301 +1000 commit: file4-added
26d430fb59900099e9992a3c79f30e42309cdce3 bce4745137c540943900ca78e4b31dd1315bf57c CI <CI@example.com> 1617673301 +1000 commit: file4-changed
bce4745137c540943900ca78e4b31dd1315bf57c c3901284a9e7fc063d6fa7f0c5797d031445ba45 CI <CI@example.com> 1617673301 +1000 commit: file4-changed-again
c3901284a9e7fc063d6fa7f0c5797d031445ba45 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI <CI@example.com> 1617673311 +1000 rebase -i (finish): refs/heads/master onto 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf

View file

@ -1,3 +0,0 @@
x<01>ÎM
Â0@a×9Eö¢dɈ“d Æ–ÁãÛ#¸}|W×Þ—¡!§ÓØ™5"{<13>УK"ä80@Dï-[ȹpŽj£<6A>ßC#q#)@¾¹ÉúZ„ÉT±!ÛZc
E}ÆsÝõ4ëÛ4?øK}{ñµ®ý®!@ Ñ9ú ÆuÔcjðŸ\Éòb¼PkÜÔ <9

View file

@ -1,2 +0,0 @@
x<01>ŽA
Â0E]ç³d&I“ˆéd…ÆÁã›#ÈÛ}Þ‡'{­kb{i§*dŒA„E<E2809E>“¤d³ e˜x(Ù©u<ûàÉéÔwƒÂÞrg̸:_t%®‹ ñÀoÒ§½ö¦îÓüÔoªÇ¦7Ùë(P ±_®„ˆ¦¯=ªéŸº)ë¦d~*<8Ž

View file

@ -1,2 +0,0 @@
x+)JMU03c040031QHヒフI5`ーアコイ燹ヨカwチ<77>w.ス<><EFBDBD>モ[H
矢y<E79FA2>5<EFBFBD>来ミ(桍ァ ^-ンW(x9

View file

@ -1,2 +0,0 @@
x<01>ÍA
Â0Fa×9Åì™IÆÄ€ˆÐU<C390>4°Ð)<¾=‚ÛÇ­­ƒDõ4v€cÉr >ø«V¶¹T¡QÕšô¯¾Ó4Ó}šŸø¦öÞpYz{<7B>x >8ÇBgafsÔc2ð'7uÝÀæÙˆ+à

View file

@ -1 +0,0 @@
c36e808d2fa61e16952b7d0ffb8f18d08156cc94

View file

@ -1 +0,0 @@
test0

View file

@ -1 +0,0 @@
test1

View file

@ -1 +0,0 @@
test2

View file

@ -1 +0,0 @@
test5

View file

@ -1 +0,0 @@
{"KeyEvents":[{"Timestamp":507,"Mod":0,"Key":259,"Ch":0},{"Timestamp":707,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1051,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1204,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1460,"Mod":0,"Key":256,"Ch":101},{"Timestamp":1948,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2091,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2828,"Mod":2,"Key":10,"Ch":10},{"Timestamp":4219,"Mod":0,"Key":256,"Ch":109},{"Timestamp":4476,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5524,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6116,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6405,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6635,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7292,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8147,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8548,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8891,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9155,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9707,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10636,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

View file

@ -1,34 +0,0 @@
#!/bin/sh
set -e
cd $1
git init
git config user.email "CI@example.com"
git config user.name "CI"
echo test0 > file0
git add .
git commit -am file0
echo test1 > file1
git add .
git commit -am file1
echo test2 > file2
git add .
git commit -am file2
echo test3 > file4
git add .
git commit -am file4-added
echo test4 > file4
git add .
git commit -am file4-changed
echo test5 > file4
git add .
git commit -am file4-changed-again

View file

@ -1 +0,0 @@
{ "description": "rebasing by reordering two commits, causing a merge conflict", "speed": 10 }

View file

@ -1,27 +0,0 @@
# This is a combination of 2 commits.
# This is the 1st commit message:
file1
# This is the commit message #2:
file2
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Tue Apr 6 11:43:21 2021 +1000
#
# interactive rebase in progress; onto fdecf9e
# Last commands done (2 commands done):
# edit f06dfb4 file1
# squash 51a0e4a file2
# Next commands to do (3 remaining commands):
# edit d8ae31f file4-added
# fixup 4bf6ae4 file4-changed
# You are currently rebasing branch 'master' on 'fdecf9e'.
#
# Changes to be committed:
# new file: file1
# new file: file2
#

View file

@ -1 +0,0 @@
ref: refs/heads/master

View file

@ -1 +0,0 @@
9e68fbe4291e7416d50587d9b6968aa5ceeccff9

View file

@ -1,10 +0,0 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
email = CI@example.com
name = CI

View file

@ -1 +0,0 @@
Unnamed repository; edit this file 'description' to name the repository.

View file

@ -1,7 +0,0 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~
.DS_Store

View file

@ -1,12 +0,0 @@
0000000000000000000000000000000000000000 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI <CI@example.com> 1617673401 +1000 commit (initial): file0
fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI <CI@example.com> 1617673401 +1000 commit: file1
f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 51a0e4a6635c22a062a48b7134dd556541a1e06c CI <CI@example.com> 1617673401 +1000 commit: file2
51a0e4a6635c22a062a48b7134dd556541a1e06c d8ae31faf375fd293cedb0c88c41a9c7a77a2530 CI <CI@example.com> 1617673401 +1000 commit: file4-added
d8ae31faf375fd293cedb0c88c41a9c7a77a2530 4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc CI <CI@example.com> 1617673401 +1000 commit: file4-changed
4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc 9e68fbe4291e7416d50587d9b6968aa5ceeccff9 CI <CI@example.com> 1617673401 +1000 commit: file4-changed-again
9e68fbe4291e7416d50587d9b6968aa5ceeccff9 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI <CI@example.com> 1617673403 +1000 rebase -i (start): checkout fdecf9e3e742db4c8690d56b328b2533e67d2866
fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI <CI@example.com> 1617673403 +1000 rebase -i: fast-forward
f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 7b42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 CI <CI@example.com> 1617673407 +1000 rebase -i (squash): file1
7b42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 8f2acebb8a7a83cfaf3cffc6a9103f633f5cf292 CI <CI@example.com> 1617673407 +1000 rebase -i (edit): file4-added
8f2acebb8a7a83cfaf3cffc6a9103f633f5cf292 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI <CI@example.com> 1617673409 +1000 rebase -i (fixup): file4-added
3c21f03d819ae34b74084712c3ef1b9b99b2f40e 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI <CI@example.com> 1617673409 +1000 rebase -i (finish): returning to refs/heads/master

View file

@ -1,7 +0,0 @@
0000000000000000000000000000000000000000 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI <CI@example.com> 1617673401 +1000 commit (initial): file0
fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI <CI@example.com> 1617673401 +1000 commit: file1
f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 51a0e4a6635c22a062a48b7134dd556541a1e06c CI <CI@example.com> 1617673401 +1000 commit: file2
51a0e4a6635c22a062a48b7134dd556541a1e06c d8ae31faf375fd293cedb0c88c41a9c7a77a2530 CI <CI@example.com> 1617673401 +1000 commit: file4-added
d8ae31faf375fd293cedb0c88c41a9c7a77a2530 4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc CI <CI@example.com> 1617673401 +1000 commit: file4-changed
4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc 9e68fbe4291e7416d50587d9b6968aa5ceeccff9 CI <CI@example.com> 1617673401 +1000 commit: file4-changed-again
9e68fbe4291e7416d50587d9b6968aa5ceeccff9 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI <CI@example.com> 1617673409 +1000 rebase -i (finish): refs/heads/master onto fdecf9e3e742db4c8690d56b328b2533e67d2866

View file

@ -1,2 +0,0 @@
x+)JMU03c040031QHヒフI5`ーアコイ燹ヨカwチ<77>w.ス<><EFBDBD>モ[H
矢y<E79FA2>5<EFBFBD>来ミ(桍ァ ^-ンW(x9

Some files were not shown because too many files have changed in this diff Show more