[PATCH] upload-pack: allow shallow fetching from a read-only repository
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Feb 27, 2014, 07:13 UTC
- Message-ID
- <1393485183-20100-1-git-send-email-pclouds@gmail.com>
Before cdab485 (upload-pack: delegate rev walking in shallow fetch to pack-objects - 2013-08-16) upload-pack does not write to the source repository. cdab485 starts to write $GIT_DIR/shallow_XXXXXX if it's a shallow fetch, so the source repo must be writable.
Fall back to $TMPDIR if $GIT_DIR/shallow_XXXXXX cannot be created in this case. Note that in other cases that write $GIT_DIR/shallow_XXXXXX and eventually rename it to $GIT_DIR/shallow, there is no fallback to $TMPDIR.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/receive-pack.c | 2 +- commit.h | 2 +- fetch-pack.c | 2 +- shallow.c | 13 +++++++++++-- t/t5537-fetch-shallow.sh | 13 +++++++++++++ upload-pack.c | 2 +- 6 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 85bba35..9d96f2c 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -936,7 +936,7 @@ static const char *unpack(int err_fd, struct shallow_info *si) ntohl(hdr.hdr_version), ntohl(hdr.hdr_entries)); if (si->nr_ours || si->nr_theirs) { - alt_shallow_file = setup_temporary_shallow(si->shallow); + alt_shallow_file = setup_temporary_shallow(si->shallow, 0); argv_array_pushl(&av, "--shallow-file", alt_shallow_file, NULL); } diff --git a/commit.h b/commit.h index 16d9c43..44a40ad 100644 --- a/commit.h +++ b/commit.h @@ -209,7 +209,7 @@ extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol, extern void setup_alternate_shallow(struct lock_file *shallow_lock, const char **alternate_shallow_file, const struct sha1_array *extra); -extern char *setup_temporary_shallow(const struct sha1_array *extra); +extern char *setup_temporary_shallow(const struct sha1_array *extra, int read_only); extern void advertise_shallow_grafts(int); struct shallow_info { diff --git a/fetch-pack.c b/fetch-pack.c index 90fdd49..382b825 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -853,7 +853,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, NULL); else if (si->nr_ours || si->nr_theirs) - alternate_shallow_file = setup_temporary_shallow(si->shallow); + alternate_shallow_file = setup_temporary_shallow(si->shallow, 0); else alternate_shallow_file = NULL; if (get_pack(args, fd, pack_lockfile)) diff --git a/shallow.c b/shallow.c index bbc98b5..3adfbd5 100644 --- a/shallow.c +++ b/shallow.c @@ -216,7 +216,7 @@ int write_shallow_commits(struct strbuf *out, int use_pack_protocol, return write_shallow_commits_1(out, use_pack_protocol, extra, 0); } -char *setup_temporary_shallow(const struct sha1_array *extra) +char *setup_temporary_shallow(const struct sha1_array *extra, int read_only) { struct strbuf sb = STRBUF_INIT; int fd; @@ -224,7 +224,16 @@ char *setup_temporary_shallow(const struct sha1_array *extra) if (write_shallow_commits(&sb, 0, extra)) { struct strbuf path = STRBUF_INIT; strbuf_addstr(&path, git_path("shallow_XXXXXX")); - fd = xmkstemp(path.buf); + if (read_only) { + fd = mkstemp(path.buf); + if (fd < 0) { + char buf[PATH_MAX]; + fd = git_mkstemp(buf, sizeof(buf), "shallow_XXXXXX"); + } + if (fd < 0) + die_errno("Unable to create temporary shallow file"); + } else + fd = xmkstemp(path.buf); if (write_in_full(fd, sb.buf, sb.len) != sb.len) die_errno("failed to write to %s", path.buf); diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index b0fa738..171db88 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh @@ -173,6 +173,19 @@ EOF ) ' +test_expect_success POSIXPERM 'shallow fetch from a read-only repo' ' + cp -R .git read-only.git && + find read-only.git -print | xargs chmod -w && + test_when_finished "find read-only.git -type d -print | xargs chmod +w" && + git clone --no-local --depth=2 read-only.git from-read-only && + git --git-dir=from-read-only/.git log --format=%s >actual && + cat >expect <<EOF && +add-1-back +4 +EOF + test_cmp expect actual +' + if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then say 'skipping remaining tests, git built without http support' test_done diff --git a/upload-pack.c b/upload-pack.c index 0c44f6b..11404b4 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -84,7 +84,7 @@ static void create_pack_file(void) char *shallow_file = NULL; if (shallow_nr) { - shallow_file = setup_temporary_shallow(NULL); + shallow_file = setup_temporary_shallow(NULL, 1); argv[arg++] = "--shallow-file"; argv[arg++] = shallow_file; }
-- 1.9.0.66.g14f785a