diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2008-04-24 20:06:36 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-04-29 23:11:57 -0700 |
| commit | 59b0c24daaac3c2203dd8ac2de4dfcad909481a5 (patch) | |
| tree | 47838d6ee4f48f263e5c02a9a410d101790989f2 | |
| parent | make git-status use a pager (diff) | |
| download | tgif-59b0c24daaac3c2203dd8ac2de4dfcad909481a5.tar.xz | |
git-svn: detect and fail gracefully when dcommitting to a void
The command
git svn clone (URL of an empty SVN repo here)
works, creates an empty git repository. I can perform the initial
commit there, but then, "git svn dcommit" says :
Use of uninitialized value in concatenation (.) or string at .../git-svn line 414.
Committing to ...
Unable to determine upstream SVN information from HEAD history
I guess a correct management of the initial commit in git-svn would be
hard to implement, but at least, the error message can be improved.
First step is something like the patch below, and better would be for
"git svn clone" to warn that it won't be able to do much with the
cloned repo.
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | diff-lib.c | 3 | ||||
| -rwxr-xr-x | git-svn.perl | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index 069e4507ae..cfd629da48 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -264,6 +264,9 @@ int setup_diff_no_index(struct rev_info *revs, DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); break; } + if (nongit && argc != i + 2) + die("git diff [--no-index] takes two paths"); + if (argc != i + 2 || (!is_outside_repo(argv[i + 1], nongit, prefix) && !is_outside_repo(argv[i], nongit, prefix))) return -1; diff --git a/git-svn.perl b/git-svn.perl index b1510495a7..711e7b7eb9 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -410,10 +410,12 @@ sub cmd_dcommit { $head ||= 'HEAD'; my @refs; my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs); - print "Committing to $url ...\n"; + if ($url) { + print "Committing to $url ...\n"; + } unless ($gs) { die "Unable to determine upstream SVN information from ", - "$head history\n"; + "$head history.\nPerhaps the repository is empty."; } my $last_rev; my ($linear_refs, $parents) = linearize_history($gs, \@refs); |