From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Feb 2014 22:01:40 +0000 (-0800)
Subject: Merge branch 'nd/reset-intent-to-add'
X-Git-Tag: v2.0.0-rc0~153
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=8336832ad99832d21e5ee588bd3d03369048c05a;p=git.git

Merge branch 'nd/reset-intent-to-add'

* nd/reset-intent-to-add:
  reset: support "--mixed --intent-to-add" mode
---

8336832ad99832d21e5ee588bd3d03369048c05a
diff --cc cache.h
index 5994f7a203,8f35d12a7e..9f15744218
--- a/cache.h
+++ b/cache.h
@@@ -485,8 -487,9 +485,9 @@@ extern int remove_file_from_index(struc
  #define ADD_CACHE_IMPLICIT_DOT 32	/* internal to "git add -u/-A" */
  extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
  extern int add_file_to_index(struct index_state *, const char *path, int flags);
 -extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
 +extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, unsigned int refresh_options);
  extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
+ extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
  extern int index_name_is_other(const struct index_state *, const char *, int);
  extern void *read_blob_data_from_index(struct index_state *, const char *, unsigned long *);