Skip to content

Commit 7330844

Browse files
committed
Merge branch 'heredocs'
2 parents 85019d0 + a4bb7b9 commit 7330844

File tree

11 files changed

+7
-6
lines changed

11 files changed

+7
-6
lines changed
Binary file not shown.

gix-dir/tests/fixtures/many.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ git init type-mismatch-icase
324324
git init type-mismatch-icase-clash-dir-is-file
325325
(cd type-mismatch-icase-clash-dir-is-file
326326
empty_oid=$(git hash-object -w --stdin </dev/null)
327-
git update-index --index-info <<-EOF
327+
git update-index --index-info <<EOF
328328
100644 $empty_oid D/a
329329
100644 $empty_oid d
330330
EOF
Binary file not shown.

gix-index/tests/fixtures/make_index/v2_icase_name_clashes.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ symlink_target=$(echo -n 'X' | git hash-object -w --stdin)
1010
echo "FILE_? filter=arrow" > .gitattributes
1111
git add -A
1212

13-
git update-index --index-info <<-EOF
13+
git update-index --index-info <<EOF
1414
100644 $content_oid FILE_X
1515
100644 $content_oid FILE_x
1616
100644 $content_oid file_X
Binary file not shown.
Binary file not shown.

gix-worktree-state/tests/fixtures/make_dangerous_symlink.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ empty_oid=$(git hash-object -w --stdin </dev/null)
1111
fake_dir_target=$(echo -n 'A-dir' | git hash-object -w --stdin)
1212
fake_file_target=$(echo -n 'A-file' | git hash-object -w --stdin)
1313

14-
git update-index --index-info <<-EOF
14+
git update-index --index-info <<EOF
1515
100644 $empty_oid A-dir/a
1616
100644 $empty_oid A-file
1717
120000 $fake_dir_target FAKE-DIR

gix-worktree-state/tests/fixtures/make_dangling_symlink.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ set -eu -o pipefail
44
git init -q
55

66
target_oid=$(echo -n "non-existing-target" | git hash-object -w --stdin)
7-
git update-index --index-info <<-EOF
7+
8+
git update-index --index-info <<EOF
89
120000 $target_oid dangling
910
EOF
1011

gix-worktree-state/tests/fixtures/make_ignorecase_collisions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ symlink_target=$(echo -n 'X' | git hash-object -w --stdin)
1010
echo "FILE_? filter=arrow" > .gitattributes
1111
git add -A
1212

13-
git update-index --index-info <<-EOF
13+
git update-index --index-info <<EOF
1414
100644 $content_oid FILE_X
1515
100644 $content_oid FILE_x
1616
100644 $content_oid file_X
Binary file not shown.

gix/tests/fixtures/make_rev_spec_parse_repos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ git init ambiguous_blob_tree_commit
101101
# create one tree 0000000000cdc
102102
git write-tree
103103

104-
sed -e "s/|$//" >patch <<-EOF
104+
sed -e "s/|$//" >patch <<EOF
105105
diff --git a/frotz b/frotz
106106
index 000000000..ffffff 100644
107107
--- a/frotz

0 commit comments

Comments
 (0)