From ac580ae6a05d306329664047d729069d0d4679da Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 18:33:01 +1100 Subject: [PATCH 1/9] migrate undo2 --- pkg/integration/tests/tests_gen.go | 1 + .../tests/undo/undo_checkout_and_drop.go | 151 ++++++++++++++++++ .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../undo2/expected/repo/.git_keep/FETCH_HEAD | 0 .../undo2/expected/repo/.git_keep/HEAD | 1 - .../undo2/expected/repo/.git_keep/ORIG_HEAD | 1 - .../undo2/expected/repo/.git_keep/config | 10 -- .../undo2/expected/repo/.git_keep/description | 1 - .../undo2/expected/repo/.git_keep/index | Bin 353 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../undo2/expected/repo/.git_keep/logs/HEAD | 28 ---- .../repo/.git_keep/logs/refs/heads/branch2 | 11 -- .../repo/.git_keep/logs/refs/heads/master | 8 - .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 36 -> 0 bytes .../0e/2680a41392859e5159716b50525850017c6a59 | 2 - .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 24 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 31 -> 0 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 127 -> 0 bytes .../48/1ce2cf9d037b83acb1d452973695764bf7b95e | 2 - .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 126 -> 0 bytes .../8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 | Bin 118 -> 0 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 127 -> 0 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a3/bf51bf610771f997de1d3f313ab7c43e20bef5 | Bin 148 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c | Bin 147 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../df/1876c035ade1ba199afadd399a6d4273190cd8 | Bin 146 -> 0 bytes .../e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 | Bin 148 -> 0 bytes .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 30 -> 0 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 127 -> 0 bytes .../repo/.git_keep/refs/heads/branch2 | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - test/integration/undo2/expected/repo/file0 | 1 - test/integration/undo2/expected/repo/file1 | 1 - test/integration/undo2/expected/repo/file2 | 1 - test/integration/undo2/expected/repo/file4 | 1 - test/integration/undo2/recording.json | 1 - test/integration/undo2/setup.sh | 40 ----- test/integration/undo2/test.json | 1 - 43 files changed, 152 insertions(+), 122 deletions(-) create mode 100644 pkg/integration/tests/undo/undo_checkout_and_drop.go delete mode 100644 test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/undo2/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/undo2/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/undo2/expected/repo/.git_keep/config delete mode 100644 test/integration/undo2/expected/repo/.git_keep/description delete mode 100644 test/integration/undo2/expected/repo/.git_keep/index delete mode 100644 test/integration/undo2/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/undo2/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a delete mode 100644 test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 delete mode 100644 test/integration/undo2/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/undo2/expected/repo/file0 delete mode 100644 test/integration/undo2/expected/repo/file1 delete mode 100644 test/integration/undo2/expected/repo/file2 delete mode 100644 test/integration/undo2/expected/repo/file4 delete mode 100644 test/integration/undo2/recording.json delete mode 100644 test/integration/undo2/setup.sh delete mode 100644 test/integration/undo2/test.json diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 5d831900e..5c3c24cbc 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -85,5 +85,6 @@ var tests = []*components.IntegrationTest{ sync.Pull, sync.PullAndSetUpstream, sync.RenameBranchAndPull, + undo.UndoCheckoutAndDrop, undo.UndoDrop, } diff --git a/pkg/integration/tests/undo/undo_checkout_and_drop.go b/pkg/integration/tests/undo/undo_checkout_and_drop.go new file mode 100644 index 000000000..b953c2528 --- /dev/null +++ b/pkg/integration/tests/undo/undo_checkout_and_drop.go @@ -0,0 +1,151 @@ +package undo + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var UndoCheckoutAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Drop some commits and then undo/redo the actions", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.EmptyCommit("four") + + shell.NewBranch("other_branch") + shell.Checkout("master") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // we're going to drop a commit, switch branch, drop a commit there, then undo everything, then redo everything. + + confirmCommitDrop := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Delete Commit")). + Content(Equals("Are you sure you want to delete this commit?")). + Confirm() + } + + confirmUndoDrop := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Undo")). + Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)). + Confirm() + } + + confirmRedoDrop := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Redo")). + Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)). + Confirm() + } + + t.Views().Commits().Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Remove). + Tap(confirmCommitDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ) + + t.Views().Branches().Focus(). + Lines( + Contains("master").IsSelected(), + Contains("other_branch"), + ). + SelectNextItem(). + // checkout branch + PressPrimaryAction(). + Lines( + Contains("other_branch").IsSelected(), + Contains("master"), + ) + + // drop the commit in the 'other_branch' branch too + t.Views().Commits().Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Remove). + Tap(confirmCommitDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Undo). + Tap(confirmUndoDrop). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Undo). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Undo")). + Content(Contains("Are you sure you want to checkout 'master'?")). + Confirm() + + t.Views().Branches(). + Lines( + Contains("master").IsSelected(), + Contains("other_branch"), + ) + }). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Undo). + Tap(confirmUndoDrop). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Redo). + Tap(confirmRedoDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Redo). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Redo")). + Content(Contains("Are you sure you want to checkout 'other_branch'?")). + Confirm() + + t.Views().Branches(). + Lines( + Contains("other_branch").IsSelected(), + Contains("master"), + ) + }). + Press(keys.Universal.Redo). + Tap(confirmRedoDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/undo2/expected/repo/.git_keep/FETCH_HEAD b/test/integration/undo2/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/undo2/expected/repo/.git_keep/HEAD b/test/integration/undo2/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD b/test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 064ef4565..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -481ce2cf9d037b83acb1d452973695764bf7b95e diff --git a/test/integration/undo2/expected/repo/.git_keep/config b/test/integration/undo2/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/undo2/expected/repo/.git_keep/description b/test/integration/undo2/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/undo2/expected/repo/.git_keep/index b/test/integration/undo2/expected/repo/.git_keep/index deleted file mode 100644 index 0385f0c7ecee52fe318607af8532af25eac52e9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmW1plETWo|*28E=F1`6^?^M%U46JFHIjIIfX$A(6ele>%Aut+hP87O1OZPnftD1V_OGIcCPrlQI z0I!zrs}OSxVdn5L9BT*!nggaG=J?y7nB=N-?^8o7KK;!x4hDxZ=nt`#|UN) zKetwe70?_o4K>FN%^Xf$hP?rig)8ZuzFX}WmeM)F~ 1617683460 +1000 commit (initial): file0 -8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 0e2680a41392859e5159716b50525850017c6a59 CI 1617683460 +1000 commit: file1 -0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683460 +1000 commit: file2 -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 commit: file4 -a3bf51bf610771f997de1d3f313ab7c43e20bef5 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 checkout: moving from master to branch2 -a3bf51bf610771f997de1d3f313ab7c43e20bef5 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683460 +1000 commit: file4 -481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683460 +1000 commit: file4 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683460 +1000 commit: file2 -df1876c035ade1ba199afadd399a6d4273190cd8 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683461 +1000 checkout: moving from branch2 to master -a3bf51bf610771f997de1d3f313ab7c43e20bef5 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (start): checkout bce6c0c795a3d37c0a2c382a6d9c146b1889f86c -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (finish): returning to refs/heads/master -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (start): checkout 0e2680a41392859e5159716b50525850017c6a59 -0e2680a41392859e5159716b50525850017c6a59 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (finish): returning to refs/heads/master -0e2680a41392859e5159716b50525850017c6a59 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683464 +1000 checkout: moving from master to branch2 -df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (start): checkout e51d8e24ead991fdd7fd9b9d90924c2e24576981 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (finish): returning to refs/heads/branch2 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (start): checkout 481ce2cf9d037b83acb1d452973695764bf7b95e -481ce2cf9d037b83acb1d452973695764bf7b95e 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (finish): returning to refs/heads/branch2 -481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683466 +1000 [lazygit undo]: updating HEAD -e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683467 +1000 [lazygit undo]: updating HEAD -df1876c035ade1ba199afadd399a6d4273190cd8 0e2680a41392859e5159716b50525850017c6a59 CI 1617683467 +1000 [lazygit undo] -0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683468 +1000 [lazygit undo]: updating HEAD -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683468 +1000 [lazygit undo]: updating HEAD -a3bf51bf610771f997de1d3f313ab7c43e20bef5 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683469 +1000 [lazygit undo] -df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683470 +1000 [lazygit undo]: updating HEAD -e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683470 +1000 [lazygit undo]: updating HEAD -481ce2cf9d037b83acb1d452973695764bf7b95e a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo]: updating HEAD -a3bf51bf610771f997de1d3f313ab7c43e20bef5 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo] diff --git a/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 692281b19..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,11 +0,0 @@ -0000000000000000000000000000000000000000 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 branch: Created from HEAD -a3bf51bf610771f997de1d3f313ab7c43e20bef5 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683460 +1000 commit: file4 -481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683460 +1000 commit: file4 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683460 +1000 commit: file2 -df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (finish): refs/heads/branch2 onto e51d8e24ead991fdd7fd9b9d90924c2e24576981 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (finish): refs/heads/branch2 onto 481ce2cf9d037b83acb1d452973695764bf7b95e -481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683466 +1000 [lazygit undo]: updating HEAD -e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683467 +1000 [lazygit undo]: updating HEAD -df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683470 +1000 [lazygit undo]: updating HEAD -e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683470 +1000 [lazygit undo]: updating HEAD -481ce2cf9d037b83acb1d452973695764bf7b95e a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo]: updating HEAD diff --git a/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 805835942..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,8 +0,0 @@ -0000000000000000000000000000000000000000 8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 CI 1617683460 +1000 commit (initial): file0 -8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 0e2680a41392859e5159716b50525850017c6a59 CI 1617683460 +1000 commit: file1 -0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683460 +1000 commit: file2 -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 commit: file4 -a3bf51bf610771f997de1d3f313ab7c43e20bef5 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (finish): refs/heads/master onto bce6c0c795a3d37c0a2c382a6d9c146b1889f86c -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (finish): refs/heads/master onto 0e2680a41392859e5159716b50525850017c6a59 -0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683468 +1000 [lazygit undo]: updating HEAD -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683468 +1000 [lazygit undo]: updating HEAD diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2c4712a28ba59b99a0ddd33f70433acf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 b/test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 deleted file mode 100644 index dab8fd41a..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 +++ /dev/null @@ -1,2 +0,0 @@ -x; -0 @; EGBCeH\#ty Ou.P(,̮zj$.U(wzdѓ88&!$𧿶Sd[ egnڼ(9 \ No newline at end of file diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258e5362e874f0cd17fc6c260a82c41501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb|y2)08mZ`J^%m! diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7c0189f1a7f6fc780332ce07230ba16e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e b/test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e deleted file mode 100644 index a4ba62ac1..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=BqIBV9ƨ# & =~sn?o-U; r x@Y4 Dr[T#B$q`_aާ_iň'7uY՛n: \ No newline at end of file diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed50454974ab7775c9d85cee55477580ac83e835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 b/test/integration/undo2/expected/repo/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 deleted file mode 100644 index e5028f911022d2b071f22b9d57caae7f23b28969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{NynrC5uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT01^yvK7|l+lDl^?3&3M4TG*ysY=8z;YvQNB+drapK)L YsAIYcGn=!Xla4>RDeDF{Kij)2?p``L4*&oF diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335181ed440a54f52297d3cb1ab3a70222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06dda15fe1901a7942e7954b700b36bfa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 b/test/integration/undo2/expected/repo/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 deleted file mode 100644 index 751b9844f3079311dd7fc1ff7036c399b43ac200..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQSB{w5O;5xVLzCesNPT3bp4k8h9Q_VF#AZ0kCA z>x#ehL)E6jpi)R3#VnltBq7zzl`6%Se6GmN6PTS3eRo?$Q9yD@9Hx*3*h?VKI2Cab zt0O9nPz-P+WRm*^~>wN=uNiuVI8`R6e5DXIsh`~^A08nuUMF0Q* diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c b/test/integration/undo2/expected/repo/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c deleted file mode 100644 index bc5e863f8f4bc259171bea4e14410ad08f422304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fDMP26<*$Xl=?IaTr5xVLz(qw{##+DMnZoWtfG`GagM;^Hregny$zt*Fq$YcRMk|KXI2i3vEX5b zM4Z9Nr$5)-kCVTR)5E^fwwGPX+U_0*66I^8;Li|3a0fl6y8W5Ey1WeC52>O##(F(V AApigX diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 b/test/integration/undo2/expected/repo/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 deleted file mode 100644 index d784921aac901108b62c250da2679bea8fdba127..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQSZGWi=25xVLzGU)^hjV&R9$G1mt`}h{G?5(Xs z1KG>yA{rOACWRW4VJJ1A6)BbgKq`_az??E$R!8pg9@-@+VoRmPVC00kFf7hniWtbp z;J8L6FDie=YwvoR^?jP3^3Cnop3;#Pp;~^iBmsK0y#K6 C`9zQa diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee261a5c479d905ee8318e897bf4bca8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb~-q%PKJUL9GL*(lMbH% diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3f282798a9dd14ae1222a66d0c4a783a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ diff --git a/test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index fe4f6f367..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -a3bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/repo/.git_keep/refs/heads/master b/test/integration/undo2/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index fe4f6f367..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a3bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/repo/file0 b/test/integration/undo2/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/undo2/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/undo2/expected/repo/file1 b/test/integration/undo2/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/undo2/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/undo2/expected/repo/file2 b/test/integration/undo2/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/undo2/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/undo2/expected/repo/file4 b/test/integration/undo2/expected/repo/file4 deleted file mode 100644 index 2d00bd505..000000000 --- a/test/integration/undo2/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -line one diff --git a/test/integration/undo2/recording.json b/test/integration/undo2/recording.json deleted file mode 100644 index c9398dfa5..000000000 --- a/test/integration/undo2/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":647,"Mod":0,"Key":259,"Ch":0},{"Timestamp":917,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1245,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1646,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1957,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2205,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2533,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2765,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3141,"Mod":0,"Key":260,"Ch":0},{"Timestamp":3397,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3637,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3933,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4780,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5205,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5405,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5685,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5877,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6277,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6725,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7317,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7845,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8372,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8885,"Mod":0,"Key":256,"Ch":122},{"Timestamp":9469,"Mod":0,"Key":256,"Ch":122},{"Timestamp":10069,"Mod":0,"Key":256,"Ch":122},{"Timestamp":10645,"Mod":0,"Key":256,"Ch":122},{"Timestamp":11189,"Mod":0,"Key":256,"Ch":122},{"Timestamp":12077,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/undo2/setup.sh b/test/integration/undo2/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/undo2/setup.sh +++ /dev/null @@ -1,40 +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 "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/undo2/test.json b/test/integration/undo2/test.json deleted file mode 100644 index 1080ff7ec..000000000 --- a/test/integration/undo2/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "undoing changes in both commits and branches. Skipped because it's failing on CI for some reason", "speed": 10, "skip":true} From 9e2a3a87dd73b9a8979dd2ae5546303a94b5d75a Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 19:05:48 +1100 Subject: [PATCH 2/9] improved commit test --- pkg/integration/tests/commit/commit.go | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkg/integration/tests/commit/commit.go b/pkg/integration/tests/commit/commit.go index 6ed75a797..741a1da99 100644 --- a/pkg/integration/tests/commit/commit.go +++ b/pkg/integration/tests/commit/commit.go @@ -20,18 +20,42 @@ var Commit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files(). IsFocused(). + Lines( + Contains("?? myfile").IsSelected(), + Contains("?? myfile2"), + ). PressPrimaryAction(). // stage file + Lines( + Contains("A myfile").IsSelected(), + Contains("?? myfile2"), + ). SelectNextItem(). PressPrimaryAction(). // stage other file + Lines( + Contains("A myfile"), + Contains("A myfile2").IsSelected(), + ). Press(keys.Files.CommitChanges) commitMessage := "my commit message" t.ExpectPopup().CommitMessagePanel().Type(commitMessage).Confirm() + t.Views().Files(). + IsEmpty() + t.Views().Commits(). + Focus(). Lines( - Contains(commitMessage), + Contains(commitMessage).IsSelected(), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("A myfile"), + Contains("A myfile2"), ) }, }) From 39c56553b36eaa05d6a12bdb66fe612736f92344 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 20 Feb 2023 18:19:02 +1100 Subject: [PATCH 3/9] show tag message --- pkg/commands/git_commands/tag_loader.go | 18 +++++++++++++--- pkg/commands/git_commands/tag_loader_test.go | 22 +++++++------------- pkg/commands/models/tag.go | 5 ++++- pkg/gui/presentation/tags.go | 4 +++- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/pkg/commands/git_commands/tag_loader.go b/pkg/commands/git_commands/tag_loader.go index 738283405..2dc5a4f41 100644 --- a/pkg/commands/git_commands/tag_loader.go +++ b/pkg/commands/git_commands/tag_loader.go @@ -1,6 +1,8 @@ package git_commands import ( + "regexp" + "github.com/jesseduffield/generics/slices" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" @@ -26,16 +28,26 @@ func NewTagLoader( func (self *TagLoader) GetTags() ([]*models.Tag, error) { // get remote branches, sorted by creation date (descending) // see: https://git-scm.com/docs/git-tag#Documentation/git-tag.txt---sortltkeygt - tagsOutput, err := self.cmd.New(`git tag --list --sort=-creatordate`).DontLog().RunWithOutput() + tagsOutput, err := self.cmd.New(`git tag --list -n --sort=-creatordate`).DontLog().RunWithOutput() if err != nil { return nil, err } split := utils.SplitLines(tagsOutput) - tags := slices.Map(split, func(tagName string) *models.Tag { + lineRegex := regexp.MustCompile(`^([^\s]+)(\s+)?(.*)$`) + + tags := slices.Map(split, func(line string) *models.Tag { + matches := lineRegex.FindStringSubmatch(line) + tagName := matches[1] + message := "" + if len(matches) > 3 { + message = matches[3] + } + return &models.Tag{ - Name: tagName, + Name: tagName, + Message: message, } }) diff --git a/pkg/commands/git_commands/tag_loader_test.go b/pkg/commands/git_commands/tag_loader_test.go index f8696cafa..61b55d018 100644 --- a/pkg/commands/git_commands/tag_loader_test.go +++ b/pkg/commands/git_commands/tag_loader_test.go @@ -9,12 +9,9 @@ import ( "github.com/stretchr/testify/assert" ) -const tagsOutput = `v0.34 -v0.33 -v0.32.2 -v0.32.1 -v0.32 -testtag +const tagsOutput = `tag1 this is my message +tag2 +tag3 this is my other message ` func TestGetTags(t *testing.T) { @@ -29,21 +26,18 @@ func TestGetTags(t *testing.T) { { testName: "should return no tags if there are none", runner: oscommands.NewFakeRunner(t). - Expect(`git tag --list --sort=-creatordate`, "", nil), + Expect(`git tag --list -n --sort=-creatordate`, "", nil), expectedTags: []*models.Tag{}, expectedError: nil, }, { testName: "should return tags if present", runner: oscommands.NewFakeRunner(t). - Expect(`git tag --list --sort=-creatordate`, tagsOutput, nil), + Expect(`git tag --list -n --sort=-creatordate`, tagsOutput, nil), expectedTags: []*models.Tag{ - {Name: "v0.34"}, - {Name: "v0.33"}, - {Name: "v0.32.2"}, - {Name: "v0.32.1"}, - {Name: "v0.32"}, - {Name: "testtag"}, + {Name: "tag1", Message: "this is my message"}, + {Name: "tag2", Message: ""}, + {Name: "tag3", Message: "this is my other message"}, }, expectedError: nil, }, diff --git a/pkg/commands/models/tag.go b/pkg/commands/models/tag.go index 25d8754f5..ab6076a7a 100644 --- a/pkg/commands/models/tag.go +++ b/pkg/commands/models/tag.go @@ -3,6 +3,9 @@ package models // Tag : A git tag type Tag struct { Name string + // this is either the first line of the message of an annotated tag, or the + // first line of a commit message for a lightweight tag + Message string } func (t *Tag) FullRefName() string { @@ -22,5 +25,5 @@ func (t *Tag) ID() string { } func (t *Tag) Description() string { - return "tag " + t.Name + return t.Message } diff --git a/pkg/gui/presentation/tags.go b/pkg/gui/presentation/tags.go index 2996db18d..944448a8c 100644 --- a/pkg/gui/presentation/tags.go +++ b/pkg/gui/presentation/tags.go @@ -4,6 +4,7 @@ import ( "github.com/jesseduffield/generics/slices" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/gui/presentation/icons" + "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/theme" ) @@ -24,6 +25,7 @@ func getTagDisplayStrings(t *models.Tag, diffed bool) []string { if icons.IsIconEnabled() { res = append(res, textStyle.Sprint(icons.IconForTag(t))) } - res = append(res, textStyle.Sprint(t.Name)) + descriptionColor := style.FgYellow + res = append(res, textStyle.Sprint(t.Name), descriptionColor.Sprint(t.Description())) return res } From 082d342bf8f05edfa5e662389af8590c1923eabc Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 20 Feb 2023 18:41:17 +1100 Subject: [PATCH 4/9] add tag tests --- pkg/i18n/english.go | 2 +- pkg/integration/tests/branch/create_tag.go | 1 + pkg/integration/tests/tag/crud_annotated.go | 49 +++++++++++++++++ pkg/integration/tests/tag/crud_lightweight.go | 53 +++++++++++++++++++ pkg/integration/tests/tests_gen.go | 3 ++ 5 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 pkg/integration/tests/tag/crud_annotated.go create mode 100644 pkg/integration/tests/tag/crud_lightweight.go diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 06ffd9b1c..808e7af86 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -985,7 +985,7 @@ func EnglishTranslationSet() TranslationSet { LcTagCommit: "tag commit", TagMenuTitle: "Create tag", TagNameTitle: "Tag name:", - TagMessageTitle: "Tag message: ", + TagMessageTitle: "Tag message:", LcAnnotatedTag: "annotated tag", LcLightweightTag: "lightweight tag", LcDeleteTag: "delete tag", diff --git a/pkg/integration/tests/branch/create_tag.go b/pkg/integration/tests/branch/create_tag.go index 6f4ec0baf..36df00f60 100644 --- a/pkg/integration/tests/branch/create_tag.go +++ b/pkg/integration/tests/branch/create_tag.go @@ -28,6 +28,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Create tag")). + Select(Contains("lightweight")). Confirm() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/tag/crud_annotated.go b/pkg/integration/tests/tag/crud_annotated.go new file mode 100644 index 000000000..f690fdce3 --- /dev/null +++ b/pkg/integration/tests/tag/crud_annotated.go @@ -0,0 +1,49 @@ +package tag + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CrudAnnotated = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create and delete an annotated tag in the tags panel", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Tags(). + Focus(). + IsEmpty(). + Press(keys.Universal.New). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Create tag")). + Select(Contains("annotated")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Tag name:")). + Type("new-tag"). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Tag message:")). + Type("message"). + Confirm() + }). + Lines( + MatchesRegexp(`new-tag.*message`).IsSelected(), + ). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Delete tag")). + Content(Equals("Are you sure you want to delete tag 'new-tag'?")). + Confirm() + }). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/tag/crud_lightweight.go b/pkg/integration/tests/tag/crud_lightweight.go new file mode 100644 index 000000000..f76157038 --- /dev/null +++ b/pkg/integration/tests/tag/crud_lightweight.go @@ -0,0 +1,53 @@ +package tag + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CrudLightweight = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create and delete a lightweight tag in the tags panel", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Tags(). + Focus(). + IsEmpty(). + Press(keys.Universal.New). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Create tag")). + Select(Contains("lightweight")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Tag name:")). + Type("new-tag"). + Confirm() + }). + Lines( + MatchesRegexp(`new-tag.*initial commit`).IsSelected(), + ). + PressEnter(). + Tap(func() { + // view the commits of the tag + t.Views().SubCommits().IsFocused(). + Lines( + Contains("initial commit"), + ). + PressEscape() + }). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Delete tag")). + Content(Equals("Are you sure you want to delete tag 'new-tag'?")). + Confirm() + }). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 5c3c24cbc..4a6cbcf30 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -20,6 +20,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/stash" "github.com/jesseduffield/lazygit/pkg/integration/tests/submodule" "github.com/jesseduffield/lazygit/pkg/integration/tests/sync" + "github.com/jesseduffield/lazygit/pkg/integration/tests/tag" "github.com/jesseduffield/lazygit/pkg/integration/tests/undo" ) @@ -85,6 +86,8 @@ var tests = []*components.IntegrationTest{ sync.Pull, sync.PullAndSetUpstream, sync.RenameBranchAndPull, + tag.CrudAnnotated, + tag.CrudLightweight, undo.UndoCheckoutAndDrop, undo.UndoDrop, } From 76109a4c441f3b0fc8265823bbc3d58f41aaec50 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 20 Feb 2023 18:41:27 +1100 Subject: [PATCH 5/9] sync test list whenever running a test in vscode --- .vscode/tasks.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f0d10c7e4..f020e1d0c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -24,7 +24,7 @@ { "label": "Run current file integration test", "type": "shell", - "command": "go run cmd/integration_test/main.go cli ${relativeFile}", + "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli ${relativeFile}", "problemMatcher": [], "group": { "kind": "test", @@ -37,7 +37,7 @@ { "label": "Run current file integration test (slow)", "type": "shell", - "command": "go run cmd/integration_test/main.go cli --slow ${relativeFile}", + "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli --slow ${relativeFile}", "problemMatcher": [], "group": { "kind": "test", @@ -49,7 +49,7 @@ { "label": "Run current file integration test (sandbox)", "type": "shell", - "command": "go run cmd/integration_test/main.go cli --sandbox ${relativeFile}", + "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli --sandbox ${relativeFile}", "problemMatcher": [], "group": { "kind": "test", @@ -73,7 +73,7 @@ { "label": "Sync tests list", "type": "shell", - "command": "go generate ./...", + "command": "go generate pkg/integration/tests/tests.go", "problemMatcher": [], "group": { "kind": "test", From daf8176dd74eedcbb4d4916f1e918bcae1361b95 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 20 Feb 2023 18:45:14 +1100 Subject: [PATCH 6/9] add tag checkout test --- pkg/integration/components/shell.go | 4 ++++ pkg/integration/tests/tag/checkout.go | 31 +++++++++++++++++++++++++++ pkg/integration/tests/tests_gen.go | 1 + 3 files changed, 36 insertions(+) create mode 100644 pkg/integration/tests/tag/checkout.go diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index ad4964507..ad6d195f5 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -136,6 +136,10 @@ func (self *Shell) EmptyCommit(message string) *Shell { return self.RunCommand(fmt.Sprintf("git commit --allow-empty -m \"%s\"", message)) } +func (self *Shell) CreateLightweightTag(name string, ref string) *Shell { + return self.RunCommand(fmt.Sprintf("git tag %s %s", name, ref)) +} + // convenience method for creating a file and adding it func (self *Shell) CreateFileAndAdd(fileName string, fileContents string) *Shell { return self. diff --git a/pkg/integration/tests/tag/checkout.go b/pkg/integration/tests/tag/checkout.go new file mode 100644 index 000000000..9ed88f980 --- /dev/null +++ b/pkg/integration/tests/tag/checkout.go @@ -0,0 +1,31 @@ +package tag + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Checkout = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Checkout a tag", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.CreateLightweightTag("tag", "HEAD^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Tags(). + Focus(). + Lines( + Contains("tag").IsSelected(), + ). + PressPrimaryAction() // checkout tag + + t.Views().Branches().IsFocused().Lines( + Contains("HEAD detached at tag").IsSelected(), + Contains("master"), + ) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 4a6cbcf30..1e32bd784 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -86,6 +86,7 @@ var tests = []*components.IntegrationTest{ sync.Pull, sync.PullAndSetUpstream, sync.RenameBranchAndPull, + tag.Checkout, tag.CrudAnnotated, tag.CrudLightweight, undo.UndoCheckoutAndDrop, From ee8c31880c58f251b368c2c9d4af9aa1c59de6e4 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 20 Feb 2023 18:48:37 +1100 Subject: [PATCH 7/9] add reset to tag test --- pkg/integration/tests/tag/reset.go | 40 ++++++++++++++++++++++++++++++ pkg/integration/tests/tests_gen.go | 1 + 2 files changed, 41 insertions(+) create mode 100644 pkg/integration/tests/tag/reset.go diff --git a/pkg/integration/tests/tag/reset.go b/pkg/integration/tests/tag/reset.go new file mode 100644 index 000000000..1e2a9402b --- /dev/null +++ b/pkg/integration/tests/tag/reset.go @@ -0,0 +1,40 @@ +package tag + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Reset = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Hard reset to a tag", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.CreateLightweightTag("tag", "HEAD^") // creating tag on commit "one" + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits().Lines( + Contains("two"), + Contains("one"), + ) + + t.Views().Tags(). + Focus(). + Lines( + Contains("tag").IsSelected(), + ). + Press(keys.Commits.ViewResetOptions) + + t.ExpectPopup().Menu(). + Title(Contains("reset to tag")). + Select(Contains("hard reset")). + Confirm() + + t.Views().Commits().Lines( + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 1e32bd784..639a7743c 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -89,6 +89,7 @@ var tests = []*components.IntegrationTest{ tag.Checkout, tag.CrudAnnotated, tag.CrudLightweight, + tag.Reset, undo.UndoCheckoutAndDrop, undo.UndoDrop, } From 0b55eaca1d3d2b52df0531ca2da613fabb799c18 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 20 Feb 2023 18:52:45 +1100 Subject: [PATCH 8/9] add create tag from commit test --- pkg/config/user_config.go | 4 +- .../controllers/local_commits_controller.go | 2 +- pkg/integration/tests/commit/create_tag.go | 51 +++++++++++++++++++ pkg/integration/tests/tests_gen.go | 1 + 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 pkg/integration/tests/commit/create_tag.go diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index d9e736149..6fe880ce2 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -258,7 +258,7 @@ type KeybindingCommitsConfig struct { CherryPickCopy string `yaml:"cherryPickCopy"` CherryPickCopyRange string `yaml:"cherryPickCopyRange"` PasteCommits string `yaml:"pasteCommits"` - TagCommit string `yaml:"tagCommit"` + CreateTag string `yaml:"tagCommit"` CheckoutCommit string `yaml:"checkoutCommit"` ResetCherryPick string `yaml:"resetCherryPick"` CopyCommitAttributeToClipboard string `yaml:"copyCommitAttributeToClipboard"` @@ -544,7 +544,7 @@ func GetDefaultConfig() *UserConfig { CherryPickCopy: "c", CherryPickCopyRange: "C", PasteCommits: "v", - TagCommit: "T", + CreateTag: "T", CheckoutCommit: "", ResetCherryPick: "", CopyCommitAttributeToClipboard: "y", diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index a9fe7a190..ae0f342fb 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -132,7 +132,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ Description: self.c.Tr.LcRevertCommit, }, { - Key: opts.GetKey(opts.Config.Commits.TagCommit), + Key: opts.GetKey(opts.Config.Commits.CreateTag), Handler: self.checkSelected(self.createTag), Description: self.c.Tr.LcTagCommit, }, diff --git a/pkg/integration/tests/commit/create_tag.go b/pkg/integration/tests/commit/create_tag.go new file mode 100644 index 000000000..4b749b235 --- /dev/null +++ b/pkg/integration/tests/commit/create_tag.go @@ -0,0 +1,51 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create a new tag on a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("two").IsSelected(), + Contains("one"), + ). + Press(keys.Commits.CreateTag) + + t.ExpectPopup().Menu(). + Title(Equals("Create tag")). + Select(Contains("lightweight")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Tag name:")). + Type("new-tag"). + Confirm() + + t.Views().Commits(). + Lines( + MatchesRegexp(`new-tag.*two`).IsSelected(), + MatchesRegexp(`one`), + ) + + t.Views().Tags(). + Focus(). + Lines( + MatchesRegexp(`new-tag.*two`).IsSelected(), + ) + + t.Git(). + TagNamesAt("HEAD", []string{"new-tag"}) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 639a7743c..e2336f6be 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -41,6 +41,7 @@ var tests = []*components.IntegrationTest{ cherry_pick.CherryPickConflicts, commit.Commit, commit.CommitMultiline, + commit.CreateTag, commit.DiscardOldFileChange, commit.NewBranch, commit.Revert, From 06351c1adf906a27e0e4d59e62b1fafc906ddc15 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 20 Feb 2023 18:53:04 +1100 Subject: [PATCH 9/9] remove old tag tests --- .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../tags/expected/repo/.git_keep/FETCH_HEAD | 0 .../tags/expected/repo/.git_keep/HEAD | 1 - .../tags/expected/repo/.git_keep/config | 10 ------- .../tags/expected/repo/.git_keep/description | 1 - .../tags/expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../tags/expected/repo/.git_keep/info/exclude | 7 ----- .../tags/expected/repo/.git_keep/logs/HEAD | 2 -- .../repo/.git_keep/logs/refs/heads/master | 2 -- .../07/b4cadb018ce914237e3f31ee264c9555acc1d1 | Bin 671 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 | 2 -- .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 -- .../tags/expected/repo/.git_keep/packed-refs | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/tags/tag1 | 1 - .../expected/repo/.git_keep/refs/tags/tag3 | 1 - .../expected/repo/.git_keep/refs/tags/tag4 | 1 - test/integration/tags/expected/repo/file0 | 1 - test/integration/tags/expected/repo/file1 | 1 - test/integration/tags/recording.json | 1 - test/integration/tags/setup.sh | 18 ------------ test/integration/tags/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../tags2/expected/repo/.git_keep/FETCH_HEAD | 0 .../tags2/expected/repo/.git_keep/HEAD | 1 - .../tags2/expected/repo/.git_keep/ORIG_HEAD | 1 - .../tags2/expected/repo/.git_keep/config | 10 ------- .../tags2/expected/repo/.git_keep/description | 1 - .../tags2/expected/repo/.git_keep/index | Bin 281 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 ----- .../tags2/expected/repo/.git_keep/logs/HEAD | 5 ---- .../repo/.git_keep/logs/refs/heads/master | 4 --- .../17/50e9a4016c985ef97d002ae40ed554e3db6c87 | Bin 669 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 127 -> 0 bytes .../56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 | Bin 671 -> 0 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../ae/fe968910ad84a58bfac631b56eb422968766fb | Bin 673 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 -- .../dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a | Bin 638 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/tags/one | 1 - .../expected/repo/.git_keep/refs/tags/two | 1 - test/integration/tags2/expected/repo/file0 | 1 - test/integration/tags2/expected/repo/file1 | 1 - test/integration/tags2/expected/repo/file2 | 1 - test/integration/tags2/recording.json | 1 - test/integration/tags2/setup.sh | 26 ------------------ test/integration/tags2/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../tags3/expected/repo/.git_keep/FETCH_HEAD | 0 .../tags3/expected/repo/.git_keep/HEAD | 1 - .../tags3/expected/repo/.git_keep/config | 10 ------- .../tags3/expected/repo/.git_keep/description | 1 - .../tags3/expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 ----- .../tags3/expected/repo/.git_keep/logs/HEAD | 5 ---- .../repo/.git_keep/logs/refs/heads/master | 4 --- .../repo/.git_keep/logs/refs/heads/test | 1 - .../08/c28e4e15f3de3b024524894d9235dfcdb48c19 | Bin 671 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../25/15eabac6791725f4a3326676a1491f09664afc | Bin 675 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../44/e5064a45438ffa3e6e4a0f1444552e2199be97 | Bin 127 -> 0 bytes .../46/b4990797fac897fb135dd639a4cad3b0269f2d | Bin 635 -> 0 bytes .../88/d7a40883abd57297127b3777a2a7ec3696c33a | Bin 675 -> 0 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 -- .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/heads/test | 1 - .../expected/repo/.git_keep/refs/tags/one | 1 - test/integration/tags3/expected/repo/file0 | 1 - test/integration/tags3/expected/repo/file1 | 1 - test/integration/tags3/recording.json | 1 - test/integration/tags3/setup.sh | 26 ------------------ test/integration/tags3/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../tags4/expected/repo/.git_keep/FETCH_HEAD | 0 .../tags4/expected/repo/.git_keep/HEAD | 1 - .../tags4/expected/repo/.git_keep/config | 8 ------ .../tags4/expected/repo/.git_keep/description | 1 - .../tags4/expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 ---- .../tags4/expected/repo/.git_keep/logs/HEAD | 2 -- .../repo/.git_keep/logs/refs/heads/master | 2 -- .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3a/64c1649510c0dcaca3815291e3d43980f1bb99 | Bin 673 -> 0 bytes .../56/18f31c7550111a878fb63f6079e8462ae94c42 | 2 -- .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 -- .../db/03048dbacea165536b49c030c9aaca108cc571 | Bin 129 -> 0 bytes .../f0/4e94a59e6159acf554fc1268742df10fe6b0d3 | Bin 639 -> 0 bytes .../tags4/expected/repo/.git_keep/packed-refs | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/tags/atag2 | 1 - test/integration/tags4/expected/repo/file0 | 1 - test/integration/tags4/expected/repo/file1 | 1 - test/integration/tags4/recording.json | 1 - test/integration/tags4/setup.sh | 18 ------------ test/integration/tags4/test.json | 1 - 111 files changed, 236 deletions(-) delete mode 100644 test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/tags/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/tags/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/tags/expected/repo/.git_keep/config delete mode 100644 test/integration/tags/expected/repo/.git_keep/description delete mode 100644 test/integration/tags/expected/repo/.git_keep/index delete mode 100644 test/integration/tags/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/tags/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/tags/expected/repo/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 delete mode 100644 test/integration/tags/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/tags/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 delete mode 100644 test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/tags/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/tags/expected/repo/.git_keep/packed-refs delete mode 100644 test/integration/tags/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 delete mode 100644 test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 delete mode 100644 test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 delete mode 100644 test/integration/tags/expected/repo/file0 delete mode 100644 test/integration/tags/expected/repo/file1 delete mode 100644 test/integration/tags/recording.json delete mode 100644 test/integration/tags/setup.sh delete mode 100644 test/integration/tags/test.json delete mode 100644 test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/tags2/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/tags2/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/tags2/expected/repo/.git_keep/config delete mode 100644 test/integration/tags2/expected/repo/.git_keep/description delete mode 100644 test/integration/tags2/expected/repo/.git_keep/index delete mode 100644 test/integration/tags2/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/tags2/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a delete mode 100644 test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/tags2/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/tags2/expected/repo/.git_keep/refs/tags/one delete mode 100644 test/integration/tags2/expected/repo/.git_keep/refs/tags/two delete mode 100644 test/integration/tags2/expected/repo/file0 delete mode 100644 test/integration/tags2/expected/repo/file1 delete mode 100644 test/integration/tags2/expected/repo/file2 delete mode 100644 test/integration/tags2/recording.json delete mode 100644 test/integration/tags2/setup.sh delete mode 100644 test/integration/tags2/test.json delete mode 100644 test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/tags3/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/tags3/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/tags3/expected/repo/.git_keep/config delete mode 100644 test/integration/tags3/expected/repo/.git_keep/description delete mode 100644 test/integration/tags3/expected/repo/.git_keep/index delete mode 100644 test/integration/tags3/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/tags3/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/46/b4990797fac897fb135dd639a4cad3b0269f2d delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/tags3/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/tags3/expected/repo/.git_keep/refs/heads/test delete mode 100644 test/integration/tags3/expected/repo/.git_keep/refs/tags/one delete mode 100644 test/integration/tags3/expected/repo/file0 delete mode 100644 test/integration/tags3/expected/repo/file1 delete mode 100644 test/integration/tags3/recording.json delete mode 100644 test/integration/tags3/setup.sh delete mode 100644 test/integration/tags3/test.json delete mode 100644 test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/tags4/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/tags4/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/tags4/expected/repo/.git_keep/config delete mode 100644 test/integration/tags4/expected/repo/.git_keep/description delete mode 100644 test/integration/tags4/expected/repo/.git_keep/index delete mode 100644 test/integration/tags4/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/tags4/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/tags4/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/tags4/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/tags4/expected/repo/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 delete mode 100644 test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 delete mode 100644 test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/tags4/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/tags4/expected/repo/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 delete mode 100644 test/integration/tags4/expected/repo/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 delete mode 100644 test/integration/tags4/expected/repo/.git_keep/packed-refs delete mode 100644 test/integration/tags4/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 delete mode 100644 test/integration/tags4/expected/repo/file0 delete mode 100644 test/integration/tags4/expected/repo/file1 delete mode 100644 test/integration/tags4/recording.json delete mode 100644 test/integration/tags4/setup.sh delete mode 100644 test/integration/tags4/test.json diff --git a/test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index e2129701f..000000000 --- a/test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file1 diff --git a/test/integration/tags/expected/repo/.git_keep/FETCH_HEAD b/test/integration/tags/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/tags/expected/repo/.git_keep/HEAD b/test/integration/tags/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/tags/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/tags/expected/repo/.git_keep/config b/test/integration/tags/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/tags/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/tags/expected/repo/.git_keep/description b/test/integration/tags/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/tags/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags/expected/repo/.git_keep/index b/test/integration/tags/expected/repo/.git_keep/index deleted file mode 100644 index 8112f33fcbcfa9ec346f1b859af99d095e24b41e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_M7!AI7Sc8EU^D|GGc#j~{VxWF#w834%r79Afz3k1>dJzDTHD?Q zA9~-p^yZ_zQ%!F%u%>0^q#6K?VPF91w|wgC2&19q{6;rt>7K`bRa0+#i3pA2$#=RC z;MLN76=IGd*qo3cS63iIlEFy9fa^lpnK=h$omzA`e^1razjn%Oo^FnOdQ13(y&`No QAF&_OTyM4XdGWoe0EbaW$N&HU diff --git a/test/integration/tags/expected/repo/.git_keep/info/exclude b/test/integration/tags/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/tags/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -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 diff --git a/test/integration/tags/expected/repo/.git_keep/logs/HEAD b/test/integration/tags/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index fafa3e62d..000000000 --- a/test/integration/tags/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 3e46e87f3ca37fad40d7dd6aca00223d7f49e424 CI 1631477191 -0300 commit (initial): file0 -3e46e87f3ca37fad40d7dd6aca00223d7f49e424 07b4cadb018ce914237e3f31ee264c9555acc1d1 CI 1631477191 -0300 commit: file1 diff --git a/test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index fafa3e62d..000000000 --- a/test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 3e46e87f3ca37fad40d7dd6aca00223d7f49e424 CI 1631477191 -0300 commit (initial): file0 -3e46e87f3ca37fad40d7dd6aca00223d7f49e424 07b4cadb018ce914237e3f31ee264c9555acc1d1 CI 1631477191 -0300 commit: file1 diff --git a/test/integration/tags/expected/repo/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 b/test/integration/tags/expected/repo/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 deleted file mode 100644 index a1fbbc5417f96a90a1b9193fe801089c2b565777..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 671 zcmV;Q0$}}k0gaN$uB%26K(pp6dXHXiL$|?5Nt6a-hKrepYwvK=3^o`u*}i=Ja}s5j zMQV9eB^{Lx?Ypj-!B!T2nMcMz0cD9&g;J>GG|$BXN#&W!xw0t>#6$!otY8TX+&v%J zZ3c*8iEZT)(HzNTUSL?rMIpU!ArwVa$R$=77BQDEbKQ?Xv%qhf^(TAf-MwYM(!Tox z2oe&oEDMSNen12v_oi>Dnf=f8>RwGv1%CWBs%}^=@C_eCmf?~(3H84@2RP6K#;Ovc zYJ?Q~M%TqdB&)IW5c6T!;|;2kO?_Ox4c*3j(&_vcr9`W)!M~gXx-IFC;PH{;29kcm zyl>a6KCdS-wiiuw)6)>B>y+L5$ z&5H?FNzh*hDtP<+Jeg^Mc0*Qnbl5%R+^^%Nf8vYh^c=WETTcm@F;x1_AYqMH^OZtk zABYj}yo4sFLKltTgi?jTur!k6Tt-stW8hdPk$4ged6)y%NCQ)eOtv#{dLum z6=SP)NZUt~6;8TEPjS&4EV#aI=;(+Oh1YtzhoTvon)xy{%KHmcmGu&S2isZxSymP F4aoD6Pxb%+ diff --git a/test/integration/tags/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/tags/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb|y2)08mZ`J^%m! diff --git a/test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 b/test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 deleted file mode 100644 index 7c9547938..000000000 --- a/test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 +++ /dev/null @@ -1,2 +0,0 @@ -xɮ@E+zo%4$ -`aG3?Ɔ(,RˣҽIfԧy2@dTư{S" r:$JshI,~e7I_%G۾ɾ$] E,K )7}}1UkDYl4,@媛($R2iy B"ؗcUeVVݒD1 {>uPVvmQ)Q\"qLVp7]D5ͩ|V#J,B̕ :7WkգhgˢTvEY/!#H1vJVӵ`2z\P5 VC{oqQO!{rnhDVL)rժm21Z熩%C!8/LVZ^WfẎ+7wOA-e|<&>د:\I].q>jӡզx{KC[Za3sd!j) lư-nnC5[a_!{4:C|7 Ѥa$:PMp2ISφe]7|R;CTw|LIGtF͉d"F{'⥶#e/j2AK \ No newline at end of file diff --git a/test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/tags/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/tags/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/tags/expected/repo/.git_keep/packed-refs b/test/integration/tags/expected/repo/.git_keep/packed-refs deleted file mode 100644 index 250f18738..000000000 --- a/test/integration/tags/expected/repo/.git_keep/packed-refs +++ /dev/null @@ -1 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted diff --git a/test/integration/tags/expected/repo/.git_keep/refs/heads/master b/test/integration/tags/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 5fe2e1847..000000000 --- a/test/integration/tags/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -07b4cadb018ce914237e3f31ee264c9555acc1d1 diff --git a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 deleted file mode 100644 index 5fe2e1847..000000000 --- a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 +++ /dev/null @@ -1 +0,0 @@ -07b4cadb018ce914237e3f31ee264c9555acc1d1 diff --git a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 deleted file mode 100644 index 5fe2e1847..000000000 --- a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 +++ /dev/null @@ -1 +0,0 @@ -07b4cadb018ce914237e3f31ee264c9555acc1d1 diff --git a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 deleted file mode 100644 index 34a63fe68..000000000 --- a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 +++ /dev/null @@ -1 +0,0 @@ -3e46e87f3ca37fad40d7dd6aca00223d7f49e424 diff --git a/test/integration/tags/expected/repo/file0 b/test/integration/tags/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/tags/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/tags/expected/repo/file1 b/test/integration/tags/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/tags/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/tags/recording.json b/test/integration/tags/recording.json deleted file mode 100644 index 2388dddb9..000000000 --- a/test/integration/tags/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":2009,"Mod":0,"Key":256,"Ch":52},{"Timestamp":2895,"Mod":0,"Key":256,"Ch":84},{"Timestamp":3851,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4233,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4248,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4436,"Mod":0,"Key":256,"Ch":103},{"Timestamp":4618,"Mod":0,"Key":256,"Ch":49},{"Timestamp":4751,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7572,"Mod":0,"Key":256,"Ch":84},{"Timestamp":7946,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8457,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8491,"Mod":0,"Key":256,"Ch":97},{"Timestamp":8665,"Mod":0,"Key":256,"Ch":103},{"Timestamp":8884,"Mod":0,"Key":256,"Ch":51},{"Timestamp":9219,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13521,"Mod":0,"Key":256,"Ch":84},{"Timestamp":15106,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15579,"Mod":0,"Key":256,"Ch":116},{"Timestamp":15604,"Mod":0,"Key":256,"Ch":97},{"Timestamp":15858,"Mod":0,"Key":256,"Ch":103},{"Timestamp":16298,"Mod":0,"Key":256,"Ch":50},{"Timestamp":16600,"Mod":0,"Key":13,"Ch":13},{"Timestamp":19216,"Mod":0,"Key":258,"Ch":0},{"Timestamp":19753,"Mod":0,"Key":256,"Ch":84},{"Timestamp":20673,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20918,"Mod":0,"Key":256,"Ch":116},{"Timestamp":20990,"Mod":0,"Key":256,"Ch":97},{"Timestamp":21124,"Mod":0,"Key":256,"Ch":103},{"Timestamp":21361,"Mod":0,"Key":256,"Ch":52},{"Timestamp":22463,"Mod":0,"Key":13,"Ch":13},{"Timestamp":23552,"Mod":0,"Key":256,"Ch":51},{"Timestamp":23909,"Mod":0,"Key":256,"Ch":93},{"Timestamp":24078,"Mod":0,"Key":256,"Ch":93},{"Timestamp":25170,"Mod":0,"Key":258,"Ch":0},{"Timestamp":25510,"Mod":0,"Key":256,"Ch":100},{"Timestamp":26316,"Mod":0,"Key":13,"Ch":13},{"Timestamp":28199,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":131,"Height":42}]} \ No newline at end of file diff --git a/test/integration/tags/setup.sh b/test/integration/tags/setup.sh deleted file mode 100644 index e878a9ed5..000000000 --- a/test/integration/tags/setup.sh +++ /dev/null @@ -1,18 +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 diff --git a/test/integration/tags/test.json b/test/integration/tags/test.json deleted file mode 100644 index 4d1d46ee2..000000000 --- a/test/integration/tags/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "basic CRUD for tags", "speed": 5 } diff --git a/test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index bfd6a6583..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file4 diff --git a/test/integration/tags2/expected/repo/.git_keep/FETCH_HEAD b/test/integration/tags2/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/tags2/expected/repo/.git_keep/HEAD b/test/integration/tags2/expected/repo/.git_keep/HEAD deleted file mode 100644 index 1adee3887..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -aefe968910ad84a58bfac631b56eb422968766fb diff --git a/test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD b/test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 1adee3887..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -aefe968910ad84a58bfac631b56eb422968766fb diff --git a/test/integration/tags2/expected/repo/.git_keep/config b/test/integration/tags2/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/tags2/expected/repo/.git_keep/description b/test/integration/tags2/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags2/expected/repo/.git_keep/index b/test/integration/tags2/expected/repo/.git_keep/index deleted file mode 100644 index 6125b7d75438de8692cecd0bf697648a7dc17494..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmZ?q402{*U|<4b=0v-=8P)~~TVON;BQrB&n)zb}hQ=j8=@$^pz-A$0b!EXnt!?ju z554bPdh^lVsiwCWSkp3dQVoE{Ffai1&t%l8e+Z+Y<~&6=XX&2De^pa&e2EB+;>mZq z5a89)eHCJkA>16MZ*C?ab3ioIocHMFNbvkHYEasD?&YdQ;Z^-Due9e|s6)�-F;O z!&Vy{~xKp}a@u)HRQF9f1>{etNW|R7X$yoQ=n6 FAplo-UZ4N~ diff --git a/test/integration/tags2/expected/repo/.git_keep/info/exclude b/test/integration/tags2/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -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 diff --git a/test/integration/tags2/expected/repo/.git_keep/logs/HEAD b/test/integration/tags2/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 0f088aab5..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 dcb11a2a23383bd5f4a1085bf3a64e73e5bd963a CI 1631477400 -0300 commit (initial): file0 -dcb11a2a23383bd5f4a1085bf3a64e73e5bd963a 56a89d6aebdfa4f2d717efc0d115656cc9b602e7 CI 1631477401 -0300 commit: file1 -56a89d6aebdfa4f2d717efc0d115656cc9b602e7 aefe968910ad84a58bfac631b56eb422968766fb CI 1631477401 -0300 commit: file2 -aefe968910ad84a58bfac631b56eb422968766fb 1750e9a4016c985ef97d002ae40ed554e3db6c87 CI 1631477401 -0300 commit: file4 -1750e9a4016c985ef97d002ae40ed554e3db6c87 aefe968910ad84a58bfac631b56eb422968766fb CI 1631477414 -0300 checkout: moving from master to one diff --git a/test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index be76b12b4..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 dcb11a2a23383bd5f4a1085bf3a64e73e5bd963a CI 1631477400 -0300 commit (initial): file0 -dcb11a2a23383bd5f4a1085bf3a64e73e5bd963a 56a89d6aebdfa4f2d717efc0d115656cc9b602e7 CI 1631477401 -0300 commit: file1 -56a89d6aebdfa4f2d717efc0d115656cc9b602e7 aefe968910ad84a58bfac631b56eb422968766fb CI 1631477401 -0300 commit: file2 -aefe968910ad84a58bfac631b56eb422968766fb 1750e9a4016c985ef97d002ae40ed554e3db6c87 CI 1631477401 -0300 commit: file4 diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 b/test/integration/tags2/expected/repo/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 deleted file mode 100644 index 9a8a3d3ddee79f89ebbd9e037ab92d08af96c4dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HAm0gaMN)3P=Ig}dfgWY2t+OM*Dlb_y|Ed=W2*3Om3AK_lP`5&ZR^ZKt~~ zdX~?57H4sahV!Zi=3M=ye^Lq{q)0Jf1`*Uv#xk866lMxjA%qBNR8tp=oG#{4n?32H z2N`8_VVDb5$u1_$keRcrFmyFX2F;7BD2<~KHMbCF6$cCgTK$ZMn0_vql(An!PBCL1U`-8k;Q=bXC5gvS_}A! zJuKhuqowfc!|`hoH>cZ3O#YzODM&kGMNU`UC~z4?iUbrV;Va*A-`Fk-8Ou-%*j0~T z#Ei819fb1x`hpEtZ2U0Eo2(DUa3T$6!uFO%fBu$0xwJbK83@kty+-l&G0na=TTIhB zh*O>lv~`7xjPFo;H*RDh%_cN?;e9;!CNk7kD4WY|+s&~ZE#08nZNMgRZ+ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb|y2)08mZ`J^%m! diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/tags2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9c4f795126961919183ac72602b03cfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKHUpUta%rtH}p{!IU+2A0w-|-$4~>FNVkAI zOBn{Um_=xd(wr|i%)l+576=O*5fS0jToMqb@NFsk38*Ics+vE@6SqS{zGQv-9WVl7 zI8o#v13p6pA@!zjQ49Ic^UH9Vs|)!2dlbzu58z~+fM*&9*$-Up52pYHD#v&!vaG1G zoa>dQv3pNc{N0_!zg`vvHftMOhWOyUFpw?THJgq7 zQHKL$9FALjw5Dr&F7%0uY6n7T_goRmE5q0nk%BX8M}Z(woYM^<8geOf&_dCXR2q7h z-q+USA-?PD!)4B=vf27D8|&RBvD;0)tn6LgG`{CjAf8vn+PiRao~<(1A>5g6yhlS( z#Ae8lamMB1E`*r}mx##aqc!-?|5Lo%O39iDQnl;u$m*XAj(290M z9lK{8Ty4V(jzYk%;zz|Yh02duOV%r)0I@?;R5x8p{6tPYL$LHtkFIfj3~tHl$MeYx zZ}gldaV^-RI9vX(AD2EnvD=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb b/test/integration/tags2/expected/repo/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb deleted file mode 100644 index 58c8a404a3aed46571a2608229f45402a01a488e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 673 zcmV;S0$%-i0gaN$lAA~XM1AHf>Q2}yilvH(vBPX)YmktDmUJtiSVV&WA%yky?wJYS z<}i7Dk%yNNncupunE}DVmw93gsEiPbVUd%9prSyu%*sNB0#;aw2@?oGVwR(v8|cLP z8ORDHYN1e;6(yBQRA2$KGKYmA$cn7wxtb{uG0f4&T;C>OxZp3t{mE9^4Ik`Ve(Qb! zK@kNBV+ji2D-HM+8mfC!fv1~FWd5@t=3umX=pX0YNJ1#1D2=wUG&s$mC;=e z8(cx}xF`Er5AwlVp0Erhl#xZ(Pp?`@&sBrdir7;9+MOek+$je(@n&3oaUGK`sh3`v zqsM_dy3)n3#~Rt|iSQRVkf3awxyO#}j!)0OiHUdhVq;oD4!GrIdeQnOQa(U!7nNa^ z7|fnkzf$x0P+nl#z4SI%`u(prmRaUizeA#gYxy#6mM?Jtxk6jSx5XE=elD4FWOX+_ z_bS~;NtyE7P}=Y^jUH1$XxHd`AauLXydK^a{!+)j%z>(LvsTEDOM^SL5ysc^(ysl^ z679$wEnj(;KBnzksPkqcr~U8@9cyP=o3Z8N2A?%wJEmsv_j0nBJKn90D7;WF9SfB_r6zF!jct`}X) zqmoK0o#NT|?F@KG{V`7n0TNM&<#Is~%A904HY-Vl2tKdqihy}pK>^VMO+zeO=H@v8 z*#LjZ#y{wj^}`+gSv>o{0m)J%&2cnAfNumv5ZD*}8kx~=*6X2uwKe$mZzM%CY~X4x z@D0rtgV0m{;~2m|d(n1D6eU>{OSM%LX!)EJoL88Qqe?SW9WqU_Y?@-ys@N-sc&J6W zzFmHD3@9ceEcILLJ^A%IF98>teM-QixY-{wEy#DiUiE!RV8_)K@28BjqxS)-OW|~G zwkjBq@hQHo@UZHc+$k2$k&V77yvU4KaxP*iI>X}{39Z!{R7Kgu*9jpZk0&p_V<5ks z&%4z!9!Eet&Gq`Oj_ zN0!jknKVRuSu#=&@hM@RrEdi7$%V?tH9Kc=N`(;IrX0tsqL)d}uU?OVPOd|1KP9VO z|U@PA%J|tA(jK!R67T!8Ld}C#J}pcAiqD)!B~1hyfDUqu!~n82H{Z Yk&6BApkg0?Wgu3ycSK-607FgxqYqL#%K!iX diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/tags2/expected/repo/.git_keep/refs/heads/master b/test/integration/tags2/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index dae416f06..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -1750e9a4016c985ef97d002ae40ed554e3db6c87 diff --git a/test/integration/tags2/expected/repo/.git_keep/refs/tags/one b/test/integration/tags2/expected/repo/.git_keep/refs/tags/one deleted file mode 100644 index 1adee3887..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/refs/tags/one +++ /dev/null @@ -1 +0,0 @@ -aefe968910ad84a58bfac631b56eb422968766fb diff --git a/test/integration/tags2/expected/repo/.git_keep/refs/tags/two b/test/integration/tags2/expected/repo/.git_keep/refs/tags/two deleted file mode 100644 index 079680fa6..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/refs/tags/two +++ /dev/null @@ -1 +0,0 @@ -56a89d6aebdfa4f2d717efc0d115656cc9b602e7 diff --git a/test/integration/tags2/expected/repo/file0 b/test/integration/tags2/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/tags2/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/tags2/expected/repo/file1 b/test/integration/tags2/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/tags2/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/tags2/expected/repo/file2 b/test/integration/tags2/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/tags2/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/tags2/recording.json b/test/integration/tags2/recording.json deleted file mode 100644 index 49b66b6ea..000000000 --- a/test/integration/tags2/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":325,"Mod":0,"Key":256,"Ch":52},{"Timestamp":688,"Mod":0,"Key":256,"Ch":106},{"Timestamp":1081,"Mod":0,"Key":256,"Ch":84},{"Timestamp":1671,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2002,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2100,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2164,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2243,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2850,"Mod":0,"Key":256,"Ch":106},{"Timestamp":3524,"Mod":0,"Key":256,"Ch":84},{"Timestamp":4057,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4418,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4482,"Mod":0,"Key":256,"Ch":119},{"Timestamp":4509,"Mod":0,"Key":256,"Ch":111},{"Timestamp":4836,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7822,"Mod":0,"Key":256,"Ch":107},{"Timestamp":8408,"Mod":0,"Key":256,"Ch":103},{"Timestamp":10049,"Mod":0,"Key":27,"Ch":0},{"Timestamp":10619,"Mod":0,"Key":256,"Ch":51},{"Timestamp":11391,"Mod":0,"Key":256,"Ch":93},{"Timestamp":11573,"Mod":0,"Key":256,"Ch":93},{"Timestamp":13390,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16819,"Mod":0,"Key":256,"Ch":93},{"Timestamp":16985,"Mod":0,"Key":256,"Ch":93},{"Timestamp":17905,"Mod":0,"Key":256,"Ch":103},{"Timestamp":20817,"Mod":0,"Key":13,"Ch":13},{"Timestamp":25557,"Mod":0,"Key":256,"Ch":50},{"Timestamp":25951,"Mod":0,"Key":256,"Ch":49},{"Timestamp":26265,"Mod":0,"Key":256,"Ch":51},{"Timestamp":26990,"Mod":0,"Key":256,"Ch":91},{"Timestamp":27245,"Mod":0,"Key":256,"Ch":91},{"Timestamp":28363,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":131,"Height":42}]} \ No newline at end of file diff --git a/test/integration/tags2/setup.sh b/test/integration/tags2/setup.sh deleted file mode 100644 index 8806332fd..000000000 --- a/test/integration/tags2/setup.sh +++ /dev/null @@ -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 diff --git a/test/integration/tags2/test.json b/test/integration/tags2/test.json deleted file mode 100644 index 595398f37..000000000 --- a/test/integration/tags2/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "checking out and resetting to tags", "speed": 10 } diff --git a/test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index bfd6a6583..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file4 diff --git a/test/integration/tags3/expected/repo/.git_keep/FETCH_HEAD b/test/integration/tags3/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/tags3/expected/repo/.git_keep/HEAD b/test/integration/tags3/expected/repo/.git_keep/HEAD deleted file mode 100644 index cea9d05ed..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/test diff --git a/test/integration/tags3/expected/repo/.git_keep/config b/test/integration/tags3/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/tags3/expected/repo/.git_keep/description b/test/integration/tags3/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags3/expected/repo/.git_keep/index b/test/integration/tags3/expected/repo/.git_keep/index deleted file mode 100644 index 7bdcb3c688fb937444d93099c970e708b8ad4462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_M7xAVsx>R7!Dt3XW@g4T3rPls#w834%r79Afz3k1>dJzDTHD?Q zA9~-p^yZ_zQ%!F%u%>0^q#6K?VPF91S9i;M38SIrNTHjvbkF0zs;M`=M1)51 1631477922 -0300 commit (initial): file0 -46b4990797fac897fb135dd639a4cad3b0269f2d 88d7a40883abd57297127b3777a2a7ec3696c33a CI 1631477922 -0300 commit: file1 -88d7a40883abd57297127b3777a2a7ec3696c33a 08c28e4e15f3de3b024524894d9235dfcdb48c19 CI 1631477922 -0300 commit: file2 -08c28e4e15f3de3b024524894d9235dfcdb48c19 2515eabac6791725f4a3326676a1491f09664afc CI 1631477922 -0300 commit: file4 -2515eabac6791725f4a3326676a1491f09664afc 88d7a40883abd57297127b3777a2a7ec3696c33a CI 1631477929 -0300 checkout: moving from master to test diff --git a/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 313c3bbc0..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 46b4990797fac897fb135dd639a4cad3b0269f2d CI 1631477922 -0300 commit (initial): file0 -46b4990797fac897fb135dd639a4cad3b0269f2d 88d7a40883abd57297127b3777a2a7ec3696c33a CI 1631477922 -0300 commit: file1 -88d7a40883abd57297127b3777a2a7ec3696c33a 08c28e4e15f3de3b024524894d9235dfcdb48c19 CI 1631477922 -0300 commit: file2 -08c28e4e15f3de3b024524894d9235dfcdb48c19 2515eabac6791725f4a3326676a1491f09664afc CI 1631477922 -0300 commit: file4 diff --git a/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test b/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test deleted file mode 100644 index 6c2eada73..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 88d7a40883abd57297127b3777a2a7ec3696c33a CI 1631477929 -0300 branch: Created from 88d7a40883abd57297127b3777a2a7ec3696c33a diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 b/test/integration/tags3/expected/repo/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 deleted file mode 100644 index 76468e806142ea3a23b298c306bd130a7f624953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 671 zcmV;Q0$}}k0gaMLud7B7g|p^Y^xk^8K!dw2B~h3S_%hgFWAB(}F!S*1pOYxNEK>QEJ>kboFE)i7}GEa>5zE)ecXHw zafEz^#2ETP#3K5HC>jM2A>`9OibHrj9YY9x!k@;h?SY_z-vsr~c=hXd75^Hx^&fyb zLW)7?MAP602}zRp(2uDx{-5&noep^le*87Oq^Jh46bsx`#o!$GD*ep~K!DsP(|*^<3=312&7RYyNE#z^wRCvuDkr3+{VylLXH&Jy!Yy}g{xVUm z>a}NC7PWF^N*x4KmSmOooCY2m!I9E?CY?p;G_SJE`@Awr1W@^_HMP#9!A_1@$6I3N zvdo;0+VFatv!Qy}o%Klf`zn0X!|aw?=8TQ8jJ=-cM|vPY;YNw1J+(4ZdG~b{gJ|;7 z%P7h_AIQTCDOh(Hava>)Gga2t>m+aet7nuA`xLh5Nr1?24`r0!mdOe{>1Y&YEv!$h zzQSBD-taQJZ-2>XVLhUJTh~Xa3`M!%U9V!DYW>fL>FaGIO~^F3#A${KxWk66Pg}X2 zFWm_e9rPF#`MrKiJ}E@l%iJupQX}dcR>%x%`ZVvhB=02I zXiI_2^86@;z3SjVx#7Tj;??-RS8~slAw_^>RW@_Co1prdEvpc&0`D2}03R58x2lOW zSmfeRXok>2!z^N4b&8mkTZPeK8z+YVw!Jp4`?#p*;G&dblXkNG?n1p|hTgj}(}B8E z^>L}$Y^jXy$iBjZguM)z4O>1T;t8-M+#z^X907iRc4wCOr-PCq{#OHuB(Gwc_zBL* F5*v$&TsQy# diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc b/test/integration/tags3/expected/repo/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc deleted file mode 100644 index 79c61955970160da7c022c0172ac6fa585d3345c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 675 zcmV;U0$lxg0gaN&(xONZg=fuEus3>yqKZpIPe&L0fS?wjpx_RnxGM-K$kVqy6SJGe zkFlqeg^(gngfT==kh3fns7PVVWjursAwU7IC|9aTOc(d` zKC+yg0GUF{qfAJtaOD6*0LltX6(FEAOVTTp6JBBB=UB8ot6A)K&H72__|`S_&!oNm zV0lsCp(H5)u-`a=lp_wvwM-5SYFMNW(9@HySz7yIt@B;@iTTo|_3ESIeG=ADcCgLiCQ zE_j49Y1Y#@vv9d}NP9)=hoIoe+s&9tXo+O zBhPthc^)`bJ?0XOxTbYgU-flkR!gC-Z*6QpCeBmCo?%yU^lZ8@C^w4M*Qb@JbmQx& zzuzmlBJXHZr$ZkG6Pj+Rl+LpALdz?e!?`RdKX{(@`LN0EYp_2cOAs{r(5!x5Z>P&U zD_!4;-1H`AMj$*lhN!5`MXSLcr)ejGhT8|U{K5?T>U*_Qv?`hoK%gh{l|O(~!OcnQ zLLz;&Ap*Q?E%jyM^HZ^mBzO`JMK!;%L)X42pEQva@6#qTknVYFaELImoM>0J&n52U ztW3V#C9m3PwKev`Ip`eV?5atfF2!h?+u-8@$M>zO4<9vunUyFp|8!6%U;ouWCMz2X JnO}Qh4wx*AR@VRk diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb|y2)08mZ`J^%m! diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/tags3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9c4f795126961919183ac72602b03cfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKHUpUta%rtH}p{!0)+i|0gaN$j+;OLM04gV`fep|b|WQG0J9qp3_CY$n#Js9HD8}eqTF&w9iK`n zmGtgi)07i95#*=oi4edMi5T|Aaa?-CX_iS+93gnRWmE=N< zd=<4HXiJ*DMqln-^Bv#}iBl}g5d`=QNeHnI`Y|%0|E%YIK9)K7{40W_Xjfn<7H~A> z%DdjX^qXS<1EsC(0?!K~&!=)JNrdUJf_qtrWEf7#LcPmRJ6g;@CElbGh9fhbUJl{I(u8M0aq)jWy69Wwu6$ zfw6!gy~>u_oE&ezP{&mPHmZr9@`>6q67Pjfls8ErZq=>`Kx zyTjx(popl%C~_-Y4tN+QZF@zV)~1;>rPm;p`D8jVX81%^TuX`=>?i3_G}c&Pz%7!| zYjx{6>hWDj+phGYpq)0mjZ4V#b)&wLT&?KU7v$|VKbUiB$(&Vhu2Q|t&5D6%+Gl>6 zbZr)kn$P35==zr9-}_-VqMNFwy3@J))pOZ{cW-vKREU5hWLPjrz1Ty5fuqQITd2P= zY+rb$JBaEm&yLrj%QjS7z0j+A(-?AJY?VE#{Md7(cwwuBu@l0?osSp6xV^J2H3^ip z9kX13J2#5~r$jAOTbyn}zIN_-5zbA+Cg(>n_H)+s2Quj5`0+Xq7%=>bOOP6MYEu>T zJEe-pJvA3=*Iz!x#p47yG1iZ-d*r1aA?T5>^77-cZcI3z*RzBHNb5B@ED;92J;koa V{x~RI&;K$I%gP!->?f0?17iosJ6!+( diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a b/test/integration/tags3/expected/repo/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a deleted file mode 100644 index c4f33543e3c6605bd0595676e45811d34dbfb8bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 675 zcmV;U0$lxg0gaN$uB%2AMKk6rYK~qERkTtP1u$T)P3vnLJS(7RY%q=Kzy3LiGRq)m za0W|TTSrGLY3jNhfF!cN3_T$rWkexKWii8v^w}|s_%s!ejJX7-C}yA_XE3GkI226}GzHU_a)H(<`ken>6@FX zD5|C?sZr`Ww9lgYeVQQdI)md;e&LH~TuuFpGn87Vqobv0`P2WGQ$YU`_2)dv2hv<# z>aDh_my3lk3w!4ek_zrK9~uZ56FP3MB8-kXroe!}pXh!x$!W z9eR1}6m=Qw@qE&Rj90tYH8X-Y)Q97+$O7^wFYr2%;~H+*Q=lhzVJyPJf>JF@ZsyS8 z=-PcGNUFz~ioGqWbGxeYd_0N6Tn6WPBF4h3=OVo0$81nQ!Q8HVqntm8+v$Qfe#+-; zNBqD$#_o)yAzR+NoUb@m$8>z?7N}dzWrVI{?}u9`QJ^`O&=D=ZyWEqgXrD4&+KJ2e z{4>%bn?|qtSZGQ&F*-3#wSQEOo$j-Pe^}M?u)bCbcxB~FiZu==^6qT?(DBdi9`th_ z1-TYq6Jkq`%_n)`p4$EW5!>&WzO&V&MX#!b=<~@2;jddh8za6Lk7{je?QHImT;Y~w zG<}18cXgoWZz_E?7JAyodmTGowr3U-rAv({AksJWM(585Z;`;u1IOKkmq=DtWvUO} z>zph_moE#0nYlPJ_ilN(vsB$A8uH;>wHpQC40j>93KaOAJAYf$KMv~7{=W>Qva%v9 J^%INo5U|yMQjP!s diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/tags3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06dda15fe1901a7942e7954b700b36bfa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/tags3/expected/repo/.git_keep/refs/heads/master b/test/integration/tags3/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 0bcc4f3ee..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -2515eabac6791725f4a3326676a1491f09664afc diff --git a/test/integration/tags3/expected/repo/.git_keep/refs/heads/test b/test/integration/tags3/expected/repo/.git_keep/refs/heads/test deleted file mode 100644 index 6be0d41dc..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -88d7a40883abd57297127b3777a2a7ec3696c33a diff --git a/test/integration/tags3/expected/repo/.git_keep/refs/tags/one b/test/integration/tags3/expected/repo/.git_keep/refs/tags/one deleted file mode 100644 index d62cf9b9d..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/refs/tags/one +++ /dev/null @@ -1 +0,0 @@ -08c28e4e15f3de3b024524894d9235dfcdb48c19 diff --git a/test/integration/tags3/expected/repo/file0 b/test/integration/tags3/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/tags3/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/tags3/expected/repo/file1 b/test/integration/tags3/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/tags3/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/tags3/recording.json b/test/integration/tags3/recording.json deleted file mode 100644 index 483f51ab7..000000000 --- a/test/integration/tags3/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":549,"Mod":0,"Key":256,"Ch":52},{"Timestamp":1242,"Mod":0,"Key":256,"Ch":106},{"Timestamp":1503,"Mod":0,"Key":256,"Ch":84},{"Timestamp":1820,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2800,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2874,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2957,"Mod":0,"Key":256,"Ch":101},{"Timestamp":3448,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3962,"Mod":0,"Key":256,"Ch":51},{"Timestamp":4279,"Mod":0,"Key":256,"Ch":93},{"Timestamp":4429,"Mod":0,"Key":256,"Ch":93},{"Timestamp":4896,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5541,"Mod":0,"Key":256,"Ch":106},{"Timestamp":6284,"Mod":0,"Key":256,"Ch":110},{"Timestamp":6690,"Mod":0,"Key":256,"Ch":116},{"Timestamp":6755,"Mod":0,"Key":256,"Ch":101},{"Timestamp":6826,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6904,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7213,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8557,"Mod":0,"Key":256,"Ch":106},{"Timestamp":8743,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":211,"Height":42}]} \ No newline at end of file diff --git a/test/integration/tags3/setup.sh b/test/integration/tags3/setup.sh deleted file mode 100644 index 8806332fd..000000000 --- a/test/integration/tags3/setup.sh +++ /dev/null @@ -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 diff --git a/test/integration/tags3/test.json b/test/integration/tags3/test.json deleted file mode 100644 index e376ed544..000000000 --- a/test/integration/tags3/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "viewing commits of tags", "speed": 10 } diff --git a/test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index e2129701f..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file1 diff --git a/test/integration/tags4/expected/repo/.git_keep/FETCH_HEAD b/test/integration/tags4/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/tags4/expected/repo/.git_keep/HEAD b/test/integration/tags4/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/tags4/expected/repo/.git_keep/config b/test/integration/tags4/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/tags4/expected/repo/.git_keep/description b/test/integration/tags4/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags4/expected/repo/.git_keep/index b/test/integration/tags4/expected/repo/.git_keep/index deleted file mode 100644 index 48e219dd6b89210501c1d679b806dd8477bf0b3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_M7!vl95RdiU^D|GGc&_2Z8rvn#w834%r79Afz3k1>dJzDTHD?Q zA9~-p^yZ_zQ%!F%u%>0^q#6K?VPF91=X{ni4@N`H@jy3c>7K`bRa0+#i3pA2$#=RC z;MLN76=IGd*qo3cS63iIlEFy9fa^lpnK=h$omzA`e^1razjn%Oo^Fm$8d%;dA68v= QnCs@BUN0xZc!qO40L)@XQ~&?~ diff --git a/test/integration/tags4/expected/repo/.git_keep/info/exclude b/test/integration/tags4/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +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] -# *~ diff --git a/test/integration/tags4/expected/repo/.git_keep/logs/HEAD b/test/integration/tags4/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 7544ecd9d..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f04e94a59e6159acf554fc1268742df10fe6b0d3 CI 1631476697 -0300 commit (initial): file0 -f04e94a59e6159acf554fc1268742df10fe6b0d3 3a64c1649510c0dcaca3815291e3d43980f1bb99 CI 1631476697 -0300 commit: file1 diff --git a/test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 7544ecd9d..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f04e94a59e6159acf554fc1268742df10fe6b0d3 CI 1631476697 -0300 commit (initial): file0 -f04e94a59e6159acf554fc1268742df10fe6b0d3 3a64c1649510c0dcaca3815291e3d43980f1bb99 CI 1631476697 -0300 commit: file1 diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags4/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags4/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb|y2)08mZ`J^%m! diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 b/test/integration/tags4/expected/repo/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 deleted file mode 100644 index 25a275337756aeb28dd63d8ff93c90d3f6c9d7ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 673 zcmV;S0$%-i0gaN$4y#5GMYHBBdXHYr&@><=Q81GYn8APz?4TKpnGM+3U;ms$*=3Ph z9@W(?sSX~xu3mt^)4wc_q5wI?BaB6iDKW)q%H%96Gt8$VSLSTNuoQwKM35%N^ilK+ zC@ENoFy+Jo(cCvuavUr%%^-n?OkUDdS)h!{St4DR+wcJL5&R|}|17q&8{6VnJam5m z8nHCw5fXXugJLO)_|orDOYuL~tFfBv3jFwM_NsogfvdZ~KkBv=glF|{P5=Vbp8nZO z(q5LNT&q=;Ir;oPu%1jhO&a9bD&%hQ`qotgYEq|?SFw@gs`38i1W*kGUGF6^{%H5U z(l|8Y9UN4aCO&T;mMzj`%RD=SRxUHV-gI5!%NH%%U4sua4;ulJdx1Q?b!|#E+bKNJ z{V49vA5y<(+w^hl(azj)emuiN#H}ZKT&*RuG;)7lJQdydDFK$VeYrDi?_A+fKO5+n zrJ>!7__Cl@{7li@lf8LNjL?rugvns!jFTT)ucGc4W+_hukacegqJvpq)uTq0z9TBm zv^rFnjrT?nSkm9otI4siA!fQg`QbCiA$cQ!pq#IR-eW84HlySq-UYL2R&5e)tpCE} zA>me}9FihX@X)?;-D#s43R`N-jWCw+_nU|s6o=gt;P;*~BH|whRa^Nl1BtS33!3-| Hx5N&z0+&(- diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 b/test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 deleted file mode 100644 index ffbba8d79..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]&M1&1(6 -3P7T`;!bO(8 ہ.8RϪ K)jj6\o.KMyK.Nh?+h'i \ No newline at end of file diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags4/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 b/test/integration/tags4/expected/repo/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 deleted file mode 100644 index 59aa04b0e19f6e87bd87f806956dd7a749697c18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmV-{0Dk{?0Tql(4#FT509|v6cLB|N7$zw72rfQD diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 b/test/integration/tags4/expected/repo/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 deleted file mode 100644 index e15c21c24c5235564ba16e944388c150725dd49c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YK^0gaN$uA4v*MYHBBdT%8UFjGrO6u=Dzj0eDAvtwumLz}@&_SeTrlwB67 z{xhcKvDSF$N4?V?m4|glWw1q7bDF#5Tnz0abkmFb?8i%6k zfog!Ss__Fa5ov4uC27cazzA!G69oZ^;4{6ZY3fbiAp`!;^}Nj=Wez_78U^Xb9vt-} za1DJgduIpz<`kendD35sEGw!kr&@^+YrCT2?It$rI*sGk`I#@S<5Nc_r^y7Z0$9mv zUY-7O3LsOkule-h#2Nc?^|Ncdrj5VpR55Utk4>d&((Q-}Vm~(SViEIHF}>NY2Q<~=HOmycOt`VeZSA;n%>?Mv|1gO>ta=M`XMrh zNTR@S=%3>)n>=yfKJGo~FWo~!;>R=Ojk6=gtH^Boa}~~A-7`M9G1GvznMf-<1?sDh zhror}E;E(aNq@3q+Rp1SFyPI*D)jYvDIC7NMwZV8ez4`5OEwTED*A;N=wZU0JZ6ryqhUF~rRX{Q$UadJAZ^Q8(bJJuy-1~}Vb9-JIub{v; Ze~2>bkArBx`ImuIR@RuNegcZa1OzUcKXCv6 diff --git a/test/integration/tags4/expected/repo/.git_keep/packed-refs b/test/integration/tags4/expected/repo/.git_keep/packed-refs deleted file mode 100644 index 250f18738..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/packed-refs +++ /dev/null @@ -1 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted diff --git a/test/integration/tags4/expected/repo/.git_keep/refs/heads/master b/test/integration/tags4/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 2a642862a..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -3a64c1649510c0dcaca3815291e3d43980f1bb99 diff --git a/test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 b/test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 deleted file mode 100644 index 131e3c98f..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 +++ /dev/null @@ -1 +0,0 @@ -db03048dbacea165536b49c030c9aaca108cc571 diff --git a/test/integration/tags4/expected/repo/file0 b/test/integration/tags4/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/tags4/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/tags4/expected/repo/file1 b/test/integration/tags4/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/tags4/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/tags4/recording.json b/test/integration/tags4/recording.json deleted file mode 100644 index 4c7e689c5..000000000 --- a/test/integration/tags4/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":928,"Mod":0,"Key":256,"Ch":52},{"Timestamp":1864,"Mod":0,"Key":256,"Ch":84},{"Timestamp":2752,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2936,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5085,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5306,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5392,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5526,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5754,"Mod":0,"Key":256,"Ch":49},{"Timestamp":5983,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7385,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7489,"Mod":0,"Key":256,"Ch":97},{"Timestamp":7808,"Mod":0,"Key":256,"Ch":103},{"Timestamp":7911,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8171,"Mod":0,"Key":256,"Ch":109},{"Timestamp":8240,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8404,"Mod":0,"Key":256,"Ch":115},{"Timestamp":8572,"Mod":0,"Key":256,"Ch":115},{"Timestamp":8656,"Mod":0,"Key":256,"Ch":97},{"Timestamp":8749,"Mod":0,"Key":256,"Ch":103},{"Timestamp":8832,"Mod":0,"Key":256,"Ch":101},{"Timestamp":10162,"Mod":0,"Key":256,"Ch":33},{"Timestamp":10432,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11766,"Mod":0,"Key":256,"Ch":106},{"Timestamp":13092,"Mod":0,"Key":256,"Ch":84},{"Timestamp":14177,"Mod":0,"Key":258,"Ch":0},{"Timestamp":14482,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15660,"Mod":0,"Key":256,"Ch":97},{"Timestamp":15783,"Mod":0,"Key":256,"Ch":116},{"Timestamp":15857,"Mod":0,"Key":256,"Ch":97},{"Timestamp":15991,"Mod":0,"Key":256,"Ch":103},{"Timestamp":17243,"Mod":0,"Key":256,"Ch":50},{"Timestamp":17536,"Mod":0,"Key":13,"Ch":13},{"Timestamp":19574,"Mod":0,"Key":256,"Ch":115},{"Timestamp":19641,"Mod":0,"Key":256,"Ch":101},{"Timestamp":19834,"Mod":0,"Key":256,"Ch":99},{"Timestamp":19863,"Mod":0,"Key":256,"Ch":111},{"Timestamp":19958,"Mod":0,"Key":256,"Ch":110},{"Timestamp":20013,"Mod":0,"Key":256,"Ch":100},{"Timestamp":20092,"Mod":0,"Key":256,"Ch":32},{"Timestamp":20181,"Mod":0,"Key":256,"Ch":109},{"Timestamp":20265,"Mod":0,"Key":256,"Ch":101},{"Timestamp":20436,"Mod":0,"Key":256,"Ch":115},{"Timestamp":20590,"Mod":0,"Key":256,"Ch":115},{"Timestamp":20675,"Mod":0,"Key":256,"Ch":97},{"Timestamp":20706,"Mod":0,"Key":256,"Ch":103},{"Timestamp":20805,"Mod":0,"Key":256,"Ch":101},{"Timestamp":21237,"Mod":0,"Key":13,"Ch":13},{"Timestamp":22701,"Mod":0,"Key":256,"Ch":51},{"Timestamp":23066,"Mod":0,"Key":256,"Ch":93},{"Timestamp":23235,"Mod":0,"Key":256,"Ch":93},{"Timestamp":24842,"Mod":0,"Key":256,"Ch":106},{"Timestamp":25574,"Mod":0,"Key":256,"Ch":100},{"Timestamp":26166,"Mod":0,"Key":13,"Ch":13},{"Timestamp":27722,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":211,"Height":42}]} \ No newline at end of file diff --git a/test/integration/tags4/setup.sh b/test/integration/tags4/setup.sh deleted file mode 100644 index e878a9ed5..000000000 --- a/test/integration/tags4/setup.sh +++ /dev/null @@ -1,18 +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 diff --git a/test/integration/tags4/test.json b/test/integration/tags4/test.json deleted file mode 100644 index 26a2080c6..000000000 --- a/test/integration/tags4/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "annotated tag CRUD", "speed": 5 }