summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-02-04 09:20:09 +0700
committerJunio C Hamano <gitster@pobox.com>2014-02-05 16:44:51 -0800
commitb4b313f94ab06fabe78fa91b3f2ebbc7ef08b012 (patch)
tree7d11a0d21b8aae16296b29abaf0d1c150d31398f /cache.h
parentbe961c292f1d36097afa1690df68cf90f655c855 (diff)
downloadgit-b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012.tar.gz
reset: support "--mixed --intent-to-add" modend/reset-intent-to-add
When --mixed is used, entries could be removed from index if the target ref does not have them. When "reset" is used in preparation for commit spliting (in a dirty worktree), it could be hard to track what files to be added back. The new option --intent-to-add simplifies it by marking all removed files intent-to-add. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index dc040fb1aa..8f35d12a7e 100644
--- a/cache.h
+++ b/cache.h
@@ -489,6 +489,7 @@ extern int add_to_index(struct index_state *, const char *path, struct stat *, i
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 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 *);