# [git-svn PATCH] Add --no-rebase option to git-svn dcommit 7 messages from 2007-05-03 to 2007-05-04. Participants: Karl Hasselström, David Kågedal, Seth Falcon, Eric Wong. Thread: https://gitlist.dev/t/7952 ## Karl Hasselström, 2007-05-03 05:51 Subject: [git-svn PATCH] Add --no-rebase option to git-svn dcommit Message-ID: <20070503054749.20115.53805.stgit@yoghurt> URL: https://gitlist.dev/e/20070503054749.20115.53805.stgit%40yoghurt ``` git-svn dcommit exports commits to Subversion, then imports them back to git again, and last but not least rebases or resets HEAD to the last of the new commits. I guess this rebasing is convenient when using just git, but when the commits to be exported are managed by StGIT, it's really annoying. So add an option to disable this behavior. And document it, too! Signed-off-by: Karl Hasselström --- Arguably, the switch should be --rebase instead, and default to not rebase. But that would change the existing behavior, and possibly make dcommit less convenient to use for at least the person who implemented the existing behavior. Opinions? Documentation/git-svn.txt | 3 +++ git-svn.perl | 33 ++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 62d7ef8..fcdeeaa 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -125,6 +125,9 @@ and have no uncommitted changes. alternative to HEAD. This is advantageous over 'set-tree' (below) because it produces cleaner, more linear history. ++ +--no-rebase;; + After committing, do not rebase or reset. -- 'log':: diff --git a/git-svn.perl b/git-svn.perl index 6657e10..3c4f490 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -55,7 +55,7 @@ $sha1_short = qr/[a-f\d]{4,40}/; my ($_stdin, $_help, $_edit, $_message, $_file, $_template, $_shared, - $_version, $_fetch_all, + $_version, $_fetch_all, $_no_rebase, $_merge, $_strategy, $_dry_run, $_local, $_prefix, $_no_checkout, $_verbose); $Git::SVN::_follow_parent = 1; @@ -114,6 +114,7 @@ my %cmd = ( 'verbose|v' => \$_verbose, 'dry-run|n' => \$_dry_run, 'fetch-all|all' => \$_fetch_all, + 'no-rebase' => \$_no_rebase, %cmt_opts, %fc_opts } ], 'set-tree' => [ \&cmd_set_tree, "Set an SVN repository to a git tree-ish", @@ -413,21 +414,23 @@ sub cmd_dcommit { return; } $_fetch_all ? $gs->fetch_all : $gs->fetch; - # we always want to rebase against the current HEAD, not any - # head that was passed to us - my @diff = command('diff-tree', 'HEAD', $gs->refname, '--'); - my @finish; - if (@diff) { - @finish = rebase_cmd(); - print STDERR "W: HEAD and ", $gs->refname, " differ, ", - "using @finish:\n", "@diff"; - } else { - print "No changes between current HEAD and ", - $gs->refname, "\nResetting to the latest ", - $gs->refname, "\n"; - @finish = qw/reset --mixed/; + unless ($_no_rebase) { + # we always want to rebase against the current HEAD, not any + # head that was passed to us + my @diff = command('diff-tree', 'HEAD', $gs->refname, '--'); + my @finish; + if (@diff) { + @finish = rebase_cmd(); + print STDERR "W: HEAD and ", $gs->refname, " differ, ", + "using @finish:\n", "@diff"; + } else { + print "No changes between current HEAD and ", + $gs->refname, "\nResetting to the latest ", + $gs->refname, "\n"; + @finish = qw/reset --mixed/; + } + command_noisy(@finish, $gs->refname); } - command_noisy(@finish, $gs->refname); } sub cmd_find_rev { ``` ## David Kågedal, 2007-05-03 06:48 Subject: Re: [git-svn PATCH] Add --no-rebase option to git-svn dcommit Message-ID: <87647aqu6i.fsf@morpheus.local> URL: https://gitlist.dev/e/87647aqu6i.fsf%40morpheus.local In-Reply-To: <20070503054749.20115.53805.stgit@yoghurt> ``` Karl Hasselström writes: > git-svn dcommit exports commits to Subversion, then imports them back > to git again, and last but not least rebases or resets HEAD to the > last of the new commits. I guess this rebasing is convenient when > using just git, but when the commits to be exported are managed by > StGIT, it's really annoying. So add an option to disable this > behavior. And document it, too! > > Signed-off-by: Karl Hasselström > --- > > Arguably, the switch should be --rebase instead, and default to not > rebase. But that would change the existing behavior, and possibly make > dcommit less convenient to use for at least the person who implemented > the existing behavior. Opinions? I don't agree. The rebase behaviour makes perfect sense in the normal case, and I've been using it without problems. The special case is when you start using stgit, so that's when you need to tell dcommit to do something out of the ordinary. Other than that, I like your patch. But you knew that already :-) -- David Kågedal ``` ## Seth Falcon, 2007-05-03 15:53 Subject: Re: [git-svn PATCH] Add --no-rebase option to git-svn dcommit Message-ID: URL: https://gitlist.dev/e/m24pmtaop1.fsf%40ziti.local In-Reply-To: <87647aqu6i.fsf@morpheus.local> ``` David Kågedal writes: > Karl Hasselström writes: > >> git-svn dcommit exports commits to Subversion, then imports them back >> to git again, and last but not least rebases or resets HEAD to the >> last of the new commits. I guess this rebasing is convenient when >> using just git, but when the commits to be exported are managed by >> StGIT, it's really annoying. So add an option to disable this >> behavior. And document it, too! >> >> Signed-off-by: Karl Hasselström >> --- >> >> Arguably, the switch should be --rebase instead, and default to not >> rebase. But that would change the existing behavior, and possibly make >> dcommit less convenient to use for at least the person who implemented >> the existing behavior. Opinions? > > I don't agree. The rebase behaviour makes perfect sense in the normal > case, and I've been using it without problems. The special case is > when you start using stgit, so that's when you need to tell dcommit to > do something out of the ordinary. I'm happy with git-svn dcommit's current behavior. Since it is git-svn and not git-stGIT, I'm not in favor of changing a default to make a stGIT use case more convenient. + seth ``` ## Eric Wong, 2007-05-04 07:59 Subject: Re: [git-svn PATCH] Add --no-rebase option to git-svn dcommit Message-ID: <20070504075908.GB17526@muzzle> URL: https://gitlist.dev/e/20070504075908.GB17526%40muzzle In-Reply-To: <20070503054749.20115.53805.stgit@yoghurt> ``` Karl Hasselström wrote: > git-svn dcommit exports commits to Subversion, then imports them back > to git again, and last but not least rebases or resets HEAD to the > last of the new commits. I guess this rebasing is convenient when > using just git, but when the commits to be exported are managed by > StGIT, it's really annoying. So add an option to disable this > behavior. And document it, too! Cool, I've been planning to add this myself, too. Acked-by: Eric Wong > Signed-off-by: Karl Hasselström > --- > > Arguably, the switch should be --rebase instead, and default to not > rebase. But that would change the existing behavior, and possibly make > dcommit less convenient to use for at least the person who implemented > the existing behavior. Opinions? > > Documentation/git-svn.txt | 3 +++ > git-svn.perl | 33 ++++++++++++++++++--------------- > 2 files changed, 21 insertions(+), 15 deletions(-) > > diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt > index 62d7ef8..fcdeeaa 100644 > --- a/Documentation/git-svn.txt > +++ b/Documentation/git-svn.txt > @@ -125,6 +125,9 @@ and have no uncommitted changes. > alternative to HEAD. > This is advantageous over 'set-tree' (below) because it produces > cleaner, more linear history. > ++ > +--no-rebase;; > + After committing, do not rebase or reset. > -- > > 'log':: > diff --git a/git-svn.perl b/git-svn.perl > index 6657e10..3c4f490 100755 > --- a/git-svn.perl > +++ b/git-svn.perl > @@ -55,7 +55,7 @@ $sha1_short = qr/[a-f\d]{4,40}/; > my ($_stdin, $_help, $_edit, > $_message, $_file, > $_template, $_shared, > - $_version, $_fetch_all, > + $_version, $_fetch_all, $_no_rebase, > $_merge, $_strategy, $_dry_run, $_local, > $_prefix, $_no_checkout, $_verbose); > $Git::SVN::_follow_parent = 1; > @@ -114,6 +114,7 @@ my %cmd = ( > 'verbose|v' => \$_verbose, > 'dry-run|n' => \$_dry_run, > 'fetch-all|all' => \$_fetch_all, > + 'no-rebase' => \$_no_rebase, > %cmt_opts, %fc_opts } ], > 'set-tree' => [ \&cmd_set_tree, > "Set an SVN repository to a git tree-ish", > @@ -413,21 +414,23 @@ sub cmd_dcommit { > return; > } > $_fetch_all ? $gs->fetch_all : $gs->fetch; > - # we always want to rebase against the current HEAD, not any > - # head that was passed to us > - my @diff = command('diff-tree', 'HEAD', $gs->refname, '--'); > - my @finish; > - if (@diff) { > - @finish = rebase_cmd(); > - print STDERR "W: HEAD and ", $gs->refname, " differ, ", > - "using @finish:\n", "@diff"; > - } else { > - print "No changes between current HEAD and ", > - $gs->refname, "\nResetting to the latest ", > - $gs->refname, "\n"; > - @finish = qw/reset --mixed/; > + unless ($_no_rebase) { > + # we always want to rebase against the current HEAD, not any > + # head that was passed to us > + my @diff = command('diff-tree', 'HEAD', $gs->refname, '--'); > + my @finish; > + if (@diff) { > + @finish = rebase_cmd(); > + print STDERR "W: HEAD and ", $gs->refname, " differ, ", > + "using @finish:\n", "@diff"; > + } else { > + print "No changes between current HEAD and ", > + $gs->refname, "\nResetting to the latest ", > + $gs->refname, "\n"; > + @finish = qw/reset --mixed/; > + } > + command_noisy(@finish, $gs->refname); > } > - command_noisy(@finish, $gs->refname); > } > > sub cmd_find_rev { > -- Eric Wong ``` ## Eric Wong, 2007-05-04 08:04 Subject: Re: [git-svn PATCH] Add --no-rebase option to git-svn dcommit Message-ID: <20070504080424.GA30555@muzzle> URL: https://gitlist.dev/e/20070504080424.GA30555%40muzzle In-Reply-To: <20070504075908.GB17526@muzzle> ``` Eric Wong wrote: > Karl Hasselström wrote: > > git-svn dcommit exports commits to Subversion, then imports them back > > to git again, and last but not least rebases or resets HEAD to the > > last of the new commits. I guess this rebasing is convenient when > > using just git, but when the commits to be exported are managed by > > StGIT, it's really annoying. So add an option to disable this > > behavior. And document it, too! > > Cool, I've been planning to add this myself, too. > > Acked-by: Eric Wong > > > Signed-off-by: Karl Hasselström > > --- > > > > Arguably, the switch should be --rebase instead, and default to not > > rebase. But that would change the existing behavior, and possibly make > > dcommit less convenient to use for at least the person who implemented > > the existing behavior. Opinions? Erm, sorry, I skipped over this part. No. I like rebase being the default behavior. > > Documentation/git-svn.txt | 3 +++ > > git-svn.perl | 33 ++++++++++++++++++--------------- > > 2 files changed, 21 insertions(+), 15 deletions(-) > > > > diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt > > index 62d7ef8..fcdeeaa 100644 > > --- a/Documentation/git-svn.txt > > +++ b/Documentation/git-svn.txt > > @@ -125,6 +125,9 @@ and have no uncommitted changes. > > alternative to HEAD. > > This is advantageous over 'set-tree' (below) because it produces > > cleaner, more linear history. > > ++ > > +--no-rebase;; > > + After committing, do not rebase or reset. > > -- > > > > 'log':: > > diff --git a/git-svn.perl b/git-svn.perl > > index 6657e10..3c4f490 100755 > > --- a/git-svn.perl > > +++ b/git-svn.perl > > @@ -55,7 +55,7 @@ $sha1_short = qr/[a-f\d]{4,40}/; > > my ($_stdin, $_help, $_edit, > > $_message, $_file, > > $_template, $_shared, > > - $_version, $_fetch_all, > > + $_version, $_fetch_all, $_no_rebase, > > $_merge, $_strategy, $_dry_run, $_local, > > $_prefix, $_no_checkout, $_verbose); > > $Git::SVN::_follow_parent = 1; > > @@ -114,6 +114,7 @@ my %cmd = ( > > 'verbose|v' => \$_verbose, > > 'dry-run|n' => \$_dry_run, > > 'fetch-all|all' => \$_fetch_all, > > + 'no-rebase' => \$_no_rebase, > > %cmt_opts, %fc_opts } ], > > 'set-tree' => [ \&cmd_set_tree, > > "Set an SVN repository to a git tree-ish", > > @@ -413,21 +414,23 @@ sub cmd_dcommit { > > return; > > } > > $_fetch_all ? $gs->fetch_all : $gs->fetch; > > - # we always want to rebase against the current HEAD, not any > > - # head that was passed to us > > - my @diff = command('diff-tree', 'HEAD', $gs->refname, '--'); > > - my @finish; > > - if (@diff) { > > - @finish = rebase_cmd(); > > - print STDERR "W: HEAD and ", $gs->refname, " differ, ", > > - "using @finish:\n", "@diff"; > > - } else { > > - print "No changes between current HEAD and ", > > - $gs->refname, "\nResetting to the latest ", > > - $gs->refname, "\n"; > > - @finish = qw/reset --mixed/; > > + unless ($_no_rebase) { > > + # we always want to rebase against the current HEAD, not any > > + # head that was passed to us > > + my @diff = command('diff-tree', 'HEAD', $gs->refname, '--'); > > + my @finish; > > + if (@diff) { > > + @finish = rebase_cmd(); > > + print STDERR "W: HEAD and ", $gs->refname, " differ, ", > > + "using @finish:\n", "@diff"; > > + } else { > > + print "No changes between current HEAD and ", > > + $gs->refname, "\nResetting to the latest ", > > + $gs->refname, "\n"; > > + @finish = qw/reset --mixed/; > > + } > > + command_noisy(@finish, $gs->refname); > > } > > - command_noisy(@finish, $gs->refname); > > } > > > > sub cmd_find_rev { -- Eric Wong ``` ## David Kågedal, 2007-05-04 09:08 Subject: Re: [git-svn PATCH] Add --no-rebase option to git-svn dcommit Message-ID: <87slad553c.fsf@morpheus.local> URL: https://gitlist.dev/e/87slad553c.fsf%40morpheus.local In-Reply-To: <20070504075908.GB17526@muzzle> ``` Eric Wong writes: > Karl Hasselström wrote: >> git-svn dcommit exports commits to Subversion, then imports them back >> to git again, and last but not least rebases or resets HEAD to the >> last of the new commits. I guess this rebasing is convenient when >> using just git, but when the commits to be exported are managed by >> StGIT, it's really annoying. So add an option to disable this >> behavior. And document it, too! > > Cool, I've been planning to add this myself, too. One thing I haven't figured out, although I haven't looked at the code much, is this: When does git-svn do a merge rather than a rebase? How can there ever be a diff? Is this perhaps something that can happen if you use set-tree, because I don't see how it happens with dcommit. -- David Kågedal ``` ## Karl Hasselström, 2007-05-04 10:26 Subject: Re: [git-svn PATCH] Add --no-rebase option to git-svn dcommit Message-ID: <20070504102656.GB16446@diana.vm.bytemark.co.uk> URL: https://gitlist.dev/e/20070504102656.GB16446%40diana.vm.bytemark.co.uk In-Reply-To: <20070504080424.GA30555@muzzle> ``` On 2007-05-04 01:04:24 -0700, Eric Wong wrote: > Erm, sorry, I skipped over this part. No. I like rebase being the > default behavior. As did everyone else. So I guess that's settled, then. :-) -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle ```