Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'zh/ls-files-deduplicate' into jch
"git ls-files" can and does show multiple entries when the index is unmerged, which is a source for confusion unless -s/-u option is in use. A new option --deduplicate has been introduced. * zh/ls-files-deduplicate: ls-files.c: add --deduplicate option ls_files.c: consolidate two for loops into one ls_files.c: bugfix for --deleted and --modified
- Loading branch information
Showing
3 changed files
with
124 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
#!/bin/sh | ||
|
||
test_description='git ls-files --deduplicate test' | ||
|
||
. ./test-lib.sh | ||
|
||
test_expect_success 'setup' ' | ||
>a.txt && | ||
>b.txt && | ||
>delete.txt && | ||
git add a.txt b.txt delete.txt && | ||
git commit -m base && | ||
echo a >a.txt && | ||
echo b >b.txt && | ||
echo delete >delete.txt && | ||
git add a.txt b.txt delete.txt && | ||
git commit -m tip && | ||
git tag tip && | ||
git reset --hard HEAD^ && | ||
echo change >a.txt && | ||
git commit -a -m side && | ||
git tag side | ||
' | ||
|
||
test_expect_success 'git ls-files --deduplicate to show unique unmerged path' ' | ||
test_must_fail git merge tip && | ||
git ls-files --deduplicate >actual && | ||
cat >expect <<-\EOF && | ||
a.txt | ||
b.txt | ||
delete.txt | ||
EOF | ||
test_cmp expect actual && | ||
git merge --abort | ||
' | ||
|
||
test_expect_success 'git ls-files -d -m --deduplicate with different display options' ' | ||
git reset --hard side && | ||
test_must_fail git merge tip && | ||
rm delete.txt && | ||
git ls-files -d -m --deduplicate >actual && | ||
cat >expect <<-\EOF && | ||
a.txt | ||
delete.txt | ||
EOF | ||
test_cmp expect actual && | ||
git ls-files -d -m -t --deduplicate >actual && | ||
cat >expect <<-\EOF && | ||
C a.txt | ||
C a.txt | ||
C a.txt | ||
R delete.txt | ||
C delete.txt | ||
EOF | ||
test_cmp expect actual && | ||
git ls-files -d -m -c --deduplicate >actual && | ||
cat >expect <<-\EOF && | ||
a.txt | ||
b.txt | ||
delete.txt | ||
EOF | ||
test_cmp expect actual && | ||
git merge --abort | ||
' | ||
|
||
test_done |