echo "update fail" >>file &&
git commit -a -m "update fail" &&
git rev-parse --verify testgit/origin/heads/update >expect &&
- test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
- git push origin update &&
+ GIT_REMOTE_TESTGIT_PUSH_ERROR="non-fast forward" &&
+ export GIT_REMOTE_TESTGIT_PUSH_ERROR &&
+ test_expect_code 1 git push origin update &&
git rev-parse --verify testgit/origin/heads/update >actual &&
test_cmp expect actual
)
'
-clean_mark () {
- cut -f 2 -d ' ' "$1" |
- git cat-file --batch-check |
- grep commit |
- sort >$(basename "$1")
-}
-
-cmp_marks () {
- test_when_finished "rm -rf git.marks testgit.marks" &&
- clean_mark ".git/testgit/$1/git.marks" &&
- clean_mark ".git/testgit/$1/testgit.marks" &&
- test_cmp git.marks testgit.marks
-}
-
test_expect_success 'proper failure checks for fetching' '
- (cd local &&
- test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error &&
+ (GIT_REMOTE_TESTGIT_FAILURE=1 &&
+ export GIT_REMOTE_TESTGIT_FAILURE &&
+ cd local &&
+ test_must_fail git fetch 2> error &&
cat error &&
grep -q "Error while running fast-import" error
)
test_expect_success 'proper failure checks for pushing' '
(cd local &&
- git checkout -b crash master &&
- echo crash >>file &&
- git commit -a -m crash &&
- test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
- cmp_marks origin
+ test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all
)
'
if (strbuf_getline(buffer, helper, '\n') == EOF) {
if (debug)
fprintf(stderr, "Debug: Remote helper quit.\n");
- return 1;
+ exit(128);
}
if (debug)
return recvline_fh(helper->out, buffer, helper->name);
}
+static void xchgline(struct helper_data *helper, struct strbuf *buffer)
+{
+ sendline(helper, buffer);
+ recvline(helper, buffer);
+}
+
static void write_constant(int fd, const char *str)
{
if (debug)
while (1) {
const char *capname;
int mandatory = 0;
- if (recvline(data, &buf))
- exit(128);
+ recvline(data, &buf);
if (!*buf.buf)
break;
} else if (!strcmp(capname, "signed-tags")) {
data->signed_tags = 1;
} else if (starts_with(capname, "export-marks ")) {
- data->export_marks = xstrdup(capname + strlen("export-marks "));
+ struct strbuf arg = STRBUF_INIT;
+ strbuf_addstr(&arg, "--export-marks=");
+ strbuf_addstr(&arg, capname + strlen("export-marks "));
+ data->export_marks = strbuf_detach(&arg, NULL);
} else if (starts_with(capname, "import-marks")) {
- data->import_marks = xstrdup(capname + strlen("import-marks "));
+ struct strbuf arg = STRBUF_INIT;
+ strbuf_addstr(&arg, "--import-marks=");
+ strbuf_addstr(&arg, capname + strlen("import-marks "));
+ data->import_marks = strbuf_detach(&arg, NULL);
} else if (starts_with(capname, "no-private-update")) {
data->no_private_update = 1;
} else if (mandatory) {
quote_c_style(value, &buf, NULL, 0);
strbuf_addch(&buf, '\n');
- sendline(data, &buf);
- if (recvline(data, &buf))
- exit(128);
+ xchgline(data, &buf);
if (!strcmp(buf.buf, "ok"))
ret = 0;
sendline(data, &buf);
while (1) {
- if (recvline(data, &buf))
- exit(128);
+ recvline(data, &buf);
if (starts_with(buf.buf, "lock ")) {
const char *name = buf.buf + 5;
struct helper_data *data = transport->data;
struct child_process *helper = get_helper(transport);
int argc = 0, i;
- struct strbuf tmp = STRBUF_INIT;
-
memset(fastexport, 0, sizeof(*fastexport));
/* we need to duplicate helper->in because we want to use it after
fastexport->argv[argc++] = "--use-done-feature";
fastexport->argv[argc++] = data->signed_tags ?
"--signed-tags=verbatim" : "--signed-tags=warn-strip";
- if (data->export_marks) {
- strbuf_addf(&tmp, "--export-marks=%s.tmp", data->export_marks);
- fastexport->argv[argc++] = strbuf_detach(&tmp, NULL);
- }
- if (data->import_marks) {
- strbuf_addf(&tmp, "--import-marks=%s", data->import_marks);
- fastexport->argv[argc++] = strbuf_detach(&tmp, NULL);
- }
+ if (data->export_marks)
+ fastexport->argv[argc++] = data->export_marks;
+ if (data->import_marks)
+ fastexport->argv[argc++] = data->import_marks;
for (i = 0; i < revlist_args->nr; i++)
fastexport->argv[argc++] = revlist_args->items[i].string;
goto exit;
sendline(data, &cmdbuf);
- if (recvline_fh(input, &cmdbuf, name))
- exit(128);
-
+ recvline_fh(input, &cmdbuf, name);
if (!strcmp(cmdbuf.buf, "")) {
data->no_disconnect_req = 1;
if (debug)
return !(status == REF_STATUS_OK);
}
-static int push_update_refs_status(struct helper_data *data,
+static void push_update_refs_status(struct helper_data *data,
struct ref *remote_refs,
int flags)
{
struct strbuf buf = STRBUF_INIT;
struct ref *ref = remote_refs;
- int ret = 0;
-
for (;;) {
char *private;
- if (recvline(data, &buf)) {
- ret = 1;
- break;
- }
-
+ recvline(data, &buf);
if (!buf.len)
break;
free(private);
}
strbuf_release(&buf);
- return ret;
}
static int push_refs_with_push(struct transport *transport,
sendline(data, &buf);
strbuf_release(&buf);
- return push_update_refs_status(data, remote_refs, flags);
+ push_update_refs_status(data, remote_refs, flags);
+ return 0;
}
static int push_refs_with_export(struct transport *transport,
if (finish_command(&exporter))
die("Error while running fast-export");
- if (push_update_refs_status(data, remote_refs, flags))
- return 1;
-
- if (data->export_marks) {
- strbuf_addf(&buf, "%s.tmp", data->export_marks);
- rename(buf.buf, data->export_marks);
- strbuf_release(&buf);
- }
-
+ push_update_refs_status(data, remote_refs, flags);
return 0;
}
while (1) {
char *eov, *eon;
- if (recvline(data, &buf))
- exit(128);
+ recvline(data, &buf);
if (!*buf.buf)
break;