Update several tests so they don't rely on a default for --git-prefixes

Assisted-by: Cursor

Author: twaugh

tests/fullheader1/run-test

@@ -22,14 +22,14 @@ index 5feceb9..dde7898 10644
 +be selected
 EOF
 
-${LSDIFF} -n git-output 2>errors >index || exit 1
+${LSDIFF} --git-prefixes=strip -n git-output 2>errors >index || exit 1
 [ -s errors ] && exit 1
 cat <<"EOF" | cmp - index || exit 1
-1	a/ChangeLog
-8	a/otherfile
+1	ChangeLog
+8	otherfile
 EOF
 
-${FILTERDIFF} -p1 -i otherfile git-output 2>errors >otherfile.patch || exit 1
+${FILTERDIFF} --git-prefixes=strip -i otherfile git-output 2>errors >otherfile.patch || exit 1
 [ -s errors ] && exit 1
 cat <<"EOF" | cmp - otherfile.patch || exit 1
 diff --git a/otherfile b/otherfile

tests/git-binary-formats/run-test

@@ -62,7 +62,7 @@ EOF
 
 # Test filtering binary files with GIT binary patch format - should include binary content
 echo "Testing GIT binary patch format (include)..."
-${FILTERDIFF} -i "*/file1.bin" git-binary-patch.patch 2>errors1 >result1 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "file1.bin" git-binary-patch.patch 2>errors1 >result1 || exit 1
 [ -s errors1 ] && { echo "Unexpected errors in test 1:"; cat errors1; exit 1; }
 
 cat << 'EOF' | cmp - result1 || { echo "Test 1 failed"; exit 1; }
@@ -78,7 +78,7 @@ EOF
 
 # Test filtering binary files with literal format - should include binary content
 echo "Testing literal format (include)..."
-${FILTERDIFF} -i "*/file3.bin" literal-patch.patch 2>errors2 >result2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "file3.bin" literal-patch.patch 2>errors2 >result2 || exit 1
 [ -s errors2 ] && { echo "Unexpected errors in test 2:"; cat errors2; exit 1; }
 
 cat << 'EOF' | cmp - result2 || { echo "Test 2 failed"; exit 1; }
@@ -93,7 +93,7 @@ EOF
 
 # Test filtering binary files with delta format - should include binary content
 echo "Testing delta format (include)..."
-${FILTERDIFF} -i "*/file5.bin" delta-patch.patch 2>errors3 >result3 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "file5.bin" delta-patch.patch 2>errors3 >result3 || exit 1
 [ -s errors3 ] && { echo "Unexpected errors in test 3:"; cat errors3; exit 1; }
 
 cat << 'EOF' | cmp - result3 || { echo "Test 3 failed"; exit 1; }
@@ -108,7 +108,7 @@ EOF
 
 # Test excluding binary files - should skip binary content
 echo "Testing binary patch exclusion..."
-${FILTERDIFF} -x "*/file1.bin" git-binary-patch.patch 2>errors4 >result4 || exit 1
+${FILTERDIFF} --git-prefixes=strip -x "file1.bin" git-binary-patch.patch 2>errors4 >result4 || exit 1
 [ -s errors4 ] && { echo "Unexpected errors in test 4:"; cat errors4; exit 1; }
 
 cat << 'EOF' | cmp - result4 || { echo "Test 4 failed"; exit 1; }

tests/git-binary-issue57/run-test

@@ -21,7 +21,7 @@ index 0000000..abcdefg
 EOF
 
 # Test that filterdiff includes binary files when they match
-${FILTERDIFF} -p 1 -i binary-file git-binary.patch 2>errors >result || exit 1
+${FILTERDIFF} --git-prefixes=strip -i binary-file git-binary.patch 2>errors >result || exit 1
 [ -s errors ] && exit 1
 
 cat << EOF | cmp - result || exit 1
@@ -32,16 +32,16 @@ Binary files /dev/null and b/binary-file differ
 EOF
 
 # Test that lsdiff shows binary files
-${LSDIFF} git-binary.patch 2>errors2 >result2 || exit 1
+${LSDIFF} --git-prefixes=strip git-binary.patch 2>errors2 >result2 || exit 1
 [ -s errors2 ] && exit 1
 
 cat << EOF | cmp - result2 || exit 1
-a/binary-file
-b/text-file.txt
+binary-file
+text-file.txt
 EOF
 
 # Test excluding binary files
-${FILTERDIFF} -p 1 -x binary-file git-binary.patch 2>errors3 >result3 || exit 1
+${FILTERDIFF} --git-prefixes=strip -x binary-file git-binary.patch 2>errors3 >result3 || exit 1
 [ -s errors3 ] && exit 1
 
 cat << EOF | cmp - result3 || exit 1

tests/git-deleted-file/run-test

@@ -44,16 +44,16 @@ index 222..0000000
 EOF
 
 echo "=== Test 1: lsdiff with deleted file ==="
-${LSDIFF} -s git-deleted.patch 2>errors1 >result1 || exit 1
+${LSDIFF} --git-prefixes=strip -s git-deleted.patch 2>errors1 >result1 || exit 1
 [ -s errors1 ] && exit 1
 
 # Should show file with '-' status
 cat << EOF | cmp - result1 || exit 1
-- a/deleted-file.txt
+- deleted-file.txt
 EOF
 
 echo "=== Test 2: filterdiff include deleted file ==="
-${FILTERDIFF} -i "*/deleted*" git-deleted.patch 2>errors2 >result2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "deleted*" git-deleted.patch 2>errors2 >result2 || exit 1
 [ -s errors2 ] && exit 1
 
 # Should include the full diff
@@ -70,22 +70,22 @@ index abc123..0000000
 EOF
 
 echo "=== Test 3: filterdiff exclude deleted file ==="
-${FILTERDIFF} -x "*/deleted*" git-deleted.patch 2>errors3 >result3 || exit 1
+${FILTERDIFF} --git-prefixes=strip -x "deleted*" git-deleted.patch 2>errors3 >result3 || exit 1
 [ -s errors3 ] && exit 1
 
 # Should be empty
 [ -s result3 ] && exit 1
 
 echo "=== Test 4: lsdiff with deleted file (no hunks) ==="
-${LSDIFF} -s git-deleted-no-hunks.patch 2>errors4 >result4 || exit 1
+${LSDIFF} --git-prefixes=strip -s git-deleted-no-hunks.patch 2>errors4 >result4 || exit 1
 [ -s errors4 ] && exit 1
 
 cat << EOF | cmp - result4 || exit 1
-- a/removed.c
+- removed.c
 EOF
 
 echo "=== Test 5: filterdiff with deleted file (no hunks) ==="
-${FILTERDIFF} -i "*/*.c" git-deleted-no-hunks.patch 2>errors5 >result5 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "*.c" git-deleted-no-hunks.patch 2>errors5 >result5 || exit 1
 [ -s errors5 ] && exit 1
 
 cat << 'EOF' | cmp - result5 || exit 1
@@ -96,16 +96,16 @@ Binary files a/removed.c and /dev/null differ
 EOF
 
 echo "=== Test 6: lsdiff with multiple deleted files ==="
-${LSDIFF} -s git-multiple-deleted.patch 2>errors6 >result6 || exit 1
+${LSDIFF} --git-prefixes=strip -s git-multiple-deleted.patch 2>errors6 >result6 || exit 1
 [ -s errors6 ] && exit 1
 
 cat << EOF | cmp - result6 || exit 1
-- a/file1.txt
-- a/file2.txt
+- file1.txt
+- file2.txt
 EOF
 
 echo "=== Test 7: filterdiff with pattern matching multiple deleted files ==="
-${FILTERDIFF} -i "*/file1*" git-multiple-deleted.patch 2>errors7 >result7 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "file1*" git-multiple-deleted.patch 2>errors7 >result7 || exit 1
 [ -s errors7 ] && exit 1
 
 cat << 'EOF' | cmp - result7 || exit 1

tests/git-diff-duplication/run-test

@@ -27,7 +27,7 @@ index 1111111..2222222 100644
 EOF
 
 # Test that filterdiff preserves the output unchanged
-${FILTERDIFF} git-diff-bug.patch 2>errors >result || exit 1
+${FILTERDIFF} --git-prefixes=strip git-diff-bug.patch 2>errors >result || exit 1
 [ -s errors ] && exit 1
 
 # The result should be identical to the input

tests/git-exclude-issue27/run-test

@@ -24,7 +24,7 @@ index 1234567..abcdefg 100644
 EOF
 
 # Test that excluding README.vin removes the entire git diff block
-${FILTERDIFF} -p 1 -x README.vin git-multi.patch 2>errors >result || exit 1
+${FILTERDIFF} --git-prefixes=strip -x README.vin git-multi.patch 2>errors >result || exit 1
 [ -s errors ] && exit 1
 
 # The result should contain the complete autogen.sh diff, no orphaned headers
@@ -39,7 +39,7 @@ index 1234567..abcdefg 100644
 EOF
 
 # Test that excluding both files results in empty output
-${FILTERDIFF} -p 1 -x README.vin -x autogen.sh git-multi.patch 2>errors2 >result2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -x README.vin -x autogen.sh git-multi.patch 2>errors2 >result2 || exit 1
 [ -s errors2 ] && exit 1
 
 # The result should be completely empty

tests/git-extended-headers/run-test

@@ -18,14 +18,14 @@ index 1234567..0000000
 -line 3
 EOF
 
-${LSDIFF} deleted-file.patch 2>errors1a >result1a || exit 1
+${LSDIFF} --git-prefixes=strip deleted-file.patch 2>errors1a >result1a || exit 1
 [ -s errors1a ] && exit 1
 
 cat << EOF | cmp - result1a || exit 1
-a/removed.txt
+removed.txt
 EOF
 
-${FILTERDIFF} -i "a/removed.txt" deleted-file.patch 2>errors1a2 >result1a2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "removed.txt" deleted-file.patch 2>errors1a2 >result1a2 || exit 1
 [ -s errors1a2 ] && exit 1
 
 cat << EOF | cmp - result1a2 || exit 1
@@ -47,14 +47,14 @@ deleted file mode 100644
 index e69de29..0000000
 EOF
 
-${LSDIFF} deleted-file-no-hunks.patch 2>errors1b >result1b || exit 1
+${LSDIFF} --git-prefixes=strip deleted-file-no-hunks.patch 2>errors1b >result1b || exit 1
 [ -s errors1b ] && exit 1
 
 cat << EOF | cmp - result1b || exit 1
-a/empty-deleted.txt
+empty-deleted.txt
 EOF
 
-${FILTERDIFF} -i "a/empty-deleted.txt" deleted-file-no-hunks.patch 2>errors1b2 >result1b2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "empty-deleted.txt" deleted-file-no-hunks.patch 2>errors1b2 >result1b2 || exit 1
 [ -s errors1b2 ] && exit 1
 
 cat << EOF | cmp - result1b2 || exit 1
@@ -76,14 +76,14 @@ index 0000000..abcdefg
 +new line 3
 EOF
 
-${LSDIFF} new-file.patch 2>errors2a >result2a || exit 1
+${LSDIFF} --git-prefixes=strip new-file.patch 2>errors2a >result2a || exit 1
 [ -s errors2a ] && exit 1
 
 cat << EOF | cmp - result2a || exit 1
-b/created.txt
+created.txt
 EOF
 
-${FILTERDIFF} -i "b/created.txt" new-file.patch 2>errors2a2 >result2a2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "created.txt" new-file.patch 2>errors2a2 >result2a2 || exit 1
 [ -s errors2a2 ] && exit 1
 
 cat << EOF | cmp - result2a2 || exit 1
@@ -105,14 +105,14 @@ new file mode 100644
 index 0000000..e69de29
 EOF
 
-${LSDIFF} new-file-no-hunks.patch 2>errors2b >result2b || exit 1
+${LSDIFF} --git-prefixes=strip new-file-no-hunks.patch 2>errors2b >result2b || exit 1
 [ -s errors2b ] && exit 1
 
 cat << EOF | cmp - result2b || exit 1
-a/empty-new.txt
+empty-new.txt
 EOF
 
-${FILTERDIFF} -i "a/empty-new.txt" new-file-no-hunks.patch 2>errors2b2 >result2b2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "empty-new.txt" new-file-no-hunks.patch 2>errors2b2 >result2b2 || exit 1
 [ -s errors2b2 ] && exit 1
 
 cat << EOF | cmp - result2b2 || exit 1
@@ -129,14 +129,14 @@ index e69de29..0000000
 Binary files a/pure-deleted.txt and /dev/null differ
 EOF
 
-${LSDIFF} deleted-file-binary.patch 2>errors1c >result1c || exit 1
+${LSDIFF} --git-prefixes=strip deleted-file-binary.patch 2>errors1c >result1c || exit 1
 [ -s errors1c ] && exit 1
 
 cat << EOF | cmp - result1c || exit 1
-a/pure-deleted.txt
+pure-deleted.txt
 EOF
 
-${FILTERDIFF} -i "a/pure-deleted.txt" deleted-file-binary.patch 2>errors1c2 >result1c2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "pure-deleted.txt" deleted-file-binary.patch 2>errors1c2 >result1c2 || exit 1
 [ -s errors1c2 ] && exit 1
 
 cat << EOF | cmp - result1c2 || exit 1
@@ -181,14 +181,14 @@ index abc1234..def5678 100644
 +}
 EOF
 
-${LSDIFF} dissimilar-file.patch 2>errors3a >result3a || exit 1
+${LSDIFF} --git-prefixes=strip dissimilar-file.patch 2>errors3a >result3a || exit 1
 [ -s errors3a ] && exit 1
 
 cat << EOF | cmp - result3a || exit 1
-a/rewritten.c
+rewritten.c
 EOF
 
-${FILTERDIFF} -i "a/rewritten.c" dissimilar-file.patch 2>errors3a2 >result3a2 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "rewritten.c" dissimilar-file.patch 2>errors3a2 >result3a2 || exit 1
 [ -s errors3a2 ] && exit 1
 
 grep -q "dissimilarity index 95%" result3a2 || exit 1
@@ -288,32 +288,32 @@ index old123..new456 100644
 EOF
 
 # Test lsdiff shows all files
-${LSDIFF} mixed-extended.patch 2>errors4 >result4 || exit 1
+${LSDIFF} --git-prefixes=strip mixed-extended.patch 2>errors4 >result4 || exit 1
 [ -s errors4 ] && exit 1
 
 cat << EOF | cmp - result4 || exit 1
-a/old.txt
-a/template.h
+old.txt
+template.h
 config.conf
-a/script.sh
-b/brand-new.py
-a/completely-rewritten.java
+script.sh
+brand-new.py
+completely-rewritten.java
 EOF
 
 # Test filtering works with all header types
-${FILTERDIFF} -i "b/*.py" mixed-extended.patch 2>errors5 >result5 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "*.py" mixed-extended.patch 2>errors5 >result5 || exit 1
 [ -s errors5 ] && exit 1
 
 grep -q "brand-new.py" result5 || exit 1
 grep -q "new file mode 100755" result5 || exit 1
 
-${FILTERDIFF} -i "a/*.java" mixed-extended.patch 2>errors6 >result6 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "*.java" mixed-extended.patch 2>errors6 >result6 || exit 1
 [ -s errors6 ] && exit 1
 
 grep -q "completely-rewritten.java" result6 || exit 1
 grep -q "dissimilarity index 98%" result6 || exit 1
 
-${FILTERDIFF} -i "a/old.txt" mixed-extended.patch 2>errors7 >result7 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "old.txt" mixed-extended.patch 2>errors7 >result7 || exit 1
 [ -s errors7 ] && exit 1
 
 grep -q "deleted file mode 100644" result7 || exit 1
@@ -337,7 +337,7 @@ index abc123..def456 100755
      printf("Hello");
 EOF
 
-${FILTERDIFF} -i "*complex*.c" multiple-headers.patch 2>errors8 >result8 || exit 1
+${FILTERDIFF} --git-prefixes=strip -i "*complex*.c" multiple-headers.patch 2>errors8 >result8 || exit 1
 [ -s errors8 ] && exit 1
 
 grep -q "similarity index 75%" result8 || exit 1