Skip to content

Commit 8f64728

Browse files
committed
Merge 'remote-hg-prerequisites' into HEAD
These fixes were necessary for Sverre Rabbelier's remote-hg to work, but for some magic reason they are not necessary for the current remote-hg. Makes you wonder how that one gets away with it. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 97449a4 + 7804f37 commit 8f64728

File tree

4 files changed

+42
-6
lines changed

4 files changed

+42
-6
lines changed

builtin/clone.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
10221022
}
10231023

10241024
if (!is_local && !complete_refs_before_fetch)
1025-
transport_fetch_refs(transport, mapped_refs);
1025+
if (transport_fetch_refs(transport, mapped_refs))
1026+
die(_("could not fetch refs from %s"),
1027+
transport->url);
10261028

10271029
remote_head = find_ref_by_name(refs, "HEAD");
10281030
remote_head_points_at =

builtin/fast-export.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -847,9 +847,20 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info)
847847
}
848848
}
849849

850+
static void handle_reset(const char *name, struct object *object)
851+
{
852+
int mark = get_object_mark(object);
853+
854+
if (mark)
855+
printf("reset %s\nfrom :%d\n\n", name,
856+
get_object_mark(object));
857+
else
858+
printf("reset %s\nfrom %s\n\n", name,
859+
oid_to_hex(&object->oid));
860+
}
861+
850862
static void handle_tags_and_duplicates(void)
851863
{
852-
struct commit *commit;
853864
int i;
854865

855866
for (i = extra_refs.nr - 1; i >= 0; i--) {
@@ -863,9 +874,7 @@ static void handle_tags_and_duplicates(void)
863874
if (anonymize)
864875
name = anonymize_refname(name);
865876
/* create refs pointing to already seen commits */
866-
commit = (struct commit *)object;
867-
printf("reset %s\nfrom :%d\n\n", name,
868-
get_object_mark(&commit->object));
877+
handle_reset(name, object);
869878
show_progress();
870879
break;
871880
}

t/t5801-remote-helpers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ test_expect_success 'push update refs failure' '
228228
echo "update fail" >>file &&
229229
git commit -a -m "update fail" &&
230230
git rev-parse --verify testgit/origin/heads/update >expect &&
231-
test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
231+
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
232232
git push origin update &&
233233
git rev-parse --verify testgit/origin/heads/update >actual &&
234234
test_cmp expect actual

transport-helper.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#include "refs.h"
1414

1515
static int debug;
16+
/* TODO: put somewhere sensible, e.g. git_transport_options? */
17+
static int auto_gc = 1;
1618

1719
struct helper_data {
1820
const char *name;
@@ -422,10 +424,25 @@ static int get_exporter(struct transport *transport,
422424
for (i = 0; i < revlist_args->nr; i++)
423425
argv_array_push(&fastexport->args, revlist_args->items[i].string);
424426

427+
argv_array_push(&fastexport->args, "--");
428+
425429
fastexport->git_cmd = 1;
426430
return start_command(fastexport);
427431
}
428432

433+
static void check_helper_status(struct helper_data *data)
434+
{
435+
int pid, status;
436+
437+
pid = waitpid(data->helper->pid, &status, WNOHANG);
438+
if (pid < 0)
439+
die("Could not retrieve status of remote helper '%s'",
440+
data->name);
441+
if (pid > 0 && WIFEXITED(status))
442+
die("Remote helper '%s' died with %d",
443+
data->name, WEXITSTATUS(status));
444+
}
445+
429446
static int fetch_with_import(struct transport *transport,
430447
int nr_heads, struct ref **to_fetch)
431448
{
@@ -462,6 +479,7 @@ static int fetch_with_import(struct transport *transport,
462479

463480
if (finish_command(&fastimport))
464481
die("Error while running fast-import");
482+
check_helper_status(data);
465483

466484
/*
467485
* The fast-import stream of a remote helper that advertises
@@ -495,6 +513,12 @@ static int fetch_with_import(struct transport *transport,
495513
}
496514
}
497515
strbuf_release(&buf);
516+
if (auto_gc) {
517+
const char *argv_gc_auto[] = {
518+
"gc", "--auto", "--quiet", NULL,
519+
};
520+
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
521+
}
498522
return 0;
499523
}
500524

@@ -922,6 +946,7 @@ static int push_refs_with_export(struct transport *transport,
922946

923947
if (finish_command(&exporter))
924948
die("Error while running fast-export");
949+
check_helper_status(data);
925950
if (push_update_refs_status(data, remote_refs, flags))
926951
return 1;
927952

0 commit comments

Comments
 (0)