projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a "--notags" option for git-p4import.
[git.git]
/
receive-pack.c
diff --git
a/receive-pack.c
b/receive-pack.c
index
e79de91
..
93929b5
100644
(file)
--- a/
receive-pack.c
+++ b/
receive-pack.c
@@
-6,7
+6,7
@@
static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
-static const char
unpacker[] = "git-unpack-objects"
;
+static const char
*unpacker[] = { "unpack-objects", NULL }
;
static int report_status = 0;
static int report_status = 0;
@@
-37,7
+37,7
@@
struct command {
const char *error_string;
unsigned char old_sha1[20];
unsigned char new_sha1[20];
const char *error_string;
unsigned char old_sha1[20];
unsigned char new_sha1[20];
- char ref_name[
0];
+ char ref_name[
FLEX_ARRAY]; /* more */
};
static struct command *commands = NULL;
};
static struct command *commands = NULL;
@@
-92,7
+92,7
@@
static int run_update_hook(const char *refname,
case -ERR_RUN_COMMAND_WAITPID_WRONG_PID:
return error("waitpid is confused");
case -ERR_RUN_COMMAND_WAITPID_SIGNAL:
case -ERR_RUN_COMMAND_WAITPID_WRONG_PID:
return error("waitpid is confused");
case -ERR_RUN_COMMAND_WAITPID_SIGNAL:
- return error("%s died of signal
\n
", update_hook);
+ return error("%s died of signal", update_hook);
case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
return error("%s died strangely", update_hook);
default:
case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
return error("%s died strangely", update_hook);
default:
@@
-158,7
+158,7
@@
static int update(struct command *cmd)
if (run_update_hook(name, old_hex, new_hex)) {
unlink(lock_name);
cmd->error_string = "hook declined";
if (run_update_hook(name, old_hex, new_hex)) {
unlink(lock_name);
cmd->error_string = "hook declined";
- return error("hook declined to update %s
\n
", name);
+ return error("hook declined to update %s", name);
}
else if (rename(lock_name, name) < 0) {
unlink(lock_name);
}
else if (rename(lock_name, name) < 0) {
unlink(lock_name);
@@
-177,7
+177,7
@@
static void run_update_post_hook(struct command *cmd)
{
struct command *cmd_p;
int argc;
{
struct command *cmd_p;
int argc;
- char **argv;
+ c
onst c
har **argv;
if (access(update_post_hook, X_OK) < 0)
return;
if (access(update_post_hook, X_OK) < 0)
return;
@@
-190,10
+190,12
@@
static void run_update_post_hook(struct command *cmd)
argv[0] = update_post_hook;
for (argc = 1, cmd_p = cmd; cmd_p; cmd_p = cmd_p->next) {
argv[0] = update_post_hook;
for (argc = 1, cmd_p = cmd; cmd_p; cmd_p = cmd_p->next) {
+ char *p;
if (cmd_p->error_string)
continue;
if (cmd_p->error_string)
continue;
- argv[argc] = xmalloc(strlen(cmd_p->ref_name) + 1);
- strcpy(argv[argc], cmd_p->ref_name);
+ p = xmalloc(strlen(cmd_p->ref_name) + 1);
+ strcpy(p, cmd_p->ref_name);
+ argv[argc] = p;
argc++;
}
argv[argc] = NULL;
argc++;
}
argv[argc] = NULL;
@@
-257,7
+259,7
@@
static void read_head_info(void)
static const char *unpack(int *error_code)
{
static const char *unpack(int *error_code)
{
- int code = run_command
(unpacker, NULL
);
+ int code = run_command
_v_opt(1, unpacker, RUN_GIT_CMD
);
*error_code = 0;
switch (code) {
*error_code = 0;
switch (code) {