| commit | 135a522e3f0ddc85664b3cd094918f095ac76d79 | |
| author | Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de> | |
| Fri, 7 Jul 2006 10:55:41 +0000 (7 12:55 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 9 Jul 2006 07:46:56 +0000 (9 00:46 -0700) | ||
| tree | 4ea5df02507258ae13486e56b69637d42fbfd9d9 | treesnapshot (tar.gz zip) |
| parent | d9bffc08fd2cec626e3a390fa4cc47587a8c7f9e | commitdiff |
git-cvsexportcommit can't handle merge commits correctly
git-cvsexportcommit should check if the parent (supplied on the cmdline) to use
for a merge commit is one of the real parents of the merge.
But it errors out if the _first_ parent doesn't match and never checks
the other parents.
Signed-off-by: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-cvsexportcommit should check if the parent (supplied on the cmdline) to use
for a merge commit is one of the real parents of the merge.
But it errors out if the _first_ parent doesn't match and never checks
the other parents.
Signed-off-by: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-cvsexportcommit.perl | diffblobblamehistory |