From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Fri, 23 Dec 2022 10:16:57 +0200 Message-ID: <835ye28rgm.fsf@gnu.org> References: <38d4d719-8f3c-9bb6-b141-f7e9ca66333c@yandex.ru> <871qovjabq.fsf@melete.silentflame.com> <4513ac99-76d1-cdd6-fcc9-59208b5002f3@yandex.ru> <87zgbih8wv.fsf@melete.silentflame.com> <392bbde0-9d6e-83c4-0639-af406e279ef1@yandex.ru> <87h6xqgg65.fsf@melete.silentflame.com> <87zgbh1xkn.fsf@melete.silentflame.com> <4910f545-d7b1-9f6b-8262-fd7fc89d589d@yandex.ru> <87h6xnasgn.fsf@melete.silentflame.com> <878riybwhy.fsf@melete.silentflame.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22075"; mail-complaints-to="usenet@ciao.gmane.io" Cc: juri@linkov.net, 60126@debbugs.gnu.org, dgutov@yandex.ru To: Sean Whitton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 23 09:18:30 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1p8dGA-0005TG-5n for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 23 Dec 2022 09:18:30 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8dFr-0005Ro-Nu; Fri, 23 Dec 2022 03:18:11 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8dFj-0005Om-0y for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 03:18:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p8dFi-0006MS-AA for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 03:18:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8dFh-0004YU-Mk for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 03:18:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 23 Dec 2022 08:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60126 X-GNU-PR-Package: emacs Original-Received: via spool by 60126-submit@debbugs.gnu.org id=B60126.167178343917503 (code B ref 60126); Fri, 23 Dec 2022 08:18:01 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 23 Dec 2022 08:17:19 +0000 Original-Received: from localhost ([127.0.0.1]:36812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8dF0-0004YF-Rf for submit@debbugs.gnu.org; Fri, 23 Dec 2022 03:17:19 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:49222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8dEy-0004Y8-NE for 60126@debbugs.gnu.org; Fri, 23 Dec 2022 03:17:17 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8dEt-0006Jf-Ai; Fri, 23 Dec 2022 03:17:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=H655dicUYbgylajmepHiNj7WRjMRiXM0NuZxm7LEj9E=; b=F8opuXLtNhwv yauov0Vg/AKCfmD/gSTOsicFRejeFyfpOoojifdTXBYd5fVmrKw/46vMyMDkB1slJgf9v2HSpCTKc 63wJWMLKMml+pj6T6eL3eNHkrhNzw5dgvSXgNpnXZE1Z/Fdc/x+/IB1dP8eL1W7kzTDuZVQIukTAM sM2S72ggKebBLrHEDEeo/rrdxQoaPL6aDU+0iEke/PBhUHWgTws5/QAcDAXAUe1j+QSYeoBKgLY/j S2uMBnmvH5X68WVagHilQ0tsU3HCU+wm4FuavPh4DFKLhWlvBeBwGpKPjHmmACVeWacQ9xGcNOdkr yrMuuO4O9CFU1ykFC+FrHQ==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8dEs-0005aK-Lt; Fri, 23 Dec 2022 03:17:11 -0500 In-Reply-To: <878riybwhy.fsf@melete.silentflame.com> (message from Sean Whitton on Thu, 22 Dec 2022 20:59:53 -0700) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:251713 Archived-At: > Cc: 60126@debbugs.gnu.org, juri@linkov.net > From: Sean Whitton > Date: Thu, 22 Dec 2022 20:59:53 -0700 > > + ;; Prepare stash commit object, which has a special structure. > + (let* ((tree-commit (git-string "commit-tree" "-m" message Can 'message' include newlines? if so, we need to either convert the newlines to spaces, or invoke the command with -F instead, writing the message to a temporary file. Because otherwise this will fail on Windows.