X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit-tree.c;h=0d504e7e4be10083da6e677bbcb95bc186fc6277;hb=2eb6d82eaa869a1faf4ba3326fd628f76f9f93a8;hp=cfd6730fe8da68a9b4e10ccf6481a2a1264fc81d;hpb=3c249c950649a37f2871a8b193f01a0640a20aef;p=git.git

diff --git a/commit-tree.c b/commit-tree.c
index cfd6730f..0d504e7e 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -7,9 +7,7 @@
 
 #include <pwd.h>
 #include <time.h>
-#include <string.h>
 #include <ctype.h>
-#include <time.h>
 
 #define BLOCKING (1ul << 14)
 
@@ -97,20 +95,33 @@ static void check_valid(unsigned char *sha1, const char *expect)
  * how multi-way merges are represented.
  */
 #define MAXPARENT (16)
+static unsigned char parent_sha1[MAXPARENT][20];
+
+static char *commit_tree_usage = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
 
-static char *commit_tree_usage = "commit-tree <sha1> [-p <sha1>]* < changelog";
+static int new_parent(int idx)
+{
+	int i;
+	unsigned char *sha1 = parent_sha1[idx];
+	for (i = 0; i < idx; i++) {
+		if (!memcmp(parent_sha1[i], sha1, 20)) {
+			error("duplicate parent %s ignored", sha1_to_hex(sha1));
+			return 0;
+		}
+	}
+	return 1;
+}
 
 int main(int argc, char **argv)
 {
 	int i, len;
 	int parents = 0;
 	unsigned char tree_sha1[20];
-	unsigned char parent_sha1[MAXPARENT][20];
 	unsigned char commit_sha1[20];
 	char *gecos, *realgecos, *commitgecos;
 	char *email, *commitemail, realemail[1000];
-	char date[20], realdate[20];
-	char *audate;
+	char date[50], realdate[50];
+	char *audate, *cmdate;
 	char comment[1000];
 	struct passwd *pw;
 	char *buffer;
@@ -126,7 +137,8 @@ int main(int argc, char **argv)
 		if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
 			usage(commit_tree_usage);
 		check_valid(parent_sha1[parents], "commit");
-		parents++;
+		if (new_parent(parents))
+			parents++;
 	}
 	if (!parents)
 		fprintf(stderr, "Committing initial tree %s\n", argv[1]);
@@ -146,13 +158,16 @@ int main(int argc, char **argv)
 	datestamp(realdate, sizeof(realdate));
 	strcpy(date, realdate);
 
-	commitgecos = getenv("COMMIT_AUTHOR_NAME") ? : realgecos;
-	commitemail = getenv("COMMIT_AUTHOR_EMAIL") ? : realemail;
-	gecos = getenv("AUTHOR_NAME") ? : realgecos;
-	email = getenv("AUTHOR_EMAIL") ? : realemail;
-	audate = getenv("AUTHOR_DATE");
+	commitgecos = gitenv("GIT_COMMITTER_NAME") ? : realgecos;
+	commitemail = gitenv("GIT_COMMITTER_EMAIL") ? : realemail;
+	gecos = gitenv("GIT_AUTHOR_NAME") ? : realgecos;
+	email = gitenv("GIT_AUTHOR_EMAIL") ? : realemail;
+	audate = gitenv("GIT_AUTHOR_DATE");
 	if (audate)
 		parse_date(audate, date, sizeof(date));
+	cmdate = gitenv("GIT_COMMITTER_DATE");
+	if (cmdate)
+		parse_date(cmdate, realdate, sizeof(realdate));
 
 	remove_special(gecos); remove_special(realgecos); remove_special(commitgecos);
 	remove_special(email); remove_special(realemail); remove_special(commitemail);