forked from git-for-windows/git
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'km/empty-repo-is-still-a-repo'
Running "git add" on a repository created inside the current repository is an explicit indication that the user wants to add it as a submodule, but when the HEAD of the inner repository is on an unborn branch, it cannot be added as a submodule. Worse, the files in its working tree can be added as if they are a part of the outer repository, which is not what the user wants. These problems are being addressed. * km/empty-repo-is-still-a-repo: add: error appropriately on repository with no commits dir: do not traverse repositories with no commits submodule: refuse to add repository with no commits
- Loading branch information
Showing
7 changed files
with
88 additions
and
4 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
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,50 @@ | ||
#!/bin/sh | ||
|
||
test_description='test git ls-files --others with non-submodule repositories | ||
This test runs git ls-files --others with the following working tree: | ||
nonrepo-no-files/ | ||
plain directory with no files | ||
nonrepo-untracked-file/ | ||
plain directory with an untracked file | ||
repo-no-commit-no-files/ | ||
git repository without a commit or a file | ||
repo-no-commit-untracked-file/ | ||
git repository without a commit but with an untracked file | ||
repo-with-commit-no-files/ | ||
git repository with a commit and no untracked files | ||
repo-with-commit-untracked-file/ | ||
git repository with a commit and an untracked file | ||
' | ||
|
||
. ./test-lib.sh | ||
|
||
test_expect_success 'setup: directories' ' | ||
mkdir nonrepo-no-files/ && | ||
mkdir nonrepo-untracked-file && | ||
: >nonrepo-untracked-file/untracked && | ||
git init repo-no-commit-no-files && | ||
git init repo-no-commit-untracked-file && | ||
: >repo-no-commit-untracked-file/untracked && | ||
git init repo-with-commit-no-files && | ||
git -C repo-with-commit-no-files commit --allow-empty -mmsg && | ||
git init repo-with-commit-untracked-file && | ||
test_commit -C repo-with-commit-untracked-file msg && | ||
: >repo-with-commit-untracked-file/untracked | ||
' | ||
|
||
test_expect_success 'ls-files --others handles untracked git repositories' ' | ||
git ls-files -o >output && | ||
cat >expect <<-EOF && | ||
nonrepo-untracked-file/untracked | ||
output | ||
repo-no-commit-no-files/ | ||
repo-no-commit-untracked-file/ | ||
repo-with-commit-no-files/ | ||
repo-with-commit-untracked-file/ | ||
EOF | ||
test_cmp expect output | ||
' | ||
|
||
test_done |
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