Skip to contentSkip to conversation

git-svn: change dashed git-commit-tree to git commit-tree

PATCH In review Deskin Miller 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 git-svn: change dashed git-commit-tree to git commit-tree

---
Once again I'm using a copy of git-svn.perl directly, and this fails to exec. I looked at it more closely and it fails because git binary calls setup_path, which puts the libexec path into $PATH; of course, this doesn't happen when git-svn is called directly.

 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
git-svn.perl +1 -1
index 2e68c68..56238da 100755
@@ -2202,7 +2202,7 @@ sub do_git_commit {
 	}
 	die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
 
-	my @exec = ('git-commit-tree', $tree);
+	my @exec = ('git', 'commit-tree', $tree);
 	foreach ($self->get_commit_parents($log_entry)) {
 		push @exec, '-p', $_;
 	}
Signature · 1 line
1.6.0.3.515.g304f
#1 lore raw
Quoted 6 lines · Deskin Miller

---
Once again I'm using a copy of git-svn.perl directly, and this fails to exec. I looked at it more closely and it fails because git binary calls setup_path, which puts the libexec path into $PATH; of course, this doesn't happen when git-svn is called directly.

Thanks Deskin, looks like Junio already picked it up; but if we had git-notes I'd add my Signed-off-by there :)

Also, on the subject of using git-svn.perl directly from the source tree, it may become less usable that way in the near future:

Most of us (myself included) at GitTogether seemed like the idea of splitting git-svn.perl into multiple files for maintainability reasons. I just haven't gotten around to doing it yet.

OTOH, Git.pm is already required (but likely also installed in your normal load paths); so you may just have to remember to use perl -I

Signature · 1 line
Eric Wong