diff options
author | Junio C Hamano <junkio@cox.net> | 2006-11-03 11:23:52 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-03 11:23:52 +0300 |
commit | 407e1d6e127357a0fbe1a9f91ee616a2b7ec29db (patch) | |
tree | a2efb8d179aff14b73db024f936ef0dd092b7a7c /builtin-unpack-objects.c | |
parent | aac91b7eeae4e8cf6521a5370caf03eb432ce492 (diff) | |
parent | 6255ef08ae746bdad34851297a989ad6f36f6a21 (diff) |
Merge branch 'master' into np/index-pack
* master: (90 commits)
gitweb: Better support for non-CSS aware web browsers
gitweb: Output also empty patches in "commitdiff" view
gitweb: Use git-for-each-ref to generate list of heads and/or tags
for-each-ref: "creator" and "creatordate" fields
Add --global option to git-repo-config.
pack-refs: Store the full name of the ref even when packing only tags.
git-clone documentation didn't mention --origin as equivalent of -o
Minor grammar fixes for git-diff-index.txt
link_temp_to_file: call adjust_shared_perm() only when we created the directory
Remove uneccessarily similar printf() from print_ref_list() in builtin-branch
pack-objects doesn't create random pack names
branch: work in subdirectories.
gitweb: Use 's' regexp modifier to secure against filenames with LF
gitweb: Secure against commit-ish/tree-ish with the same name as path
gitweb: esc_html() author in blame
git-svnimport: support for partial imports
link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
Move deny_non_fast_forwards handling completely into receive-pack.
revision traversal: --unpacked does not limit commit list anymore.
Continue traversal when rev-list --unpacked finds a packed commit.
...
Diffstat (limited to 'builtin-unpack-objects.c')
-rw-r--r-- | builtin-unpack-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c index e70a71163d..74a90c1129 100644 --- a/builtin-unpack-objects.c +++ b/builtin-unpack-objects.c @@ -22,7 +22,7 @@ static SHA_CTX ctx; * Make sure at least "min" bytes are available in the buffer, and * return the pointer to the buffer. */ -static void * fill(int min) +static void *fill(int min) { if (min <= len) return buffer + offset; @@ -30,7 +30,7 @@ static void * fill(int min) die("cannot fill %d bytes", min); if (offset) { SHA1_Update(&ctx, buffer, offset); - memcpy(buffer, buffer + offset, len); + memmove(buffer, buffer + offset, len); offset = 0; } do { |