summaryrefslogtreecommitdiff
path: root/index-pack.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-02-22 00:59:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-23 06:30:33 (GMT)
commit2e0afafebd8c5a1a8cdddb0714073461229ecfef (patch)
treeeba8a2fa0f5c7d5de4043141bd6ce33bb7b34034 /index-pack.c
parent437b1b20df4b356c9342dac8d38849f24ef44f27 (diff)
downloadgit-2e0afafebd8c5a1a8cdddb0714073461229ecfef.zip
git-2e0afafebd8c5a1a8cdddb0714073461229ecfef.tar.gz
git-2e0afafebd8c5a1a8cdddb0714073461229ecfef.tar.bz2
Add git-bundle: move objects and references by archive
Some workflows require use of repositories on machines that cannot be connected, preventing use of git-fetch / git-push to transport objects and references between the repositories. git-bundle provides an alternate transport mechanism, effectively allowing git-fetch and git-pull to operate using sneakernet transport. `git-bundle create` allows the user to create a bundle containing one or more branches or tags, but with specified basis assumed to exist on the target repository. At the receiving end, git-bundle acts like git-fetch-pack, allowing the user to invoke git-fetch or git-pull using the bundle file as the URL. git-fetch and git-ls-remote determine they have a bundle URL by checking that the URL points to a file, but are otherwise unchanged in operation with bundles. The original patch was done by Mark Levedahl <mdl123@verizon.net>. It was updated to make git-bundle a builtin, and get rid of the tar format: now, the first line is supposed to say "# v2 git bundle", the next lines either contain a prerequisite ("-" followed by the hash of the needed commit), or a ref (the hash of a commit, followed by the name of the ref), and finally the pack. As a result, the bundle argument can be "-" now. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'index-pack.c')
-rw-r--r--index-pack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/index-pack.c b/index-pack.c
index 72e0962..24bbdcd 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -457,8 +457,8 @@ static void parse_pack_objects(unsigned char *sha1)
/* If input_fd is a file, we should have reached its end now. */
if (fstat(input_fd, &st))
die("cannot fstat packfile: %s", strerror(errno));
- if (S_ISREG(st.st_mode) && st.st_size != consumed_bytes)
- die("pack has junk at the end");
+ if (input_fd && S_ISREG(st.st_mode) && st.st_size != consumed_bytes)
+ die("pack has junk at the end: 0%o, %d, %d %d", st.st_mode, (int)st.st_size, (int)consumed_bytes, input_fd);
if (!nr_deltas)
return;