From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Feb 2016 22:20:06 +0000 (-0800)
Subject: Merge branch 'cc/untracked'
X-Git-Tag: v2.8.0-rc0~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e35fcb412965f855e5ac6f469343e2f8e28d5ae;p=git

Merge branch 'cc/untracked'

Update the untracked cache subsystem and change its primary UI from
"git update-index" to "git config".

* cc/untracked:
  t7063: add tests for core.untrackedCache
  test-dump-untracked-cache: don't modify the untracked cache
  config: add core.untrackedCache
  dir: simplify untracked cache "ident" field
  dir: add remove_untracked_cache()
  dir: add {new,add}_untracked_cache()
  update-index: move 'uc' var declaration
  update-index: add untracked cache notifications
  update-index: add --test-untracked-cache
  update-index: use enum for untracked cache options
  dir: free untracked cache when removing it
---

0e35fcb412965f855e5ac6f469343e2f8e28d5ae
diff --cc builtin/update-index.c
index 7c5c143de5,7a5533491e..dbc23a46b1
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@@ -903,8 -910,8 +912,8 @@@ static int reupdate_callback(struct par
  
  int cmd_update_index(int argc, const char **argv, const char *prefix)
  {
 -	int newfd, entries, has_errors = 0, line_termination = '\n';
 +	int newfd, entries, has_errors = 0, nul_term_line = 0;
- 	int untracked_cache = -1;
+ 	enum uc_mode untracked_cache = UC_UNSPECIFIED;
  	int read_from_stdin = 0;
  	int prefix_length = prefix ? strlen(prefix) : 0;
  	int preferred_index_format = 0;