`\?` is undefined for POSIX BRE, from: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03_02 > The interpretation of an ordinary character preceded > by an unescaped <backslash> ( '\\' ) is undefined, except for: > - The characters ')', '(', '{', and '}' > - The digits 1 to 9 inclusive > - A character inside a bracket expression This test is failing with busybox grep. Fix it by using character class. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx> --- Needs to be applied on top of jt/rebase-allow-duplicate Cc: Jonathan Tan <jonathantanmy@xxxxxxxxxx> t/t3402-rebase-merge.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 290c79e0f6..e8bab8102d 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -228,15 +228,15 @@ test_expect_success '--skip-cherry-pick-detection refrains from reading unneeded git -C client rev-list --objects --all --missing=print >missing_list && MERGE_BASE_BLOB=$(git -C server rev-parse master^^:file.txt) && ADD_11_BLOB=$(git -C server rev-parse master^:file.txt) && - grep "\\?$MERGE_BASE_BLOB" missing_list && - grep "\\?$ADD_11_BLOB" missing_list && + grep "[?]$MERGE_BASE_BLOB" missing_list && + grep "[?]$ADD_11_BLOB" missing_list && git -C client rebase --merge --skip-cherry-pick-detection origin/master && # The blob from the merge base had to be fetched, but not "add 11" git -C client rev-list --objects --all --missing=print >missing_list && - ! grep "\\?$MERGE_BASE_BLOB" missing_list && - grep "\\?$ADD_11_BLOB" missing_list + ! grep "[?]$MERGE_BASE_BLOB" missing_list && + grep "[?]$ADD_11_BLOB" missing_list ' test_done -- 2.26.0.302.g234993491e
