projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge fixes up to GIT 1.1.4
[git.git]
/
fetch-clone.c
diff --git
a/fetch-clone.c
b/fetch-clone.c
index
2b2aa15
..
859f400
100644
(file)
--- a/
fetch-clone.c
+++ b/
fetch-clone.c
@@
-1,4
+1,5
@@
#include "cache.h"
#include "cache.h"
+#include "exec_cmd.h"
#include <sys/wait.h>
static int finish_pack(const char *pack_tmp_name, const char *me)
#include <sys/wait.h>
static int finish_pack(const char *pack_tmp_name, const char *me)
@@
-27,8
+28,7
@@
static int finish_pack(const char *pack_tmp_name, const char *me)
dup2(pipe_fd[1], 1);
close(pipe_fd[0]);
close(pipe_fd[1]);
dup2(pipe_fd[1], 1);
close(pipe_fd[0]);
close(pipe_fd[1]);
- execlp("git-index-pack","git-index-pack",
- "-o", idx, pack_tmp_name, NULL);
+ execl_git_cmd("index-pack", "-o", idx, pack_tmp_name, NULL);
error("cannot exec git-index-pack <%s> <%s>",
idx, pack_tmp_name);
exit(1);
error("cannot exec git-index-pack <%s> <%s>",
idx, pack_tmp_name);
exit(1);
@@
-47,7
+47,7
@@
static int finish_pack(const char *pack_tmp_name, const char *me)
if (retval < 0) {
if (errno == EINTR)
continue;
if (retval < 0) {
if (errno == EINTR)
continue;
- error("waitpid failed (%s)", strerror(
retval
));
+ error("waitpid failed (%s)", strerror(
errno
));
goto error_die;
}
if (WIFSIGNALED(status)) {
goto error_die;
}
if (WIFSIGNALED(status)) {
@@
-105,8
+105,7
@@
int receive_unpack_pack(int fd[2], const char *me, int quiet)
dup2(fd[0], 0);
close(fd[0]);
close(fd[1]);
dup2(fd[0], 0);
close(fd[0]);
close(fd[1]);
- execlp("git-unpack-objects", "git-unpack-objects",
- quiet ? "-q" : NULL, NULL);
+ execl_git_cmd("unpack-objects", quiet ? "-q" : NULL, NULL);
die("git-unpack-objects exec failed");
}
close(fd[0]);
die("git-unpack-objects exec failed");
}
close(fd[0]);