Skip to content

Commit cfaf31f

Browse files
committed
Use previously unused variable in fixture script (#383)
1 parent 7f88c7f commit cfaf31f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:357c85ba0f2c4e8703e643ebbebc49229d0560eb0e6ed1ffa08969d4750f5bc5
3-
size 11356
2+
oid sha256:87c31f0b601dae0e2b7d863be659b80507b21527d6788a50253181c4f3d5f054
3+
size 11360

git-repository/tests/fixtures/make_am_repo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ echo file.main.update > file
1919
git commit -m file.main.update file
2020

2121
# This will fail due to the merge conflict and leave us in a 'apply mbox in progress' state
22-
git am 0001-file.other-branch.patch || true
22+
git am "$patch_path" || true

0 commit comments

Comments
 (0)