From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Filipp Gunbin Newsgroups: gmane.emacs.devel Subject: elpa - problem with stashes inside worktree Date: Wed, 07 Apr 2021 20:52:32 +0300 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5943"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Apr 07 19:53:48 2021 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 1lUCNA-0001SG-Fw for ged-emacs-devel@m.gmane-mx.org; Wed, 07 Apr 2021 19:53:48 +0200 Original-Received: from localhost ([::1]:39922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUCN9-0000dE-Gy for ged-emacs-devel@m.gmane-mx.org; Wed, 07 Apr 2021 13:53:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCM3-0007wZ-Av for emacs-devel@gnu.org; Wed, 07 Apr 2021 13:52:39 -0400 Original-Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:53715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCM1-0004ge-Oc for emacs-devel@gnu.org; Wed, 07 Apr 2021 13:52:39 -0400 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 15E41168C for ; Wed, 7 Apr 2021 13:52:36 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 07 Apr 2021 13:52:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.fm; h= from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm2; bh=Sz+aPjQL755pNvIa2XmpJGcNZx YnL+KBI39KdH9ZIwE=; b=XXA/IzNztXJgMjyLoDKbT2bhEmI1zKIflGM9wzmqTt ZL93wMCxMOzvS2YRzBxKsZTmVeY4bOYFVZ8sTLsJC6G1doTLGpMxVlXuFRcE8iiU lMADSshczdRYe0nc/NkYiLrUixNTddxPjfhYby3SSZjc8EKPyuOWBAVLHDjRqnds 9pGSCCdhaBAiY4QhDqKmFC+bSq5B7RULLvkW2rateM/Yp4wA6VQpWRW4AUzOWx50 4O+reH0kpeGXjYdnWgOEPy/pBCbVLAsO5Vm8ohiCSTQHtLvHZ4ffT4CtjyYG5rV9 nAoWcX5R3I9j66LDimdft4gNpikBS272NH50AOlK1gQQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=Sz+aPj QL755pNvIa2XmpJGcNZxYnL+KBI39KdH9ZIwE=; b=JtNR7XWJng+hDMeVpvbose bsjuOCQvYU9wLba/UKnjgPyM5W6SvFgual5LivgXwT6AM63Z3mMIp6YlGFrDsRy9 CKxpfptJ7hdMSpM+7WEPcVd6pKwmIunEb/vIB9IGllNRQ+SbdaobL9s2TZghOUlx +Q7TjHPxCNLpcDGEhSDbTQ+O2+kg69DE+DowBtpDZOziH7KDqqjHUlkHtcKI7bfu TCeZNnlu1r/gVWCzP/svKw8TUqx47u+reJFGZl8jhBSJrmxWqlKUlx4zZZgTLB2Z GtLF55+enFanMtuBniuXO7W+h1rwtFkYHMTAr9dcnaVwRFUT+PzWs4urI8/wL7Cg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejjedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkfggtgfgsehtqhertd dttdejnecuhfhrohhmpefhihhlihhpphcuifhunhgsihhnuceofhhguhhnsghinhesfhgr shhtmhgrihhlrdhfmheqnecuggftrfgrthhtvghrnhepieeiueegudeuhfelgfejheeife ejjefgieeljeeufefhtdfhieevhfevgfffgedvnecukfhppeekgedrvddtgedrudelfedr uddtieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hfghhunhgsihhnsehfrghsthhmrghilhdrfhhm X-ME-Proxy: Original-Received: from fgunbin.local (unknown [84.204.193.106]) by mail.messagingengine.com (Postfix) with ESMTPA id E3EC224005B for ; Wed, 7 Apr 2021 13:52:34 -0400 (EDT) Mail-Followup-To: emacs-devel@gnu.org Received-SPF: pass client-ip=64.147.123.19; envelope-from=fgunbin@fastmail.fm; helo=wout3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_PASS=-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:267548 Archived-At: Hi, I've got this problem in elpa repo: - make a new stash in some package (just "git stash") - C-x v d on top-level elpa directory - vc-git-stash-apply-at-point on the just created stash fails Stash diff looks like this: --8<---------------cut here---------------start------------->8--- diff --git a/javaimp.el b/javaimp.el index 8e27452418..a9781630e9 100644 --- a/javaimp.el +++ b/javaimp.el @@ -577,4 +577,6 @@ cache." =20 (provide 'javaimp) =20 +asdf + ;;; javaimp.el ends here --8<---------------cut here---------------end--------------->8--- The file path is wrong, and change is applied to the wrong file. Looks like Git creates stash using package worktree dir as the top directory. >From C-x v d on a package directory, stash can be applied normally. Maybe we could extend vc-dir to specially treat this case? I doubt that Git worktrees are intended to be used this way (inside the main tree)=E2=80= =A6 Filipp