From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Aug 2009 02:39:26 +0000 (-0700)
Subject: Merge branch 'mm/reset-report'
X-Git-Tag: v1.6.5-rc0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/235db154f8b92e53b97ffb93725d394b6e20f398?ds=inline;hp=-c

Merge branch 'mm/reset-report'

* mm/reset-report:
reset: make the reminder output consistent with "checkout"
Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
---

235db154f8b92e53b97ffb93725d394b6e20f398
diff --combined cache.h
index dd7f71eba5,fda9816139..808dabacd6
--- a/cache.h
+++ b/cache.h
@@@ -330,7 -330,7 +330,7 @@@ static inline void remove_name_hash(str
  #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))
@@@ -469,15 -469,15 +469,15 @@@ extern int index_path(unsigned char *sh
  extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
  
  /* "careful lstat()" */
 -extern int check_path(const char *path, int len, struct stat *st);
 +extern int check_path(const char *path, int len, struct stat *st, int skiplen);
  
  #define REFRESH_REALLY		0x0001	/* ignore_valid */
  #define REFRESH_UNMERGED	0x0002	/* allow unmerged */
  #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;
@@@ -512,7 -512,6 +512,7 @@@ extern int log_all_ref_updates
  extern int warn_ambiguous_refs;
  extern int shared_repository;
  extern const char *apply_default_whitespace;
 +extern const char *apply_default_ignorewhitespace;
  extern int zlib_compression_level;
  extern int core_compression_level;
  extern int core_compression_seen;
@@@ -520,7 -519,6 +520,7 @@@ extern size_t packed_git_window_size
  extern size_t packed_git_limit;
  extern size_t delta_base_cache_limit;
  extern int auto_crlf;
 +extern int read_replace_refs;
  extern int fsync_object_files;
  extern int core_preload_index;
  
@@@ -657,11 -655,7 +657,11 @@@ char *strip_path_suffix(const char *pat
  
  /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
  extern int sha1_object_info(const unsigned char *, unsigned long *);
 -extern void * read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size);
 +extern void *read_sha1_file_repl(const unsigned char *sha1, enum object_type *type, unsigned long *size, const unsigned char **replacement);
 +static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
 +{
 +	return read_sha1_file_repl(sha1, type, size, NULL);
 +}
  extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
  extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
  extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);