From: Junio C Hamano <junkio@cox.net>
Date: Mon, 19 Mar 2007 05:21:06 +0000 (-0700)
Subject: Merge branch 'sp/run-command'
X-Git-Tag: v1.5.1-rc1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3635a187704ed30b32eb11f5098496e5e435a19d?ds=sidebyside;hp=-c

Merge branch 'sp/run-command'

* sp/run-command:
Use run_command within send-pack
Use run_command within receive-pack to invoke index-pack
Use run_command within merge-index
Use run_command for proxy connections
Use RUN_GIT_CMD to run push backends
Correct new compiler warnings in builtin-revert
Replace fork_with_pipe in bundle with run_command
Teach run-command to redirect stdout to /dev/null
Teach run-command about stdout redirection
---

3635a187704ed30b32eb11f5098496e5e435a19d
diff --combined cache.h
index 3818e10f8c,4f1066744c..5396d3366d
--- a/cache.h
+++ b/cache.h
@@@ -371,11 -371,9 +371,11 @@@ struct pack_window 
  extern struct packed_git {
  	struct packed_git *next;
  	struct pack_window *windows;
 -	uint32_t *index_base;
 +	const void *index_data;
  	off_t index_size;
  	off_t pack_size;
 +	time_t mtime;
 +	int index_version;
  	int pack_fd;
  	int pack_local;
  	unsigned char sha1[20];
@@@ -413,7 -411,7 +413,7 @@@ extern int server_supports(const char *
  
  extern struct packed_git *parse_pack_index(unsigned char *sha1);
  extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
 -						char *idx_path);
 +						const char *idx_path);
  
  extern void prepare_packed_git(void);
  extern void reprepare_packed_git(void);
@@@ -425,7 -423,7 +425,7 @@@ extern struct packed_git *find_sha1_pac
  extern void pack_report(void);
  extern unsigned char* use_pack(struct packed_git *, struct pack_window **, off_t, unsigned int *);
  extern void unuse_pack(struct pack_window **);
 -extern struct packed_git *add_packed_git(char *, int, int);
 +extern struct packed_git *add_packed_git(const char *, int, int);
  extern uint32_t num_packed_objects(const struct packed_git *p);
  extern int nth_packed_object_sha1(const struct packed_git *, uint32_t, unsigned char*);
  extern off_t find_pack_entry_one(const unsigned char *, struct packed_git *);
@@@ -451,7 -449,7 +451,7 @@@ extern int check_repository_format_vers
  extern char git_default_email[MAX_GITNAME];
  extern char git_default_name[MAX_GITNAME];
  
- extern char *git_commit_encoding;
+ extern const char *git_commit_encoding;
  extern const char *git_log_output_encoding;
  
  extern int copy_fd(int ifd, int ofd);
@@@ -482,7 -480,6 +482,7 @@@ extern struct tag *alloc_tag_node(void)
  extern void alloc_report(void);
  
  /* trace.c */
 +extern int nfasprintf(char **str, const char *fmt, ...);
  extern int nfvasprintf(char **str, const char *fmt, va_list va);
  extern void trace_printf(const char *format, ...);
  extern void trace_argv_printf(const char **argv, int count, const char *format, ...);