From: Junio C Hamano <junkio@cox.net>
Date: Sun, 20 May 2007 09:18:50 +0000 (-0700)
Subject: Merge branch 'mst/connect'
X-Git-Tag: v1.5.3-rc0~216
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e223249a13799c047797c80eab21e4e257283c3d?ds=inline;hp=-c

Merge branch 'mst/connect'

* mst/connect:
connect: display connection progress
---

e223249a13799c047797c80eab21e4e257283c3d
diff --combined cache.h
index 3661a3fdf0,206bbe4fd5..f98ccd0e20
--- a/cache.h
+++ b/cache.h
@@@ -273,6 -273,7 +273,6 @@@ extern void rollback_lock_file(struct l
  extern int delete_ref(const char *, const unsigned char *sha1);
  
  /* Environment bits from configuration mechanism */
 -extern int use_legacy_headers;
  extern int trust_executable_bit;
  extern int has_symlinks;
  extern int assume_unchanged;
@@@ -353,6 -354,7 +353,6 @@@ extern int move_temp_to_file(const cha
  extern int has_sha1_pack(const unsigned char *sha1, const char **ignore);
  extern int has_sha1_file(const unsigned char *sha1);
  extern void *map_sha1_file(const unsigned char *sha1, unsigned long *);
 -extern int legacy_loose_object(unsigned char *);
  
  extern int has_pack_file(const unsigned char *sha1);
  extern int has_pack_index(const unsigned char *sha1);
@@@ -461,7 -463,8 +461,8 @@@ struct ref 
  #define REF_HEADS	(1u << 1)
  #define REF_TAGS	(1u << 2)
  
- extern pid_t git_connect(int fd[2], char *url, const char *prog);
+ #define CONNECT_VERBOSE       (1u << 0)
+ extern pid_t git_connect(int fd[2], char *url, const char *prog, int flags);
  extern int finish_connect(pid_t pid);
  extern int path_match(const char *path, int nr, char **match);
  extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
@@@ -546,7 -549,6 +547,7 @@@ extern void trace_argv_printf(const cha
  /* convert.c */
  extern char *convert_to_git(const char *path, const char *src, unsigned long *sizep);
  extern char *convert_to_working_tree(const char *path, const char *src, unsigned long *sizep);
 +extern void *convert_sha1_file(const char *path, const unsigned char *sha1, unsigned int mode, enum object_type *type, unsigned long *size);
  
  /* match-trees.c */
  void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);