git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: neuling@dakosy.de
To: git@vger.kernel.org
Subject: Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance)
Date: Tue, 27 Jun 2017 16:34:15 +0200	[thread overview]
Message-ID: <OF6AC13578.F02B79FA-ONC125814C.004DD247-C125814C.00500A93@dakosy.de> (raw)

Hi, 

since the latest version 2.13.2 "git pull --rebase --autostash" doesn't 
use a fast forward if possible. 

My global git config contains "pull.rebase=preserve" and 
"rebase.autostash=true". My working directory is clean with no changes. 

When I use "git pull" git doesn't use a possible fast forward merge. If I 
remove "rebase.autostash" from my git config a fast forward merge will 
take place. 

If a fast forward merge is possible and the working directory is clean 
autostash should do nothing and the fast forward merge should happen. 

Is it also possible to implement autostash on fast forward merge that way 
to stash changes, do the fast forward merge and at least to apply the 
stashed changes?

Another problem is if "git pull rebase" without autostash can do a fast 
forward merge the rebase validation for changed files in my working 
directory will be done. 

I think in that case the fast forward merge validation should run. That 
would prevent the need to stash local changes if they do not affect files 
of the commits to fast forward from origin branch. 



Regards, 
Mattias


             reply	other threads:[~2017-06-27 14:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-27 14:34 neuling [this message]
2017-06-27 15:02 ` Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance) Junio C Hamano
2017-06-28  8:22   ` neuling

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=OF6AC13578.F02B79FA-ONC125814C.004DD247-C125814C.00500A93@dakosy.de \
    --to=neuling@dakosy.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).