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

diff --combined builtin-fetch-pack.c
index 29f4315e925f4c0d53c52aa114a0a314c2ea5165,2b360994bf86fabe8505d5afa7621c9f87a0ee7e..d571253a56c80e0b644b220c870b27726c8f3dfc
--- 1/builtin-fetch-pack.c
--- 2/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");