Merge branch 'maint'

Junio C Hamano · Junio C Hamano · commit 73c7f5ec0542 · 2006-12-11T14:12:12.000-08:00
* 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
diff --git 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
@@ -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
@@ -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");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ man7: $(DOC_MAN7)`
`56`	`56`
`57`	`57`	`install: man`
`58`	`58`	`$(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)`
`59`		`- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir)`
`60`		`- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir)`
	`59`	`+ $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir)`
	`60`	`+ $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir)`
`61`	`61`
`62`	`62`
`63`	`63`	`#`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static void flush(void)`
`96`	`96`	`if (output_fd >= 0)`
`97`	`97`	`write_or_die(output_fd, input_buffer, input_offset);`
`98`	`98`	`SHA1_Update(&input_ctx, input_buffer, input_offset);`
`99`		`- memcpy(input_buffer, input_buffer + input_offset, input_len);`
	`99`	`+ memmove(input_buffer, input_buffer + input_offset, input_len);`
`100`	`100`	`input_offset = 0;`
`101`	`101`	`}`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1238,7 +1238,7 @@ static int merge(struct commit *h1,`
`1238`	`1238`
`1239`	`1239`	`tree->object.parsed = 1;`
`1240`	`1240`	`tree->object.type = OBJ_TREE;`
`1241`		`- hash_sha1_file(NULL, 0, tree_type, tree->object.sha1);`
	`1241`	`+ write_sha1_file(NULL, 0, tree_type, tree->object.sha1);`
`1242`	`1242`	`merged_common_ancestors = make_virtual_commit(tree, "ancestor");`
`1243`	`1243`	`}`
`1244`	`1244`