refactor (#393)

Author: Byron

git-repository/tests/fixtures/generated-archives/make_am_repo.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:357c85ba0f2c4e8703e643ebbebc49229d0560eb0e6ed1ffa08969d4750f5bc5
+size 11356

git-repository/tests/fixtures/generated-archives/make_bisect_repo.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e38aff8e6054660ffa274ff00ad8398601949576d887e0cc462256f16e966bb
+size 10200

git-repository/tests/fixtures/generated-archives/make_cherry_pick_sequence_repo.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c3187949760fe07a5abc1a5b7f303ba060bedaed1bfad29535b93df72ca453c
+size 11336

git-repository/tests/fixtures/generated-archives/make_merge_repo.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a61b3a205b9254579ea67390a9b3da43ab9d26b6576555da566ba69ea07aaa3b
+size 10948

git-repository/tests/fixtures/generated-archives/make_revert_repo.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b76a63be1b90ff164633c074caf3ce3ccfd73ed6f587a7a02e7c039af065519
+oid sha256:b44df1ace634ca3f4e4c05911d4bf949777b6037ba3fbb25f4a139d5048d33d0
 size 10440

git-repository/tests/fixtures/generated-archives/make_revert_sequence_repo.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60a892477189310fa935d43dbaa73d92b3079cbf86023e83262db6000b7556c0
+size 11224

git-repository/tests/fixtures/make_am_repo.sh

@@ -3,20 +3,20 @@ set -eu -o pipefail
 
 git init -q
 
-echo 1.main > 1
-git add 1
-git commit -m 1.main 1
+echo file.main > file
+git add file
+git commit -m file.main file
 
 git checkout -b other-branch
-echo 1.other-branch > 1
-git commit -m 1.other-branch 1
+echo file.other-branch > file
+git commit -m file.other-branch file
 # Create an mbox formatted patch and save the path
 patch_path=$(git format-patch main)
 
 git checkout main
 # Create a conflict
-echo 1.main.update > 1
-git commit -m 1.main.update 1
+echo file.main.update > file
+git commit -m file.main.update file
 
 # This will fail due to the merge conflict and leave us in a 'apply mbox in progress' state
-git am 0001-1.other-branch.patch || true
+git am 0001-file.other-branch.patch || true

git-repository/tests/fixtures/make_bisect_repo.sh

@@ -3,12 +3,12 @@ set -eu -o pipefail
 
 git init -q
 
-touch 1 2
+touch f1 f2
 
-git add 1
-git commit -m 1 1
+git add f1
+git commit -m f1 f1
 
-git add 2
-git commit -m 2 2
+git add f2
+git commit -m f2 f2
 
 git bisect start

git-repository/tests/fixtures/make_cherry_pick_sequence_repo.sh

@@ -3,22 +3,22 @@ set -eu -o pipefail
 
 git init -q
 
-touch 1 2 3
+touch f1 f2 f3
 
-git add 1
-git commit -m 1 1
+git add f1
+git commit -m f1 f1
 
 git checkout -b other-branch
-echo 2.other-branch > 2
-git add 2
-git commit -m 2.other-branch 2
-git add 3
-git commit -m 3 3
+echo f2.other-branch > f2
+git add f2
+git commit -m f2.other-branch f2
+git add f3
+git commit -m f3 f3
 
 git checkout main
-echo 2.main > 2
-git add 2
-git commit -m 2.main 2
+echo f2.main > f2
+git add f2
+git commit -m f2.main f2
 
 # This should fail and leave us in a cherry-pick + sequencer state
 git cherry-pick other-branch~2..other-branch || true

git-repository/tests/fixtures/make_merge_repo.sh

@@ -3,17 +3,17 @@ set -eu -o pipefail
 
 git init -q
 
-echo 1.main > 1
-git add 1
-git commit -m 1.main 1
+echo file.main > file
+git add file
+git commit -m file.main file
 
 git checkout -b other-branch
-echo 1.other-branch > 1
-git add 1
-git commit -m 1.other-branch 1
+echo file.other-branch > file
+git add file
+git commit -m file.other-branch file
 
 git checkout main
-echo 1.main changed > 1
-git commit -m 1.main\ changed 1
+echo file.main changed > file
+git commit -m file.main\ changed file
 
 git merge other-branch || true

git-repository/tests/fixtures/make_revert_repo.sh

@@ -3,11 +3,11 @@ set -eu -o pipefail
 
 git init -q
 
-touch 1 2 3
-git add 1
-git commit -m 1 1
-git add 2
-git commit -m 2 2
-git add 3
-git commit -m 3 3
+touch f1 f2 f3
+git add f1
+git commit -m f1 f1
+git add f2
+git commit -m f2 f2
+git add f3
+git commit -m f3 f3
 git revert --no-commit HEAD~1