diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-09 21:09:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-09 21:09:43 -0800 |
| commit | 23ea3e201cea0deea909569e08e950a9ec2345f7 (patch) | |
| tree | 614520079f232d1459467b6e718182a8721aadd5 /git-cvsexportcommit.perl | |
| parent | GIT 0.99.9f (diff) | |
| parent | Make git-recursive the default strategy for git-pull. (diff) | |
| download | git-0.99.9g.tar.gz git-0.99.9g.zip | |
GIT 0.99.9gv0.99.9g
Another snapshot, as slow and steady marth towards 1.0 continues.
Major changes include:
- Jim Radford's RPM split.
- Fredrik's recursive merge strategy is now default for two heads merge.
- Yaacov's SVN importer updates.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-cvsexportcommit.perl')
| -rwxr-xr-x | git-cvsexportcommit.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index 7074b0c21b..50b041c324 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -64,7 +64,7 @@ if ($parent) { last; }; # found it die "Did not find $parent in the parents for this commit!"; -s } + } } else { # we don't have a parent from the cmdline... if (@parents == 1) { # it's safe to get it from the commit $parent = $parents[0]; |