From 157dd309f75f2ce3c23be53ddd2e4baa49a67321 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 3 Jan 2022 15:26:53 +1100 Subject: fix integration test --- test/integration/pushTag/expected/.git_keep/FETCH_HEAD | 2 +- test/integration/pushTag/expected/.git_keep/index | Bin 209 -> 209 bytes test/integration/pushTag/expected/.git_keep/logs/HEAD | 4 ++-- .../pushTag/expected/.git_keep/logs/refs/heads/master | 4 ++-- .../expected/.git_keep/logs/refs/remotes/origin/master | 2 +- .../objects/5e/8100f80934cb3f1530579225107a478afac4ee | Bin 0 -> 149 bytes .../objects/90/5961711d3f0898c003c7e4da636a4c683f7934 | Bin 119 -> 0 bytes .../objects/96/39a47a7955a338919b090835305898ea516c66 | Bin 149 -> 0 bytes .../objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 | 2 ++ .../pushTag/expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/refs/remotes/origin/master | 2 +- .../pushTag/expected/.git_keep/refs/tags/v1.0 | 2 +- .../objects/5e/8100f80934cb3f1530579225107a478afac4ee | Bin 0 -> 149 bytes .../objects/90/5961711d3f0898c003c7e4da636a4c683f7934 | Bin 119 -> 0 bytes .../objects/96/39a47a7955a338919b090835305898ea516c66 | Bin 149 -> 0 bytes .../objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 | 2 ++ test/integration/pushTag/expected_remote/packed-refs | 2 +- test/integration/pushTag/expected_remote/refs/tags/v1.0 | 2 +- test/integration/pushTag/recording.json | 2 +- 19 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 test/integration/pushTag/expected/.git_keep/objects/5e/8100f80934cb3f1530579225107a478afac4ee delete mode 100644 test/integration/pushTag/expected/.git_keep/objects/90/5961711d3f0898c003c7e4da636a4c683f7934 delete mode 100644 test/integration/pushTag/expected/.git_keep/objects/96/39a47a7955a338919b090835305898ea516c66 create mode 100644 test/integration/pushTag/expected/.git_keep/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 create mode 100644 test/integration/pushTag/expected_remote/objects/5e/8100f80934cb3f1530579225107a478afac4ee delete mode 100644 test/integration/pushTag/expected_remote/objects/90/5961711d3f0898c003c7e4da636a4c683f7934 delete mode 100644 test/integration/pushTag/expected_remote/objects/96/39a47a7955a338919b090835305898ea516c66 create mode 100644 test/integration/pushTag/expected_remote/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 diff --git a/test/integration/pushTag/expected/.git_keep/FETCH_HEAD b/test/integration/pushTag/expected/.git_keep/FETCH_HEAD index fb3f085ba..db4145664 100644 --- a/test/integration/pushTag/expected/.git_keep/FETCH_HEAD +++ b/test/integration/pushTag/expected/.git_keep/FETCH_HEAD @@ -1 +1 @@ -9639a47a7955a338919b090835305898ea516c66 branch 'master' of ../actual_remote +5e8100f80934cb3f1530579225107a478afac4ee branch 'master' of ../actual_remote diff --git a/test/integration/pushTag/expected/.git_keep/index b/test/integration/pushTag/expected/.git_keep/index index b9d835e98..4ad50a104 100644 Binary files a/test/integration/pushTag/expected/.git_keep/index and b/test/integration/pushTag/expected/.git_keep/index differ diff --git a/test/integration/pushTag/expected/.git_keep/logs/HEAD b/test/integration/pushTag/expected/.git_keep/logs/HEAD index 406014feb..6b662a0c2 100644 --- a/test/integration/pushTag/expected/.git_keep/logs/HEAD +++ b/test/integration/pushTag/expected/.git_keep/logs/HEAD @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 905961711d3f0898c003c7e4da636a4c683f7934 CI 1634944441 +1100 commit (initial): myfile1 -905961711d3f0898c003c7e4da636a4c683f7934 9639a47a7955a338919b090835305898ea516c66 CI 1634944441 +1100 commit: myfile2 +0000000000000000000000000000000000000000 f5e0cf8631fc56de2f374ef60e123a2b643381e5 CI 1641183988 +1100 commit (initial): myfile1 +f5e0cf8631fc56de2f374ef60e123a2b643381e5 5e8100f80934cb3f1530579225107a478afac4ee CI 1641183988 +1100 commit: myfile2 diff --git a/test/integration/pushTag/expected/.git_keep/logs/refs/heads/master b/test/integration/pushTag/expected/.git_keep/logs/refs/heads/master index 406014feb..6b662a0c2 100644 --- a/test/integration/pushTag/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/pushTag/expected/.git_keep/logs/refs/heads/master @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 905961711d3f0898c003c7e4da636a4c683f7934 CI 1634944441 +1100 commit (initial): myfile1 -905961711d3f0898c003c7e4da636a4c683f7934 9639a47a7955a338919b090835305898ea516c66 CI 1634944441 +1100 commit: myfile2 +0000000000000000000000000000000000000000 f5e0cf8631fc56de2f374ef60e123a2b643381e5 CI 1641183988 +1100 commit (initial): myfile1 +f5e0cf8631fc56de2f374ef60e123a2b643381e5 5e8100f80934cb3f1530579225107a478afac4ee CI 1641183988 +1100 commit: myfile2 diff --git a/test/integration/pushTag/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushTag/expected/.git_keep/logs/refs/remotes/origin/master index a2798f571..3509e2c88 100644 --- a/test/integration/pushTag/expected/.git_keep/logs/refs/remotes/origin/master +++ b/test/integration/pushTag/expected/.git_keep/logs/refs/remotes/origin/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 9639a47a7955a338919b090835305898ea516c66 CI 1634944442 +1100 fetch origin: storing head +0000000000000000000000000000000000000000 5e8100f80934cb3f1530579225107a478afac4ee CI 1641183988 +1100 fetch origin: storing head diff --git a/test/integration/pushTag/expected/.git_keep/objects/5e/8100f80934cb3f1530579225107a478afac4ee b/test/integration/pushTag/expected/.git_keep/objects/5e/8100f80934cb3f1530579225107a478afac4ee new file mode 100644 index 000000000..bcbc6ef2b Binary files /dev/null and b/test/integration/pushTag/expected/.git_keep/objects/5e/8100f80934cb3f1530579225107a478afac4ee differ diff --git a/test/integration/pushTag/expected/.git_keep/objects/90/5961711d3f0898c003c7e4da636a4c683f7934 b/test/integration/pushTag/expected/.git_keep/objects/90/5961711d3f0898c003c7e4da636a4c683f7934 deleted file mode 100644 index f060761fd..000000000 Binary files a/test/integration/pushTag/expected/.git_keep/objects/90/5961711d3f0898c003c7e4da636a4c683f7934 and /dev/null differ diff --git a/test/integration/pushTag/expected/.git_keep/objects/96/39a47a7955a338919b090835305898ea516c66 b/test/integration/pushTag/expected/.git_keep/objects/96/39a47a7955a338919b090835305898ea516c66 deleted file mode 100644 index 243780783..000000000 Binary files a/test/integration/pushTag/expected/.git_keep/objects/96/39a47a7955a338919b090835305898ea516c66 and /dev/null differ diff --git a/test/integration/pushTag/expected/.git_keep/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 b/test/integration/pushTag/expected/.git_keep/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 new file mode 100644 index 000000000..647bf5fc7 --- /dev/null +++ b/test/integration/pushTag/expected/.git_keep/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 @@ -0,0 +1,2 @@ +xA +@ @Qs1MADHg2Xh)#~TH|jDT2&P8 veT4];L3ܦafTȄ((gQI?yoY746, \ No newline at end of file diff --git a/test/integration/pushTag/expected/.git_keep/refs/heads/master b/test/integration/pushTag/expected/.git_keep/refs/heads/master index 442efe33e..eb5effc80 100644 --- a/test/integration/pushTag/expected/.git_keep/refs/heads/master +++ b/test/integration/pushTag/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -9639a47a7955a338919b090835305898ea516c66 +5e8100f80934cb3f1530579225107a478afac4ee diff --git a/test/integration/pushTag/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushTag/expected/.git_keep/refs/remotes/origin/master index 442efe33e..eb5effc80 100644 --- a/test/integration/pushTag/expected/.git_keep/refs/remotes/origin/master +++ b/test/integration/pushTag/expected/.git_keep/refs/remotes/origin/master @@ -1 +1 @@ -9639a47a7955a338919b090835305898ea516c66 +5e8100f80934cb3f1530579225107a478afac4ee diff --git a/test/integration/pushTag/expected/.git_keep/refs/tags/v1.0 b/test/integration/pushTag/expected/.git_keep/refs/tags/v1.0 index 442efe33e..eb5effc80 100644 --- a/test/integration/pushTag/expected/.git_keep/refs/tags/v1.0 +++ b/test/integration/pushTag/expected/.git_keep/refs/tags/v1.0 @@ -1 +1 @@ -9639a47a7955a338919b090835305898ea516c66 +5e8100f80934cb3f1530579225107a478afac4ee diff --git a/test/integration/pushTag/expected_remote/objects/5e/8100f80934cb3f1530579225107a478afac4ee b/test/integration/pushTag/expected_remote/objects/5e/8100f80934cb3f1530579225107a478afac4ee new file mode 100644 index 000000000..bcbc6ef2b Binary files /dev/null and b/test/integration/pushTag/expected_remote/objects/5e/8100f80934cb3f1530579225107a478afac4ee differ diff --git a/test/integration/pushTag/expected_remote/objects/90/5961711d3f0898c003c7e4da636a4c683f7934 b/test/integration/pushTag/expected_remote/objects/90/5961711d3f0898c003c7e4da636a4c683f7934 deleted file mode 100644 index f060761fd..000000000 Binary files a/test/integration/pushTag/expected_remote/objects/90/5961711d3f0898c003c7e4da636a4c683f7934 and /dev/null differ diff --git a/test/integration/pushTag/expected_remote/objects/96/39a47a7955a338919b090835305898ea516c66 b/test/integration/pushTag/expected_remote/objects/96/39a47a7955a338919b090835305898ea516c66 deleted file mode 100644 index 243780783..000000000 Binary files a/test/integration/pushTag/expected_remote/objects/96/39a47a7955a338919b090835305898ea516c66 and /dev/null differ diff --git a/test/integration/pushTag/expected_remote/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 b/test/integration/pushTag/expected_remote/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 new file mode 100644 index 000000000..647bf5fc7 --- /dev/null +++ b/test/integration/pushTag/expected_remote/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 @@ -0,0 +1,2 @@ +xA +@ @Qs1MADHg2Xh)#~TH|jDT2&P8 veT4];L3ܦafTȄ((gQI?yoY746, \ No newline at end of file diff --git a/test/integration/pushTag/expected_remote/packed-refs b/test/integration/pushTag/expected_remote/packed-refs index 31565c279..b71ee5976 100644 --- a/test/integration/pushTag/expected_remote/packed-refs +++ b/test/integration/pushTag/expected_remote/packed-refs @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled sorted -9639a47a7955a338919b090835305898ea516c66 refs/heads/master +5e8100f80934cb3f1530579225107a478afac4ee refs/heads/master diff --git a/test/integration/pushTag/expected_remote/refs/tags/v1.0 b/test/integration/pushTag/expected_remote/refs/tags/v1.0 index 442efe33e..eb5effc80 100644 --- a/test/integration/pushTag/expected_remote/refs/tags/v1.0 +++ b/test/integration/pushTag/expected_remote/refs/tags/v1.0 @@ -1 +1 @@ -9639a47a7955a338919b090835305898ea516c66 +5e8100f80934cb3f1530579225107a478afac4ee diff --git a/test/integration/pushTag/recording.json b/test/integration/pushTag/recording.json index 19eef04f7..91490d1f6 100644 --- a/test/integration/pushTag/recording.json +++ b/test/integration/pushTag/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":1037,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1596,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1709,"Mod":0,"Key":256,"Ch":93},{"Timestamp":2117,"Mod":0,"Key":256,"Ch":110},{"Timestamp":3373,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2411,"Mod":0,"Key":256,"Ch":118},{"Timestamp":2757,"Mod":0,"Key":256,"Ch":49},{"Timestamp":2932,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3109,"Mod":0,"Key":256,"Ch":48},{"Timestamp":3373,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3988,"Mod":0,"Key":256,"Ch":80},{"Timestamp":4516,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5309,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} +{"KeyEvents":[{"Timestamp":736,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1398,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1526,"Mod":0,"Key":256,"Ch":93},{"Timestamp":2271,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2759,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3342,"Mod":0,"Key":256,"Ch":118},{"Timestamp":3655,"Mod":0,"Key":256,"Ch":49},{"Timestamp":3792,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3958,"Mod":0,"Key":256,"Ch":48},{"Timestamp":4271,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5062,"Mod":0,"Key":256,"Ch":80},{"Timestamp":5487,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6455,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file -- cgit v1.2.3