Seth FalconWhen working with multiple branches in an svn repository, it can be useful to verify the svn repository and local tracking branch that will be used for the rebase operation.
Signed-off-by: Seth Falcon <seth@userprimary.net> --- Documentation/git-svn.txt | 8 ++++++-- git-svn.perl | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-)
Show changes to 2 files +12 −2
Documentation/git-svn.txt, git-svn.perl
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index c6b56b4..5890028 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -342,11 +342,15 @@ Passed directly to git-rebase when using 'dcommit' if a -n:: --dry-run:: -This is only used with the 'dcommit' command. +This can be used with the 'dcommit' and 'rebase' commands. -Print out the series of git arguments that would show +For 'dcommit', print out the series of git arguments that would show which diffs would be committed to SVN. +For 'rebase', display the local branch associated with the upstream svn +repository associated with the current branch and the URL of svn +repository that will be fetched from. + -- ADVANCED OPTIONS diff --git a/git-svn.perl b/git-svn.perl index 2c53f39..de52c12 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -176,6 +176,7 @@ my %cmd = ( 'strategy|s=s' => \$_strategy, 'local|l' => \$_local, 'fetch-all|all' => \$_fetch_all, + 'dryrun|n' => \$_dry_run, %fc_opts } ], 'commit-diff' => [ \&cmd_commit_diff, 'Commit a diff between two trees', @@ -553,6 +554,11 @@ sub cmd_rebase { die "Unable to determine upstream SVN information from ", "working tree history\n"; } + if ($_dry_run) { + print "remote-branch: " . $gs->refname . "\n"; + print "svn-url: " . $url . "\n"; + return; + } if (command(qw/diff-index HEAD --/)) { print STDERR "Cannot rebase with uncommited changes:\n"; command_noisy('status');
-- 1.5.5.1.316.g377d9.dirty
