Merge branch 'maint-1.6.5' into maint

* maint-1.6.5: fix memcpy of overlapping area
git-mirror · Jan 30, 2010 · 3325cea · 3325cea
2 parents 63d04a7 + 65d41d4
commit 3325cea
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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--;