Re: Re: [PATCH v3 4/4] implement automatic fast-forward merge for submodules

On Wed, Jul 07, 2010 at 09:56:45AM -0700, Junio C Hamano wrote:

Heiko Voigt [off-list ref] writes:

quoted

diff --git a/submodule.c b/submodule.c
index 61cb6e2..9bc4b80 100644
--- a/submodule.c
+++ b/submodule.c

@@ -6,6 +6,7 @@
 #include "revision.h"
 #include "run-command.h"
 #include "diffcore.h"
+#include "refs.h"
 
 static int add_submodule_odb(const char *path)
 {

@@ -218,3 +219,164 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)

...
+	while ((commit = get_revision(&revs)) != NULL) {
+		struct object *o = &(commit->object);
+		if (in_merge_bases(b, &commit, 1)) {
+			add_object_array(o, NULL, &merges);
+		}

Unnecessary braces around a single statement.  I've fixed some other style
violations to this file while replacing the topic branch.

True, that must be a leftover from development. I will check that out
once you pushed the new pu.

quoted

...
+static void print_commit(struct commit *commit)
+{
+	struct strbuf sb = STRBUF_INIT;
+	struct pretty_print_context ctx = {0};
+	ctx.date_mode = DATE_NORMAL;
+	format_commit_message(commit, " %h: %m %s", &sb, &ctx);
+	fprintf(stderr, "%s\n", sb.buf);
+}

strbuf_release(&sb)???

Definitely, thanks for catching that.

cheers Heiko