From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 20:46:32 +0000 (-0800)
Subject: Merge branch 'jk/maint-rev-list-nul' into maint
X-Git-Tag: v1.7.3.3~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e7b9b80e2f82319b80bf99d973463ef6d39e533c;hp=-c;p=git.git

Merge branch 'jk/maint-rev-list-nul' into maint

* jk/maint-rev-list-nul:
  rev-list: handle %x00 NUL in user format
---

e7b9b80e2f82319b80bf99d973463ef6d39e533c
diff --combined builtin/rev-list.c
index 158ce1111,3b2dca080..ba27d39f9
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@@ -11,9 -11,9 +11,9 @@@
  static const char rev_list_usage[] =
  "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
  "  limiting output:\n"
 -"    --max-count=nr\n"
 -"    --max-age=epoch\n"
 -"    --min-age=epoch\n"
 +"    --max-count=<n>\n"
 +"    --max-age=<epoch>\n"
 +"    --min-age=<epoch>\n"
  "    --sparse\n"
  "    --no-merges\n"
  "    --remove-empty\n"
@@@ -33,7 -33,7 +33,7 @@@
  "    --objects | --objects-edge\n"
  "    --unpacked\n"
  "    --header | --pretty\n"
 -"    --abbrev=nr | --no-abbrev\n"
 +"    --abbrev=<n> | --no-abbrev\n"
  "    --abbrev-commit\n"
  "    --left-right\n"
  "  special purpose:\n"
@@@ -147,8 -147,10 +147,10 @@@ static void show_commit(struct commit *
  			}
  		} else {
  			if (revs->commit_format != CMIT_FMT_USERFORMAT ||
- 			    buf.len)
- 				printf("%s%c", buf.buf, info->hdr_termination);
+ 			    buf.len) {
+ 				fwrite(buf.buf, 1, buf.len, stdout);
+ 				putchar(info->hdr_termination);
+ 			}
  		}
  		strbuf_release(&buf);
  	} else {