Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux