diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-06 14:53:12 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-06 19:34:32 +1000 |
commit | a3b0efb82e5a1883d0d89fa48a718858427daf49 (patch) | |
tree | 380041e56bab8807ac4d846d89c2d483d3f95d31 | |
parent | bde324820d9d429ce4f70c6e26a00cff717adab1 (diff) |
branch rename test
29 files changed, 69 insertions, 0 deletions
diff --git a/test/integration/branchRename/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchRename/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..dc3ab4abe --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file0 diff --git a/test/integration/branchRename/expected/.git_keep/FETCH_HEAD b/test/integration/branchRename/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/FETCH_HEAD diff --git a/test/integration/branchRename/expected/.git_keep/HEAD b/test/integration/branchRename/expected/.git_keep/HEAD new file mode 100644 index 000000000..aa0269237 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/123 diff --git a/test/integration/branchRename/expected/.git_keep/config b/test/integration/branchRename/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/config @@ -0,0 +1,10 @@ +[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/branchRename/expected/.git_keep/description b/test/integration/branchRename/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/branchRename/expected/.git_keep/index b/test/integration/branchRename/expected/.git_keep/index Binary files differnew file mode 100644 index 000000000..632a20b0c --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/index diff --git a/test/integration/branchRename/expected/.git_keep/info/exclude b/test/integration/branchRename/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# 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/branchRename/expected/.git_keep/logs/HEAD b/test/integration/branchRename/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..87d65794d --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/HEAD @@ -0,0 +1,11 @@ +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 commit (initial): file0 +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 checkout: moving from master to new-branch +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 checkout: moving from new-branch to new-branch-2 +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 checkout: moving from new-branch-2 to new-branch-3 +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 checkout: moving from new-branch-3 to old-branch +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 checkout: moving from old-branch to old-branch-2 +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 checkout: moving from old-branch-2 to old-branch-3 +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 0000000000000000000000000000000000000000 CI <CI@example.com> 1617684766 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/old-branch-10 +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684766 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/old-branch-10 +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684766 +1000 checkout: moving from old-branch-10 to old-branch-10 +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684772 +1000 checkout: moving from old-branch-10 to 123 diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/123 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/123 new file mode 100644 index 000000000..b4049fb5c --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/123 @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 branch: Created from HEAD +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684772 +1000 Branch: renamed refs/heads/old-branch-2 to refs/heads/123 diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/master b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..148b5a5f5 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 commit (initial): file0 diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch new file mode 100644 index 000000000..2a601361e --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-2 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-2 new file mode 100644 index 000000000..2a601361e --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-2 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-3 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-3 new file mode 100644 index 000000000..2a601361e --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-3 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch new file mode 100644 index 000000000..2a601361e --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-10 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-10 new file mode 100644 index 000000000..83fdd2e00 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-10 @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684760 +1000 branch: Created from HEAD +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI <CI@example.com> 1617684766 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/old-branch-10 diff --git a/test/integration/branchRename/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/branchRename/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 Binary files differnew file mode 100644 index 000000000..79fcadf67 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/branchRename/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/branchRename/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da Binary files differnew file mode 100644 index 000000000..06c9cb73d --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/branchRename/expected/.git_keep/objects/76/4ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 b/test/integration/branchRename/expected/.git_keep/objects/76/4ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 Binary files differnew file mode 100644 index 000000000..8c2e1bca0 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/objects/76/4ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/123 b/test/integration/branchRename/expected/.git_keep/refs/heads/123 new file mode 100644 index 000000000..50a1aeda5 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/123 @@ -0,0 +1 @@ +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/master b/test/integration/branchRename/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..50a1aeda5 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch new file mode 100644 index 000000000..50a1aeda5 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch @@ -0,0 +1 @@ +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-2 b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-2 new file mode 100644 index 000000000..50a1aeda5 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-2 @@ -0,0 +1 @@ +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-3 b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-3 new file mode 100644 index 000000000..50a1aeda5 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-3 @@ -0,0 +1 @@ +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch b/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch new file mode 100644 index 000000000..50a1aeda5 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch @@ -0,0 +1 @@ +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-10 b/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-10 new file mode 100644 index 000000000..50a1aeda5 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-10 @@ -0,0 +1 @@ +764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/file0 b/test/integration/branchRename/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/branchRename/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/branchRename/recording.json b/test/integration/branchRename/recording.json new file mode 100644 index 000000000..61cf2bea0 --- /dev/null +++ b/test/integration/branchRename/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":550,"Mod":0,"Key":259,"Ch":0},{"Timestamp":919,"Mod":0,"Key":256,"Ch":82},{"Timestamp":1568,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1792,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1984,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2152,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2304,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2464,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2624,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2800,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2968,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3151,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3327,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3512,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3696,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3872,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4064,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4743,"Mod":0,"Key":127,"Ch":127},{"Timestamp":5112,"Mod":0,"Key":256,"Ch":49},{"Timestamp":5208,"Mod":0,"Key":256,"Ch":48},{"Timestamp":5543,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6256,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6919,"Mod":0,"Key":256,"Ch":82},{"Timestamp":7896,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8048,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8175,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8311,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8440,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8584,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8720,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8856,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8991,"Mod":0,"Key":271,"Ch":0},{"Timestamp":9136,"Mod":0,"Key":271,"Ch":0},{"Timestamp":9280,"Mod":0,"Key":271,"Ch":0},{"Timestamp":9424,"Mod":0,"Key":271,"Ch":0},{"Timestamp":9560,"Mod":0,"Key":271,"Ch":0},{"Timestamp":10200,"Mod":2,"Key":21,"Ch":21},{"Timestamp":11079,"Mod":0,"Key":256,"Ch":49},{"Timestamp":11287,"Mod":0,"Key":256,"Ch":50},{"Timestamp":11383,"Mod":0,"Key":256,"Ch":51},{"Timestamp":11728,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12423,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
\ No newline at end of file diff --git a/test/integration/branchRename/setup.sh b/test/integration/branchRename/setup.sh new file mode 100644 index 000000000..da9b9bddb --- /dev/null +++ b/test/integration/branchRename/setup.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +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 + +git checkout -b new-branch +git checkout -b new-branch-2 +git checkout -b new-branch-3 +git checkout -b old-branch +git checkout -b old-branch-2 +git checkout -b old-branch-3 diff --git a/test/integration/branchRename/test.json b/test/integration/branchRename/test.json new file mode 100644 index 000000000..fafad1962 --- /dev/null +++ b/test/integration/branchRename/test.json @@ -0,0 +1 @@ +{ "description": "Checking out a branch with name suggestions", "speed": 100 } |