Op 07-12-16 om 10:33 schreef Jani Nikula: > On Tue, 06 Dec 2016, Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> wrote: >> When a branch can be fast-forwarded, try it first before rebasing. >> This will prevent a whole lot of editor windows opening with 'noop' >> when running dim ub. >> >> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> >> --- >> dim | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/dim b/dim >> index fa63ae8c8a79..b2e6841e23d7 100755 >> --- a/dim >> +++ b/dim >> @@ -1286,9 +1286,7 @@ function dim_update_branches >> repo=`branch_to_repo $branch` >> remote=`repo_to_remote $repo` >> >> - if git diff --quiet $remote/$branch; then >> - $DRY git rebase >> - else >> + if ! $DRY git merge --ff-only ; then > What does it assume for branches to merge when none are provided? Would > it be better to be explicit? > > Thanks for this, I've been meaning to do this forever... Hm I guess explicit might be better, what about this? ------8<------- When a branch can be fast-forwarded, try it first before rebasing. This will prevent a whole lot of editor windows opening with 'noop' when running dim ub. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> --- diff --git a/dim b/dim index fa63ae8c8a79..e0551ace54e4 100755 --- a/dim +++ b/dim @@ -1286,9 +1286,7 @@ function dim_update_branches repo=`branch_to_repo $branch` remote=`repo_to_remote $repo` - if git diff --quiet $remote/$branch; then - $DRY git rebase - else + if ! $DRY git merge --ff-only $remote/$branch; then $DRY git rebase -i fi done _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
