Add a function to set up a merge commit given a branch
or commit, which is currently used when parsing argv in a loop.
Signed-off-by: Jared Hance <jaredhance@xxxxxxxxx>
---
builtin/merge.c | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 439d2c7..cd23880 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -498,11 +498,15 @@ cleanup:
strbuf_release(&bname);
}
-static int git_merge_config(const char *k, const char *v, void *cb)
+static int per_branch_config(const char *k, const char *v, void *cb)
{
- if (branch && !prefixcmp(k, "branch.") &&
- !prefixcmp(k + 7, branch) &&
- !strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
+ const char *variable;
+ if (!branch || prefixcmp(k, "branch.") ||
+ prefixcmp(k + 7, branch))
+ return 1; /* not what I handle */
+
+ variable = k + 7 + strlen(branch);
+ if (!strcmp(variable, ".mergeoptions")) {
const char **argv;
int argc;
char *buf;
@@ -911,6 +915,24 @@ static int evaluate_result(void)
return cnt;
}
+static void setup_merge_commit(struct strbuf *buf,
+ struct commit_list ***remotes, const char *s)
+{
+ struct object *o;
+ struct commit *commit;
+
+ o = peel_to_type(s, 0, NULL, OBJ_COMMIT);
+ if (!o)
+ die("%s - not something we can merge", s);
+ commit = lookup_commit(o->sha1);
+ commit->util = (void *)s;
+ *remotes = &commit_list_insert(commit, *remotes)->next;
+
+ strbuf_addf(buf, "GITHEAD_%s", sha1_to_hex(o->sha1));
+ setenv(buf->buf, s, 1);
+ strbuf_reset(buf);
+}
+
int cmd_merge(int argc, const char **argv, const char *prefix)
{
unsigned char result_tree[20];
@@ -1059,19 +1081,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
strbuf_reset(&buf);
for (i = 0; i < argc; i++) {
- struct object *o;
- struct commit *commit;
-
- o = peel_to_type(argv[i], 0, NULL, OBJ_COMMIT);
- if (!o)
- die("%s - not something we can merge", argv[i]);
- commit = lookup_commit(o->sha1);
- commit->util = (void *)argv[i];
- remotes = &commit_list_insert(commit, remotes)->next;
-
- strbuf_addf(&buf, "GITHEAD_%s", sha1_to_hex(o->sha1));
- setenv(buf.buf, argv[i], 1);
- strbuf_reset(&buf);
+ setup_merge_commit(&buf, &remotes, argv[i]);
}
if (!use_strategies) {
--
1.7.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html