Thread (34 messages) flat view 34 messages, 3 authors, 2016-06-15

Re: [PATCH 08/14] pull: fast-forward working tree if head is updated

From: Johannes Schindelin <hidden>
Date: 2016-06-15 23:04:49

Hi Paul,

On 2015-05-18 17:06, Paul Tan wrote:
Since b10ac50 (Fix pulling into the same branch., 2005-08-25), git-pull,
upon detecting that git-fetch updated the current head, will
fast-forward the working tree to the updated head commit.
This is just a quick note about something I noticed while reviewing: I was surprised that this code path would only trigger when `orig_head` is different from the null SHA-1, because in my mind, it is safe to update when we are on an unborn branch. However, I verified that the shell script does the same thing, so your transcription is faithful.

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help