Benoit Sigoure <tsuna@xxxxxxxxxxxxx> wrote:
> dcommit uses rebase `sync' the history with what has just been pushed to
> SVN. Trying to dcommit with a dirty index is troublesome for rebase, so now
> the user will get an error message if he attempts to dcommit with a dirty
> index.
>
> Signed-off-by: Benoit Sigoure <tsuna@xxxxxxxxxxxxx>
Thanks,
Minor nit below about indentation (which Junio can fix when applying),
but nevertheless:
Acked-by: Eric Wong <normalperson@xxxxxxxx>
> ---
> git-svn.perl | 3 +++
> t/t9106-git-svn-dcommit-clobber-series.sh | 6 ++++++
> 2 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/git-svn.perl b/git-svn.perl
> index dd93e32..a15df4f 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -390,6 +390,9 @@ sub cmd_set_tree {
>
> sub cmd_dcommit {
> my $head = shift;
> + git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
> + 'Cannot dcommit with a dirty index. Commit your changes first'
> + . "or stash them with `git stash'.\n";
We use tabs for indentation, and spaces for alignment.
> $head ||= 'HEAD';
> my @refs;
> my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
--
Eric Wong
-
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
