kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/maint-show-tag' into maint 

* jk/maint-show-tag:
  show: add space between multiple items
  show: suppress extra newline when showing annotated tag
maint
Junio C Hamano 2009-08-21 11:33:54 -07:00
parent 07d6309e63 ae03ee644e
commit 985d540083
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-log.c
View File

@ -257,7 +257,7 @@ static void show_tagger(char *buf, int len, struct rev_info *rev)
pp_user_info("Tagger", rev->commit_format, &out, buf, rev->date_mode, pp_user_info("Tagger", rev->commit_format, &out, buf, rev->date_mode,
git_log_output_encoding ? git_log_output_encoding ?
git_log_output_encoding: git_commit_encoding); git_log_output_encoding: git_commit_encoding);
printf("%s\n", out.buf); printf("%s", out.buf);
strbuf_release(&out); strbuf_release(&out);
} }


@ -329,11 +329,14 @@ int cmd_show(int argc, const char **argv, const char *prefix)
case OBJ_TAG: { case OBJ_TAG: {
struct tag *t = (struct tag *)o; struct tag *t = (struct tag *)o;


if (rev.shown_one)
putchar('\n');
printf("%stag %s%s\n", printf("%stag %s%s\n",
diff_get_color_opt(&rev.diffopt, DIFF_COMMIT), diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
t->tag, t->tag,
diff_get_color_opt(&rev.diffopt, DIFF_RESET)); diff_get_color_opt(&rev.diffopt, DIFF_RESET));
ret = show_object(o->sha1, 1, &rev); ret = show_object(o->sha1, 1, &rev);
rev.shown_one = 1;
if (ret) if (ret)
break; break;
o = parse_object(t->tagged->sha1); o = parse_object(t->tagged->sha1);
@ -345,12 +348,15 @@ int cmd_show(int argc, const char **argv, const char *prefix)
break; break;
} }
case OBJ_TREE: case OBJ_TREE:
if (rev.shown_one)
putchar('\n');
printf("%stree %s%s\n\n", printf("%stree %s%s\n\n",
diff_get_color_opt(&rev.diffopt, DIFF_COMMIT), diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
name, name,
diff_get_color_opt(&rev.diffopt, DIFF_RESET)); diff_get_color_opt(&rev.diffopt, DIFF_RESET));
read_tree_recursive((struct tree *)o, "", 0, 0, NULL, read_tree_recursive((struct tree *)o, "", 0, 0, NULL,
show_tree_object, NULL); show_tree_object, NULL);
rev.shown_one = 1;
break; break;
case OBJ_COMMIT: case OBJ_COMMIT:
rev.pending.nr = rev.pending.alloc = 0; rev.pending.nr = rev.pending.alloc = 0;