@matheusbsbs / matheus-bagliano / commits / 48d044b5fe
Fork 0

git-svn: error out from dcommit on a parent-less commit

dcommit would unconditionally append "~1" to a commit in order to generate a diff. Now we generate a meaningful error message if we try to generate an impossible diff. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Eric Wong committed Nov 23, 2006 at 14:54 UTC 48d044b5fe7ae553f05186db46b5cb4708afceb4
1 file changed +7
git-svn.perl
+7
@@ -589,6 +589,13 @@ sub dcommit {
589 chomp(my @refs = safe_qx(qw/git-rev-list --no-merges/, "$gs..HEAD"));
590 my $last_rev;
591 foreach my $d (reverse @refs) {
592 + if (quiet_run('git-rev-parse','--verify',"$d~1") != 0) {
593 + die "Commit $d\n",
594 + "has no parent commit, and therefore ",
595 + "nothing to diff against.\n",
596 + "You should be working from a repository ",
597 + "originally created by git-svn\n";
598 + }
599 unless (defined $last_rev) {
600 (undef, $last_rev, undef) = cmt_metadata("$d~1");
601 unless (defined $last_rev) {