This lets the user of git cvsexportcommit specify a cvs working dir on a per
branch basis.
Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
---
The config variable name is currently cvsexportcommit.<branch>.cvsdir, but
could also be branch.<branch>.cvsdir. Or whatever is prefereable.
Documentation/git-cvsexportcommit.txt | 7 ++++++-
git-cvsexportcommit.perl | 5 +++++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index b2696ef..0bc71cf 100644
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -71,7 +71,8 @@ OPTIONS
Specify the location of the CVS checkout to use for the export. This
option does not require GIT_DIR to be set before execution if the
current directory is within a git repository. The default is the
- value of 'cvsexportcommit.cvsdir'.
+ value of `cvsexportcommit.<branch>.cvsdir` or, if this is not set,
+ the value of `cvsexportcommit.cvsdir`.
-W::
Tell cvsexportcommit that the current working directory is not only
@@ -83,6 +84,10 @@ OPTIONS
CONFIGURATION
-------------
+cvsexportcommit.<branch>.cvsdir::
+ The default location for branch `<name>` of the CVS checkout to use
+ for the export.
+
cvsexportcommit.cvsdir::
The default location of the CVS checkout to use for the export.
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 59b6722..3e0c284 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -18,6 +18,11 @@ die "Need at least one commit identifier!" unless @ARGV;
# Get git-config settings
my $repo = Git->repository();
+my $branch_name = $repo->command_oneline('rev-parse', '--abbrev-ref=loose', 'HEAD') unless defined $opt_w;
+if ($branch_name) {
+ my $per_branch_cvsdir = "cvsexportcommit.".$branch_name.".cvsdir";
+ $opt_w = $repo->config($per_branch_cvsdir);
+}
$opt_w = $repo->config('cvsexportcommit.cvsdir') unless defined $opt_w;
if ($opt_w || $opt_W) {
--
tg: (ddd02b7..) bw/per-branch-cvsdir (depends on: master)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html