diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-29 23:36:17 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-29 23:36:17 -0800 |
commit | b10b9184afc9e62140d307dcf2f5d7e625f78c79 (patch) | |
tree | 2fd5fc724b38040a9fe198d19e815f2a7080e380 | |
parent | 947c3464e49522c55296a8191aed7946bd0f4308 (diff) | |
parent | 3325cea0f7ef7355f6806b2fc88acdb2e27785ac (diff) | |
download | git-b10b9184afc9e62140d307dcf2f5d7e625f78c79.tar.gz |
Merge branch 'maint'
* maint:
fix memcpy of overlapping area
-rw-r--r-- | commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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--; |