diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-11 14:12:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-11 14:12:12 -0800 |
| commit | 73c7f5ec05428b7da2d1b00a02a3267f1235d8e4 (patch) | |
| tree | 05cfba64adec1c2c274870ac32280947ebef90ef | |
| parent | 4cfeccc75d6ab1ccc433770bac6bf3b15ab486d6 (diff) | |
| parent | 9abd46a3471c2d58976e06a00e937b03672b98bc (diff) | |
| download | git-73c7f5ec05428b7da2d1b00a02a3267f1235d8e4.tar.gz | |
Merge branch 'maint'
* maint:
Make sure the empty tree exists when needed in merge-recursive.
Don't use memcpy when source and dest. buffers may overlap
no need to install manpages as executable
| -rw-r--r-- | Documentation/Makefile | 4 | ||||
| -rw-r--r-- | index-pack.c | 2 | ||||
| -rw-r--r-- | merge-recursive.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index c00f5f62b7..d68bc4a788 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -56,8 +56,8 @@ man7: $(DOC_MAN7) install: man $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) - $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir) - $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir) + $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) + $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) # diff --git a/index-pack.c b/index-pack.c index 8331d99a62..6d6c92bf14 100644 --- a/index-pack.c +++ b/index-pack.c @@ -96,7 +96,7 @@ static void flush(void) if (output_fd >= 0) write_or_die(output_fd, input_buffer, input_offset); SHA1_Update(&input_ctx, input_buffer, input_offset); - memcpy(input_buffer, input_buffer + input_offset, input_len); + memmove(input_buffer, input_buffer + input_offset, input_len); input_offset = 0; } } diff --git a/merge-recursive.c b/merge-recursive.c index cd2cc77bf4..32e186c15e 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1238,7 +1238,7 @@ static int merge(struct commit *h1, tree->object.parsed = 1; tree->object.type = OBJ_TREE; - hash_sha1_file(NULL, 0, tree_type, tree->object.sha1); + write_sha1_file(NULL, 0, tree_type, tree->object.sha1); merged_common_ancestors = make_virtual_commit(tree, "ancestor"); } |