Merge branch 'maint'

* maint:
rebase -i: do not fail when there is no commit to cherry-pick
test-lib: fix color reset in say_color()
fix pread()'s short read in index-pack

Conflicts:
csum-file.c

diff --cc csum-file.c
index 717d29fc03ba0bf375efa58be8dc0f676d9ac5c4,cfc1ac42b9fc9489237cd0bcd1652fb4df243512..2ddb12a0b70da87afe6fa8a33dce08c6c8ae7f71
--- 1/csum-file.c
--- 2/csum-file.c
+++ b/csum-file.c
@@@ -11,8 -11,10 +11,8 @@@
  #include "progress.h"
  #include "csum-file.h"
  
- static void sha1flush(struct sha1file *f, void *buf, unsigned int count)
 -static void flush(struct sha1file *f, unsigned int count)
++static void flush(struct sha1file *f, void * buf, unsigned int count)
  {
 -      void *buf = f->buffer;
 -
        for (;;) {
                int ret = xwrite(f->fd, buf, count);
                if (ret > 0) {
@@@ -35,17 -37,23 +35,23 @@@ void sha1flush(struct sha1file *f
        unsigned offset = f->offset;
  
        if (offset) {
 -              SHA1_Update(&f->ctx, f->buffer, offset);
 -              flush(f, offset);
 +              git_SHA1_Update(&f->ctx, f->buffer, offset);
-               sha1flush(f, f->buffer, offset);
++              flush(f, f->buffer, offset);
                f->offset = 0;
        }
 -      SHA1_Final(f->buffer, &f->ctx);
+ }
+ 
+ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
+ {
+       int fd;
+ 
+       sha1flush(f);
 +      git_SHA1_Final(f->buffer, &f->ctx);
        if (result)
                hashcpy(result, f->buffer);
        if (flags & (CSUM_CLOSE | CSUM_FSYNC)) {
                /* write checksum and close fd */
-               sha1flush(f, f->buffer, 20);
 -              flush(f, 20);
++              flush(f, f->buffer, 20);
                if (flags & CSUM_FSYNC)
                        fsync_or_die(f->fd, f->name);
                if (close(f->fd))
@@@ -82,8 -81,8 +88,8 @@@ int sha1write(struct sha1file *f, void 
                buf = (char *) buf + nr;
                left -= nr;
                if (!left) {
 -                      SHA1_Update(&f->ctx, f->buffer, offset);
 -                      flush(f, offset);
 +                      git_SHA1_Update(&f->ctx, data, offset);
-                       sha1flush(f, data, offset);
++                      flush(f, data, offset);
                        offset = 0;
                }
                f->offset = offset;

diff --cc csum-file.h
Simple merge

diff --cc index-pack.c
Simple merge

diff --cc t/test-lib.sh
Simple merge