[PATCH 2/2] t2000: cleanup unused debug code and variables
- From
Zakariyah Ali via GitGitGadget <gitgitgadget@gmail.com>
- Date
- May 23, 2026, 11:07 UTC
- Message-ID
- <87c80205cc3c7be131cafe37b786311a35b4e044.1779534462.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.2256.git.git.1779534462.gitgitgadget@gmail.com>
From: Zakariyah Ali <zakariyahali100@gmail.com>
Remove the show_files function which is no longer used after removing test_debug calls, and remove an unused tree3 variable assignment in the second test scenario.
These cleanups address feedback from Junio C Hamano regarding the modernization of this test script.
Signed-off-by: Zakariyah Ali <zakariyahali100@gmail.com> --- t/t2000-conflict-when-checking-files-out.sh | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/t/t2000-conflict-when-checking-files-out.sh b/t/t2000-conflict-when-checking-files-out.sh index 43ec901f9e..7b61370549 100755 --- a/t/t2000-conflict-when-checking-files-out.sh +++ b/t/t2000-conflict-when-checking-files-out.sh @@ -23,17 +23,6 @@ test_description='git conflicts when checking files out test.' . ./test-lib.sh -show_files() { - # show filesystem files, just [-dl] for type and name - find path? -ls | - sed -e 's/^[0-9]* * [0-9]* * \([-bcdl]\)[^ ]* *[0-9]* *[^ ]* *[^ ]* *[0-9]* [A-Z][a-z][a-z] [0-9][0-9] [^ ]* /fs: \1 /' - # what's in the cache, just mode and name - git ls-files --stage | - sed -e 's/^\([0-9]*\) [0-9a-f]* [0-3] /ca: \1 /' - # what's in the tree, just mode and name. - git ls-tree -r "$1" | - sed -e 's/^\([0-9]*\) [^ ]* [0-9a-f]* /tr: \1 /' -} test_expect_success 'prepare files path0 and path1/file1' ' date >path0 && @@ -96,7 +85,6 @@ test_expect_success 'checkout-index -f resolves symlink conflict on leading path git read-tree -m $tree1 && git checkout-index -f -a && test_ln_s_add path2 path3 && - tree3=$(git write-tree) && git read-tree $tree2 && git checkout-index -f -a && test_path_is_dir_not_symlink path2 &&
-- gitgitgadget