From: Junio C Hamano <junkio@cox.net>
Date: Sun, 12 Feb 2006 13:03:40 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v1.3.0-rc1~54^2~82
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cfac3f3fa7267c8c06372875f3b05311f0fe4346?hp=-c

Merge branch 'master'

* master:
Add howto about separating topics.
Merge branch 'pb/repo'
Add support for explicit type specifiers when calling git-repo-config
Merge branch 'jc/fixdiff'
diff-tree: do not default to -c
Avoid using "git-var -l" until it gets fixed.
t5500: adjust to change in pack-object reporting behaviour.
Only call git-rerere if $GIT_DIR/rr-cache exists.
Use a relative path for SVN importing
fetch-clone progress: finishing touches.
Fix fetch-clone in the presense of signals
Make "git clone" pack-fetching download statistics better
Make "git clone" less of a deathly quiet experience
---

cfac3f3fa7267c8c06372875f3b05311f0fe4346
diff --combined cache.h
index cd58fada15,c255421ab9..d7f5bdef07
--- a/cache.h
+++ b/cache.h
@@@ -91,7 -91,6 +91,7 @@@ struct cache_entry 
  #define CE_NAMEMASK  (0x0fff)
  #define CE_STAGEMASK (0x3000)
  #define CE_UPDATE    (0x4000)
 +#define CE_VALID     (0x8000)
  #define CE_STAGESHIFT 12
  
  #define create_ce_flags(len, stage) htons((len) | ((stage) << CE_STAGESHIFT))
@@@ -145,8 -144,8 +145,8 @@@ extern int add_cache_entry(struct cache
  extern int remove_cache_entry_at(int pos);
  extern int remove_file_from_cache(const char *path);
  extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
 -extern int ce_match_stat(struct cache_entry *ce, struct stat *st);
 -extern int ce_modified(struct cache_entry *ce, struct stat *st);
 +extern int ce_match_stat(struct cache_entry *ce, struct stat *st, int);
 +extern int ce_modified(struct cache_entry *ce, struct stat *st, int);
  extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
  extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type);
  extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object);
@@@ -162,7 -161,6 +162,7 @@@ extern int commit_index_file(struct cac
  extern void rollback_index_file(struct cache_file *);
  
  extern int trust_executable_bit;
 +extern int assume_unchanged;
  extern int only_use_symrefs;
  extern int diff_rename_limit_default;
  extern int shared_repository;
@@@ -350,6 -348,6 +350,6 @@@ extern int copy_fd(int ifd, int ofd)
  
  /* Finish off pack transfer receiving end */
  extern int receive_unpack_pack(int fd[2], const char *me, int quiet);
- extern int receive_keep_pack(int fd[2], const char *me);
+ extern int receive_keep_pack(int fd[2], const char *me, int quiet);
  
  #endif /* CACHE_H */