From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Feb 2016 22:20:08 +0000 (-0800)
Subject: Merge branch 'jk/options-cleanup'
X-Git-Tag: v2.8.0-rc0~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=722c9244452c1853f0592b22c331382c282768c7;p=thirdparty%2Fgit.git

Merge branch 'jk/options-cleanup'

Various clean-ups to the command line option parsing.

* jk/options-cleanup:
  apply, ls-files: simplify "-z" parsing
  checkout-index: disallow "--no-stage" option
  checkout-index: handle "--no-index" option
  checkout-index: handle "--no-prefix" option
  checkout-index: simplify "-z" option parsing
  give "nbuf" strbuf a more meaningful name
---

722c9244452c1853f0592b22c331382c282768c7
diff --cc builtin/hash-object.c
index ff20395c69,d3cb4e5345..f7d3567dd0
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@@ -58,14 -58,15 +58,15 @@@ static void hash_object(const char *pat
  static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,
  			     int literally)
  {
- 	struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
+ 	struct strbuf buf = STRBUF_INIT;
+ 	struct strbuf unquoted = STRBUF_INIT;
  
 -	while (strbuf_getline_lf(&buf, stdin) != EOF) {
 +	while (strbuf_getline(&buf, stdin) != EOF) {
  		if (buf.buf[0] == '"') {
- 			strbuf_reset(&nbuf);
- 			if (unquote_c_style(&nbuf, buf.buf, NULL))
+ 			strbuf_reset(&unquoted);
+ 			if (unquote_c_style(&unquoted, buf.buf, NULL))
  				die("line is badly quoted");
- 			strbuf_swap(&buf, &nbuf);
+ 			strbuf_swap(&buf, &unquoted);
  		}
  		hash_object(buf.buf, type, no_filters ? NULL : buf.buf, flags,
  			    literally);