From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Mar 2009 01:58:25 +0000 (-0700)
Subject: Merge branch 'js/sideband-stderr'
X-Git-Tag: v1.6.3-rc0~142
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6e5660a7ab20275d80262d0a21bc6c52eead9cd7?ds=inline;hp=-c

Merge branch 'js/sideband-stderr'

* js/sideband-stderr:
winansi: support ESC [ K (erase in line)
recv_sideband: Bands #2 and #3 always go to stderr
---

6e5660a7ab20275d80262d0a21bc6c52eead9cd7
diff --combined builtin-fetch-pack.c
index 29f4315e92,2b360994bf..d571253a56
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
@@@ -482,7 -482,7 +482,7 @@@ static int sideband_demux(int fd, void 
  {
  	int *xd = data;
  
- 	return recv_sideband("fetch-pack", xd[0], fd, 2);
+ 	return recv_sideband("fetch-pack", xd[0], fd);
  }
  
  static int get_pack(int xd[2], char **pack_lockfile)
@@@ -800,13 -800,15 +800,13 @@@ struct ref *fetch_pack(struct fetch_pac
  		int fd;
  
  		mtime.sec = st.st_mtime;
 -#ifdef USE_NSEC
 -		mtime.usec = st.st_mtim.usec;
 -#endif
 +		mtime.nsec = ST_MTIME_NSEC(st);
  		if (stat(shallow, &st)) {
  			if (mtime.sec)
  				die("shallow file was removed during fetch");
  		} else if (st.st_mtime != mtime.sec
  #ifdef USE_NSEC
 -				|| st.st_mtim.usec != mtime.usec
 +				|| ST_MTIME_NSEC(st) != mtime.nsec
  #endif
  			  )
  			die("shallow file was changed during fetch");