Re: [PATCH] allow multiple calls to submodule merge search for the same path
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] allow multiple calls to submodule merge search for the same path · Heiko Voigt <hidden>
- 2016-06-15 · Re: [PATCH] allow multiple calls to submodule merge search for the same path · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] allow multiple calls to submodule merge search for the same path · Junio C Hamano <hidden>
Junio C Hamano [off-list ref] writes:
Junio C Hamano [off-list ref] writes:quoted
Heiko Voigt [off-list ref] writes:quoted
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 8f6f2d6..603fb72 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh@@ -269,7 +269,7 @@ test_expect_success 'setup for recursive merge with submodule' ' ' # merge should leave submodule unmerged in index -test_expect_failure 'recursive merge with submodule' ' +test_expect_success 'recursive merge with submodule' ' (cd merge-recursive && test_must_fail git merge top-bc && echo "160000 $(git rev-parse top-cb:sub) 2 sub" > expect2 &&What is this patch based on?Ah, nevermind. I figured it out. Thanks.
Just FYI; squashed this on top to fix compilation breakage. Thanks. submodule.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/submodule.c b/submodule.c
index 21a57d2..752cd8a 100644
--- a/submodule.c
+++ b/submodule.c@@ -738,6 +738,7 @@ static int find_first_merges(struct object_array *result, const char *path, struct object_array merges; struct commit *commit; int contains_another; + FILE *out; char merged_revision[42]; const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
@@ -762,14 +763,15 @@ static int find_first_merges(struct object_array *result, const char *path, if (start_command(&cp)) die("Could not run 'git rev-list --merges --ancestry-path --all %s' " "command in submodule %s", merged_revision, path); - FILE *out = fdopen(cp.out, "r"); + out = fdopen(cp.out, "r"); if (!out) die("Could not open pipe of rev-list command."); /* save all revisions from the above list that contain b */ while (strbuf_getline(&one_rev, out, '\n') != EOF) { + struct object *o; commit = lookup_commit_reference_by_name(one_rev.buf); - struct object *o = &(commit->object); + o = &(commit->object); if (in_merge_bases(b, &commit, 1)) add_object_array(o, NULL, &merges); }