From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Apr 2008 05:55:07 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint
X-Git-Tag: v1.5.5.2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30c0312fd182942c10421e77d2b3ec6284cc0468;hp=7b7f39eae6ab0bbcc68d3c42a5b23595880e528f;p=git.git

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  cvsimport: always pass user data to "system" as a list
  fix reflog approxidate parsing bug
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 95c5eec51..bdac5d51b 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -772,7 +772,7 @@ sub commit {
 	waitpid($pid,0);
 	die "Error running git-commit-tree: $?\n" if $?;
 
-	system("git-update-ref $remote/$branch $cid") == 0
+	system('git-update-ref', "$remote/$branch", $cid) == 0
 		or die "Cannot write branch $branch for update: $!\n";
 
 	if ($tag) {
diff --git a/sha1_name.c b/sha1_name.c
index 491d2e7eb..b0b216757 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -351,8 +351,11 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 		}
 		if (0 <= nth)
 			at_time = 0;
-		else
-			at_time = approxidate(str + at + 2);
+		else {
+			char *tmp = xstrndup(str + at + 2, reflog_len);
+			at_time = approxidate(tmp);
+			free(tmp);
+		}
 		if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
 				&co_time, &co_tz, &co_cnt)) {
 			if (at_time)