kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2008-04-29 22:55:07 -07:00
parent 7b7f39eae6 b3bb5f76e6
commit 30c0312fd1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-cvsimport.perl
View File

@ -772,7 +772,7 @@ sub commit {
waitpid($pid,0); waitpid($pid,0);
die "Error running git-commit-tree: $?\n" if $?; 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"; or die "Cannot write branch $branch for update: $!\n";


if ($tag) { if ($tag) {

7
sha1_name.c
View File

@ -351,8 +351,11 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
} }
if (0 <= nth) if (0 <= nth)
at_time = 0; at_time = 0;
else else {
at_time = approxidate(str + at + 2); 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, if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
&co_time, &co_tz, &co_cnt)) { &co_time, &co_tz, &co_cnt)) {
if (at_time) if (at_time)