summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@osdl.org>2006-11-16 11:47:22 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-11-16 23:45:48 -0800
commitd09e79cb1c474b3bb323356e6d1072922ab7ccb2 (patch)
tree5a825bc76c99ee1d8c724eacf361f672051b8adc /builtin-fmt-merge-msg.c
parentconvert-objects: set _XOPEN_SOURCE to 600 (diff)
downloadtgif-d09e79cb1c474b3bb323356e6d1072922ab7ccb2.tar.xz
git-pull: allow pulling into an empty repository
We used to complain that we cannot merge anything we fetched with a local branch that does not exist yet. Just treat the case as a natural extension of fast forwarding and make the local branch'es tip point at the same commit we just fetched. After all an empty repository without an initial commit is an ancestor of any commit. [jc: I added a trivial test. We've become sloppy but we should stick to the discipline of covering new behaviour with new tests. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions