diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-18 00:42:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-18 00:42:01 -0700 |
| commit | 9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e (patch) | |
| tree | d49794a304c2b949d9a49e56b7e5028cce44e406 /cache.h | |
| parent | 148c63006a8e4985a9eee0863073588d8ac18a8a (diff) | |
| parent | 58f6fb53dd1104559f6f5507562a975c0ff079af (diff) | |
| download | git-9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e.tar.gz | |
Merge branch 'cr/reset'
* cr/reset:
Simplify cache API
An additional test for "git-reset -- path"
Make "git reset" a builtin.
Move make_cache_entry() from merge-recursive.c into read-cache.c
Add tests for documented features of "git reset".
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -264,6 +264,7 @@ extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall extern int remove_index_entry_at(struct index_state *, int pos); extern int remove_file_from_index(struct index_state *, const char *path); extern int add_file_to_index(struct index_state *, const char *path, int verbose); +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(struct cache_entry *a, struct cache_entry *b); extern int ie_match_stat(struct index_state *, struct cache_entry *, struct stat *, int); extern int ie_modified(struct index_state *, struct cache_entry *, struct stat *, int); |