diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-28 19:39:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-28 19:39:26 -0700 |
| commit | 235db154f8b92e53b97ffb93725d394b6e20f398 (patch) | |
| tree | 18161aa7c30964c214969de1a8179831c6a9d9e9 /cache.h | |
| parent | 4a224a9bbec4e7a1a4dcb7a91e663483dc477b78 (diff) | |
| parent | 3deffc52d88df73af72a80a406eb863880bb4d2a (diff) | |
| download | git-235db154f8b92e53b97ffb93725d394b6e20f398.tar.gz git-235db154f8b92e53b97ffb93725d394b6e20f398.tar.xz | |
Merge branch 'mm/reset-report'
* mm/reset-report:
reset: make the reminder output consistent with "checkout"
Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -330,7 +330,7 @@ static inline void remove_name_hash(struct cache_entry *ce) #define remove_file_from_cache(path) remove_file_from_index(&the_index, (path)) #define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags)) #define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags)) -#define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL) +#define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL) #define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options)) #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options)) #define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase)) @@ -476,8 +476,8 @@ extern int check_path(const char *path, int len, struct stat *st, int skiplen); #define REFRESH_QUIET 0x0004 /* be quiet about it */ #define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */ #define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */ -#define REFRESH_SAY_CHANGED 0x0020 /* say "changed" not "needs update" */ -extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen); +#define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */ +extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen, char *header_msg); struct lock_file { struct lock_file *next; |