From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 23 Nov 2006 22:54:03 +0000 (-0800)
Subject: git-svn: error out from dcommit on a parent-less commit
X-Git-Tag: v1.4.4.2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=48d044b5fe7ae553f05186db46b5cb4708afceb4;p=git.git

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>
---

diff --git a/git-svn.perl b/git-svn.perl
index 80b7b87f0..f0db4af58 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -589,6 +589,13 @@ sub dcommit {
 	chomp(my @refs = safe_qx(qw/git-rev-list --no-merges/, "$gs..HEAD"));
 	my $last_rev;
 	foreach my $d (reverse @refs) {
+		if (quiet_run('git-rev-parse','--verify',"$d~1") != 0) {
+			die "Commit $d\n",
+			    "has no parent commit, and therefore ",
+			    "nothing to diff against.\n",
+			    "You should be working from a repository ",
+			    "originally created by git-svn\n";
+		}
 		unless (defined $last_rev) {
 			(undef, $last_rev, undef) = cmt_metadata("$d~1");
 			unless (defined $last_rev) {