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
This commit is contained in:
commit
228c341835
@ -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
|
||||
|
@ -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.
|
||||
+
|
||||
|
4
bundle.c
4
bundle.c
@ -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;
|
||||
|
1
perl/.gitignore
vendored
1
perl/.gitignore
vendored
@ -1,5 +1,6 @@
|
||||
perl.mak
|
||||
perl.mak.old
|
||||
MYMETA.json
|
||||
MYMETA.yml
|
||||
blib
|
||||
blibdirs
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user