Skip to content

Commit 2d0ff14

Browse files
jpalusgitster
authored andcommitted
t8002: fix ambiguous printf conversion specifications
In e7fb2ca (builtin/blame: fix out-of-bounds write with blank boundary commits, 2025-01-10), we have introduced two new tests that expect a certain amount of padding. This padding is generated via printf using the "%0.s" conversion specification. That directive is ambiguous because it might be interpreted as field width (most shells) or 0-padding flag for numeric fields (coreutils). Fix this issue by using "%${N}s" instead, which is already being used in other tests (i.e. t5300, t0450) and is unambiguous. Helped-by: Patrick Steinhardt <[email protected]> Signed-off-by: Jan Palus <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e7fb2ca commit 2d0ff14

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t8002-blame.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ test_expect_success 'blame --abbrev -b truncates the blank boundary' '
138138
# Note that `--abbrev=` always gets incremented by 1, which is why we
139139
# expect 11 leading spaces and not 10.
140140
cat >expect <<-EOF &&
141-
$(printf "%0.s " $(test_seq 11)) (<[email protected]> 2005-04-07 15:45:13 -0700 1) abbrev
141+
$(printf "%11s" "") (<[email protected]> 2005-04-07 15:45:13 -0700 1) abbrev
142142
EOF
143143
git blame -b --abbrev=10 ^HEAD -- abbrev.t >actual &&
144144
test_cmp expect actual
145145
'
146146

147147
test_expect_success 'blame with excessive --abbrev and -b culls to hash length' '
148148
cat >expect <<-EOF &&
149-
$(printf "%0.s " $(test_seq $hexsz)) (<[email protected]> 2005-04-07 15:45:13 -0700 1) abbrev
149+
$(printf "%${hexsz}s" "") (<[email protected]> 2005-04-07 15:45:13 -0700 1) abbrev
150150
EOF
151151
git blame -b --abbrev=9000 ^HEAD -- abbrev.t >actual &&
152152
test_cmp expect actual

0 commit comments

Comments
 (0)