Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
fix memcpy of overlapping area

diff --combined commit.c
index 632061c2c3669991b6526a5b6b452e3b54ee718c,a51d2cd1bed0c18b26f8f8123f1dab398a5019d8..731191e63bd39a89a8ea4ed0390c49d5605cdbed
--- 1/commit.c
--- 2/commit.c
+++ b/commit.c
@@@ -5,7 -5,6 +5,7 @@@
  #include "utf8.h"
  #include "diff.h"
  #include "revision.h"
 +#include "notes.h"
  
  int save_commit_buffer = 1;
  
@@@ -200,7 -199,7 +200,7 @@@ struct commit_graft *lookup_commit_graf
        return commit_graft[pos];
  }
  
 -int write_shallow_commits(int fd, int use_pack_protocol)
 +int write_shallow_commits(struct strbuf *out, int use_pack_protocol)
  {
        int i, count = 0;
        for (i = 0; i < commit_graft_nr; i++)
@@@ -209,10 -208,12 +209,10 @@@
                                sha1_to_hex(commit_graft[i]->sha1);
                        count++;
                        if (use_pack_protocol)
 -                              packet_write(fd, "shallow %s", hex);
 +                              packet_buf_write(out, "shallow %s", hex);
                        else {
 -                              if (write_in_full(fd, hex,  40) != 40)
 -                                      break;
 -                              if (write_str_in_full(fd, "\n") != 1)
 -                                      break;
 +                              strbuf_addstr(out, hex);
 +                              strbuf_addch(out, '\n');
                        }
                }
        return count;
@@@ -224,7 -225,7 +224,7 @@@ int unregister_shallow(const unsigned c
        if (pos < 0)
                return -1;
        if (pos + 1 < commit_graft_nr)
-               memcpy(commit_graft + pos, commit_graft + pos + 1,
+               memmove(commit_graft + pos, commit_graft + pos + 1,
                                sizeof(struct commit_graft *)
                                * (commit_graft_nr - pos - 1));
        commit_graft_nr--;