Hi,
On Mon, 5 Oct 2009, Johannes Schindelin wrote:
> On Sun, 4 Oct 2009, Junio C Hamano wrote:
>
> > - Checking "del" to decide if you want to say "reset" feels funny.
>
> Right. But I wanted to avoid checking for del, add and reset
> separately.
>
> So I was wrong, and will fix.
This is the current interdiff:
-- snipsnap --
diff --git a/submodule.c b/submodule.c
index 3f2590d..b441ea1 100644
--- a/submodule.c
+++ b/submodule.c
@@ -92,15 +92,18 @@ void show_submodule_summary(FILE *f, const char *path,
if (!message) {
while ((commit = get_revision(&rev))) {
strbuf_setlen(&sb, 0);
- if (del)
- strbuf_addstr(&sb, commit->object.flags &
- SYMMETRIC_LEFT ? del : add);
+ if (commit->object.flags & SYMMETRIC_LEFT) {
+ if (del)
+ strbuf_addstr(&sb, del);
+ }
+ else if (add)
+ strbuf_addstr(&sb, add);
format_commit_message(commit, format, &sb,
rev.date_mode);
- if (del)
+ if (reset)
strbuf_addstr(&sb, reset);
strbuf_addch(&sb, '\n');
- fwrite(sb.buf, sb.len, 1, f);
+ fprintf(f, "%s", sb.buf);
}
clear_commit_marks(left, ~0);
clear_commit_marks(right, ~0);
--
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