diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 22:01:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 22:01:40 (GMT) |
| commit | 8336832ad99832d21e5ee588bd3d03369048c05a (patch) | |
| tree | 787d8c70b31315c46780323e95c3cc713a961914 /cache.h | |
| parent | 795dd116bb655f8aa8c206ecaf415527871cb7a6 (diff) | |
| parent | b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012 (diff) | |
| download | git-8336832ad99832d21e5ee588bd3d03369048c05a.zip git-8336832ad99832d21e5ee588bd3d03369048c05a.tar.gz git-8336832ad99832d21e5ee588bd3d03369048c05a.tar.bz2 | |
Merge branch 'nd/reset-intent-to-add'
* nd/reset-intent-to-add:
reset: support "--mixed --intent-to-add" mode
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -487,6 +487,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, 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 *); |