summaryrefslogtreecommitdiff
path: root/receive-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-03 05:41:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-03 05:41:47 (GMT)
commitaac91b7eeae4e8cf6521a5370caf03eb432ce492 (patch)
tree7542e33984d341d8dbbffb3827c37dfaea4e87cc /receive-pack.c
parent4508dde16951df00529207f179fee405e8646a64 (diff)
parent861ed12106d7f8e65b90c8a5ed4a026cd71a044d (diff)
downloadgit-aac91b7eeae4e8cf6521a5370caf03eb432ce492.zip
git-aac91b7eeae4e8cf6521a5370caf03eb432ce492.tar.gz
git-aac91b7eeae4e8cf6521a5370caf03eb432ce492.tar.bz2
Merge branch 'sp/keep-pack' into np/index-pack
* sp/keep-pack: (29 commits) Remove unused variable in receive-pack. Teach git-index-pack how to keep a pack file. Only repack active packs by skipping over kept packs. Allow short pack names to git-pack-objects --unpacked=. git-send-email: Read the default SMTP server from the GIT config file git-send-email: Document support for local sendmail instead of SMTP server Swap the porcelain and plumbing commands in the git man page Mention that pull can work locally in the synopsis gitweb: Add "next" link to commitdiff view gitweb: Move git_get_last_activity subroutine earlier Documentation: fix git-format-patch mark-up and link it from git.txt Documentation: Update information about <format> in git-for-each-ref Bash completion support for aliases gitweb: Fix up bogus $stylesheet declarations tests: merge-recursive is usable without Python gitweb: Check git base URLs before generating URL from it Documentation: add git in /etc/services. Documentation: add upload-archive service to git-daemon. git-cherry: document limit and add diagram diff-format.txt: Correct information about pathnames quoting in patch format ...
Diffstat (limited to 'receive-pack.c')
-rw-r--r--receive-pack.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/receive-pack.c b/receive-pack.c
index ea2dbd4..675b1c1 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -273,11 +273,10 @@ static void read_head_info(void)
}
}
-static const char *unpack(int *error_code)
+static const char *unpack(void)
{
int code = run_command_v_opt(1, unpacker, RUN_GIT_CMD);
- *error_code = 0;
switch (code) {
case 0:
return NULL;
@@ -294,7 +293,6 @@ static const char *unpack(int *error_code)
case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
return "unpacker died strangely";
default:
- *error_code = -code;
return "unpacker exited with error code";
}
}
@@ -345,8 +343,7 @@ int main(int argc, char **argv)
read_head_info();
if (commands) {
- int code;
- const char *unpack_status = unpack(&code);
+ const char *unpack_status = unpack();
if (!unpack_status)
execute_commands();
if (report_status)