From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: elpa - problem with stashes inside worktree Date: Wed, 07 Apr 2021 19:58:20 +0200 Message-ID: <87wntedlj7.fsf@igel.home> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="891"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Apr 07 20:01:21 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 1lUCUT-000096-GL for ged-emacs-devel@m.gmane-mx.org; Wed, 07 Apr 2021 20:01:21 +0200 Original-Received: from localhost ([::1]:39006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUCUS-0003T0-AV for ged-emacs-devel@m.gmane-mx.org; Wed, 07 Apr 2021 14:01:20 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCRf-0000N7-2H for emacs-devel@gnu.org; Wed, 07 Apr 2021 13:58:27 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:50543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCRc-0007ST-Jr for emacs-devel@gnu.org; Wed, 07 Apr 2021 13:58:26 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FFsZP2lG9z1qskV for ; Wed, 7 Apr 2021 19:58:21 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FFsZP2gVFz1sP6m for ; Wed, 7 Apr 2021 19:58:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id KBzGTmgQPQ-0 for ; Wed, 7 Apr 2021 19:58:20 +0200 (CEST) X-Auth-Info: zKyf62THhAq1cuhTrlNPHCyedslfgA+Mc2hj9AhcWT2uSVzr8jUuiPunY9mj4Xln Original-Received: from igel.home (ppp-46-244-190-7.dynamic.mnet-online.de [46.244.190.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Wed, 7 Apr 2021 19:58:20 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id 163EA2C312F; Wed, 7 Apr 2021 19:58:20 +0200 (CEST) X-Yow: If this is the DATING GAME I want to know your FAVORITE PLANET! Do I get th' MICROWAVE MOPED? In-Reply-To: (Filipp Gunbin's message of "Wed, 07 Apr 2021 20:52:32 +0300") Received-SPF: pass client-ip=212.18.0.9; envelope-from=whitebox@nefkom.net; helo=mail-out.m-online.net X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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:267551 Archived-At: On Apr 07 2021, Filipp Gunbin wrote: > 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: > > diff --git a/javaimp.el b/javaimp.el > index 8e27452418..a9781630e9 100644 > --- a/javaimp.el > +++ b/javaimp.el > @@ -577,4 +577,6 @@ cache." > > (provide 'javaimp) > > +asdf > + > ;;; javaimp.el ends here > > 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. That is correct, as the package lives in a separate branch. > From C-x v d on a package directory, stash can be applied normally. The main elpa branch just doesn't contain anything related to packages. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."