diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-02-04 02:20:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-06 00:44:51 (GMT) |
| commit | b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012 (patch) | |
| tree | 7d11a0d21b8aae16296b29abaf0d1c150d31398f /cache.h | |
| parent | be961c292f1d36097afa1690df68cf90f655c855 (diff) | |
| download | git-b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012.zip git-b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012.tar.gz git-b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012.tar.bz2 | |
reset: support "--mixed --intent-to-add" mode
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 *); |