From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Mon, 14 Sep 2015 16:42:50 +0300 Message-ID: <55F6CEDA.2060809@yandex.ru> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1442238210 8301 80.91.229.3 (14 Sep 2015 13:43:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 13:43:30 +0000 (UTC) Cc: Eli Zaretskii , gscrivano@gnu.org, emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 14 15:43:25 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 1ZbU2W-0002p0-M6 for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 15:43:24 +0200 Original-Received: from localhost ([::1]:40857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbU2W-0006wt-5T for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 09:43:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbU2M-0006wR-LL for emacs-devel@gnu.org; Mon, 14 Sep 2015 09:43:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbU2G-00015o-D9 for emacs-devel@gnu.org; Mon, 14 Sep 2015 09:43:14 -0400 Original-Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:34707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbU2G-00015A-7M; Mon, 14 Sep 2015 09:43:08 -0400 Original-Received: by wicfx3 with SMTP id fx3so140908488wic.1; Mon, 14 Sep 2015 06:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=C7S4cqhN3aMSjjj/1Q8Ue9EQk6jLTndZCNLRbjmgMp8=; b=WnU2hB/VfsZOgxKqT0bpLGeDlnCvBDZbgP+rbK25mBFpryRtH1k2FbwfT48qnQul7f mw+LrlrXeIqXXKxMTTDZtRhiP7jz04haBJRjOznJSjJIMsLMFe0ThI0G4PqQzi69vCi7 0XBMHTAeDyZ9WQObJeF5q6QW479OOe0DVL8LEniN0mhhMpNwltaa6KF9FKHzJQ5Djgu5 fbYoUQR0dJ1P9D9OfIQAbS/eKKph+smXagDrF/JM16HNpBNiSnYxdEZTvPCa/xqpYx8U F1L5uTRpGJa0rg2dwb//jonwaoqdpOm4mSigUASOknT8p2BHCS/CbHMlZhbopLsBzakE rGFw== X-Received: by 10.180.187.227 with SMTP id fv3mr25814063wic.57.1442238187549; Mon, 14 Sep 2015 06:43:07 -0700 (PDT) Original-Received: from [10.9.0.103] (nat.webazilla.com. [78.140.128.228]) by smtp.googlemail.com with ESMTPSA id gc8sm14475867wib.2.2015.09.14.06.43.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 06:43:06 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:41.0) Gecko/20100101 Thunderbird/41.0 In-Reply-To: <20150914110920.GC3208@acm.fritz.box> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22d 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:189942 Archived-At: 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. 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. >> Yes, it did. Have you done any non-trivial merges before? That's how >> they usually look. > > No, I've never done a non-trivial merge in git. This one presumably > must count as a trivial merge. I any case, a merge with maybe just one tiny conflict, looks similar to this if there are also non-conflicting changes in it: it shows you staged changes from files *you* didn't modify. > I take it that by "shouldn't .. include include .. non-mergy changes" > you mean that when initiating a merge commit, git won't include any > non-merge changes in the commit. (The alternative interpretation is > that in a merge commit, the user shouldn't include any other changes.) Kinda both. It means that you shouldn't 'git add' any changes that you've worked on just now, before committing. Leave them for a following, non-merge commit. > I did actually have this log entry, but `git log' didn't display it. > The flag --all was needed for that. Apparently, you will be able to see the log entries for the commits you're merging, after you conclude the merge, and so the current branch includes them. Makes sense, doesn't it? > OK, I've got it now. For some reason, git choses to abort the merge, > despite there being no conflicts between the changes from upstream and > the changes I've committed locally - indeed, to complete the merge is a > fully mechanical action, `git commit'. This seeming illogicality is > what confused me in the first place. I agree.