From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Mon, 14 Sep 2015 19:05:29 +0200 Organization: Probably a good idea Message-ID: References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> <20150912203658.GA3711@acm.fritz.box> <55F48E7F.40602@yandex.ru> <20150912215114.GB3711@acm.fritz.box> <55F5DC69.1040104@yandex.ru> <20150914110920.GC3208@acm.fritz.box> <55F6CEDA.2060809@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1442250329 23294 80.91.229.3 (14 Sep 2015 17:05:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 17:05:29 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 14 19:05:19 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZbXBt-0002Ms-6N for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 19:05:17 +0200 Original-Received: from localhost ([::1]:42305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbXBs-00036A-Gv for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 13:05:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbXBd-00035l-9b for emacs-devel@gnu.org; Mon, 14 Sep 2015 13:05:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbXBX-00031E-Gm for emacs-devel@gnu.org; Mon, 14 Sep 2015 13:05:01 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:54743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbXBX-00030U-9m for emacs-devel@gnu.org; Mon, 14 Sep 2015 13:04:55 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZbXBU-0001r3-6T for emacs-devel@gnu.org; Mon, 14 Sep 2015 19:04:52 +0200 Original-Received: from rainey.bang.priv.no ([212.110.185.190]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 14 Sep 2015 19:04:52 +0200 Original-Received: from sb by rainey.bang.priv.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 14 Sep 2015 19:04:52 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 64 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: rainey.bang.priv.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:x9KoZbaF+12AKAVyWA8edofzbhM= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:189951 Archived-At: >>>>> Dmitry Gutov : > Hi Alan, > On 09/14/2015 02:09 PM, Alan Mackenzie wrote: >> What confused me is that git aborted the merge despite there being no >> conflicts (i.e., nothing requiring the use of an editor to resolve). > Indeed, I don't usually see that. Actually, I've never seen that. > Hence my question about --no-commit in your gitconfig. > But others' suggestion that it might be because of 'git add' > beforehand is also plausible. I never do that, because it makes little > sense. Hm... easy enough to try. cd ~/git mkdir add-test cd add-test git init echo "Hello" >hello.txt git add hello.txt git commit -m "Added hello file" mkdir ../add-test.git cd ../add-test.git git init --bare cd ../add-test git remote add origin ../add-test.git git push -u origin HEAD cd .. git clone ./add-test.git add-test2 cd add-test echo "Hello world!" >hello.txt git add hello.txt git commit -m "Add a new commit that can be pulled in the other clone" git push cd ../add-test2 git add hello.txt git pull Nah... the result of the final command: ~/git/add-test2$ git pull remote: Counting objects: 5, done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. >From c:/Users/sbang/git/./add-test 1887bde..446444d master -> origin/master Updating 1887bde..446444d Fast-forward hello.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Ie. no conflict. ~/git/add-test2$ git --version git version 1.9.4.msysgit.1 I tried a variant with "git add ." before pull, but I got the same result, ie. no conflict, no merge.