Merge branch 'maint-1.6.5' into maint

* maint-1.6.5: fix memcpy of overlapping area
2010-01-29 23:36:13 -08:00 · 2010-01-29 23:36:13 -08:00 · 3325cea0f7
commit 3325cea0f7
parent 63d04a7804 65d41d48a4
1 changed files with 1 additions and 1 deletions
--- a/commit.c
+++ b/commit.c
@ -224,7 +224,7 @@ int unregister_shallow(const unsigned char *sha1)
 	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--;