From 4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 9 Apr 2024 15:34:27 +0200 Subject: Adding upstream version 1:2.43.0. Signed-off-by: Daniel Baumann --- t/t4033-diff-patience.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 t/t4033-diff-patience.sh (limited to 't/t4033-diff-patience.sh') diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh new file mode 100755 index 0000000..f7be7f5 --- /dev/null +++ b/t/t4033-diff-patience.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +test_description='patience diff algorithm' + +TEST_PASSES_SANITIZE_LEAK=true +. ./test-lib.sh +. "$TEST_DIRECTORY"/lib-diff-alternative.sh + +test_expect_success '--ignore-space-at-eol with a single appended character' ' + printf "a\nb\nc\n" >pre && + printf "a\nbX\nc\n" >post && + test_must_fail git diff --no-index \ + --patience --ignore-space-at-eol pre post >diff && + grep "^+.*X" diff +' + +test_diff_frobnitz "patience" + +test_diff_unique "patience" + +test_done -- cgit v1.2.3