From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.devel Subject: Re: whitespace-only changes Date: Fri, 21 Aug 2020 11:55:27 +0300 Message-ID: <87o8n4l6o0.fsf@osv.gnss.ru> References: <83imddcv4m.fsf@gnu.org> <878se9wigu.fsf@gnus.org> <878se9mkqa.fsf@randomsample> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24971"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: larsi@gnus.org, eliz@gnu.org, David Engster , emacs-devel@gnu.org To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Aug 21 10:56:10 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k92qH-0006Nu-PD for ged-emacs-devel@m.gmane-mx.org; Fri, 21 Aug 2020 10:56:09 +0200 Original-Received: from localhost ([::1]:52930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k92qG-0005sY-Qc for ged-emacs-devel@m.gmane-mx.org; Fri, 21 Aug 2020 04:56:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k92pi-00057c-7n for emacs-devel@gnu.org; Fri, 21 Aug 2020 04:55:34 -0400 Original-Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]:45032) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k92pg-00080H-HI; Fri, 21 Aug 2020 04:55:33 -0400 Original-Received: by mail-lj1-x22b.google.com with SMTP id g6so1007739ljn.11; Fri, 21 Aug 2020 01:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=gYW368k8gn5uzLQOzHOzAcjW4kvlMyk82nHvJcFQ2sE=; b=cQsbUrF/BT7AEtvym5xfvT2YF/zc7J8PC1iuxA1Ir5Q9kUQMg4H6GY8iwQSVfyjkc4 0d+040wJAYlzw7OriRs8qVswnMo533lm4WoH2tTf41bHrvrwZTqfYEsmsWKFQFx6YRQw MH9iYj5oLBhyJNlMyJ5sVZHrYdj+LtzzBDq0LHoRn8DZRqnIL0wzJp8r4EXg8nxpCCdI ML5jZZxY1DTtAxQtTCUCKQZgTZ1A9Qmn3VQ1KUTKEn/1v1TMfoP7uEuomEGOx8AlFZiG HVsTBHuDDA8wX1EdMsiNqw2g7G9NuBDuD7c0hWqe8YMDYz0FnloWp4DoT31ECTvjFIVC 50Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=gYW368k8gn5uzLQOzHOzAcjW4kvlMyk82nHvJcFQ2sE=; b=Z7QhQW0Op+ELCdh06GsoSyC/xSHFOXOUaikIA0aTRZ/X9N4IK3e6uiqpK1v6V7W4Yd Ls0i0DRgBt1fnxDT2k0CTzbQRtO0A88+gDu6V9cNtqfkK42iTR4FbGyp2IHoVqh1FECG TeyhqHA6HVtRKcUaiRap0xDjcGzehfLyut6op6wzOHXnzl0PSiG3SWwfs9G1YCI5PbiH T47vGP+MjvrFVbbMzY9d1h0PXSrH+B9PXpzrprV/oSBIRXp5Ot2HAPaw6LmfCh9iISla NvQe5s9Lyz3769bsSSN0xe5MddNDyjEOogRHQBBsKlf5YpPaJeBeBTZQKah25tK6nA/f YTGA== X-Gm-Message-State: AOAM531+WwzChpA5GbjH2rxm3yQXi32rDussfaR5pYYG4O5Q4TPS25ne Ln5vWsirncBiJ7syBB7ruYjc4VaCXP0= X-Google-Smtp-Source: ABdhPJyMsWvPYDUCKyegohr67gBQo744H27VurYZgSIquJRNlyD/voEV1BtmFWZxxaWUg20GrlIGIg== X-Received: by 2002:a05:651c:503:: with SMTP id o3mr1138370ljp.312.1598000129198; Fri, 21 Aug 2020 01:55:29 -0700 (PDT) Original-Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id z6sm251313lfq.66.2020.08.21.01.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 01:55:28 -0700 (PDT) In-Reply-To: (Richard Stallman's message of "Thu, 20 Aug 2020 23:33:42 -0400") Received-SPF: pass client-ip=2a00:1450:4864:20::22b; envelope-from=sorganov@gmail.com; helo=mail-lj1-x22b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:254071 Archived-At: Richard Stallman writes: > [[[ To any NSA and FBI agents reading my email: please consider ]]] > [[[ whether defending the US Constitution against all enemies, ]]] > [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > If git itself doesn't have all the facilities for ignoring trivial > commits that we would want, we can add those facilities in various ways, > with patches to git or scripts. We can offer the patches upstream. Git has various options to ignore whitespace changes during merge: ignore-space-change, ignore-all-space, ignore-space-at-eol, ignore-cr-at-eol Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. See also git-diff(1) -b, -w, --ignore-space-at-eol, and --ignore-cr-at-eol. • If their version only introduces whitespace changes to a line, our version is used; • If our version introduces whitespace changes but their version includes a substantial change, their version is used; • Otherwise, the merge proceeds in the usual way. OTOH, when merging, by design Git never looks at individual commits, it rather performs 3-way merge with respect to common ancestor, so no marking of individual commits would help. -- Sergey