diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-03 13:48:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-03 13:48:00 -0800 |
| commit | 228c3418356d06d0596408bee1c863e53ca27d58 (patch) | |
| tree | c31e492269375ccca3cc081b015d26c5f13769df | |
| parent | 17b4e93d5b849293e6a3659bbc4075ed8a6e97e2 (diff) | |
| parent | bc0fe84b064d2185e147b7c1f98bb6f9b7966b2c (diff) | |
| download | git-228c3418356d06d0596408bee1c863e53ca27d58.tar.gz | |
Merge branch 'maint'
* maint:
docs: describe behavior of relative submodule URLs
fix hang in git fetch if pointed at a 0 length bundle
Documentation: read-tree --prefix works with existing subtrees
Add MYMETA.json to perl/.gitignore
| -rw-r--r-- | Documentation/git-read-tree.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-submodule.txt | 7 | ||||
| -rw-r--r-- | bundle.c | 4 | ||||
| -rw-r--r-- | perl/.gitignore | 1 | ||||
| -rwxr-xr-x | t/t5704-bundle.sh | 6 |
5 files changed, 19 insertions, 8 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 5375549820..a43e87448b 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -83,11 +83,10 @@ OPTIONS --prefix=<prefix>/:: Keep the current index contents, and read the contents - of the named tree-ish under the directory at `<prefix>`. The - original index file cannot have anything at the path - `<prefix>` itself, nor anything in the `<prefix>/` - directory. Note that the `<prefix>/` value must end - with a slash. + of the named tree-ish under the directory at `<prefix>`. + The command will refuse to overwrite entries that already + existed in the original index file. Note that the `<prefix>/` + value must end with a slash. --exclude-per-directory=<gitignore>:: When running the command with `-u` and `-m` options, the diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 6ec3fef079..b72964947a 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -79,7 +79,12 @@ to exist in the superproject. If <path> is not given, the <repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's origin -repository. If the superproject doesn't have an origin configured +repository (Please note that to specify a repository 'foo.git' +which is located right next to a superproject 'bar.git', you'll +have to use '../foo.git' instead of './foo.git' - as one might expect +when following the rules for relative URLs - because the evaluation +of relative URLs in Git is identical to that of relative directories). +If the superproject doesn't have an origin configured the superproject is its own authoritative upstream and the current working directory is used instead. + @@ -31,8 +31,8 @@ static int strbuf_readline_fd(struct strbuf *sb, int fd) while (1) { char ch; ssize_t len = xread(fd, &ch, 1); - if (len < 0) - return -1; + if (len <= 0) + return len; strbuf_addch(sb, ch); if (ch == '\n') break; diff --git a/perl/.gitignore b/perl/.gitignore index 9235e73163..d5c6e22d0f 100644 --- a/perl/.gitignore +++ b/perl/.gitignore @@ -1,5 +1,6 @@ perl.mak perl.mak.old +MYMETA.json MYMETA.yml blib blibdirs diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh index 728ccd88c3..4ae127d106 100755 --- a/t/t5704-bundle.sh +++ b/t/t5704-bundle.sh @@ -53,4 +53,10 @@ test_expect_failure 'bundle --stdin <rev-list options>' ' ' +test_expect_success 'empty bundle file is rejected' ' + + >empty-bundle && test_must_fail git fetch empty-bundle + +' + test_done |