From: Andreas Schwab <schwab@linux-m68k.org>
To: emacs-devel@gnu.org
Subject: Re: elpa - problem with stashes inside worktree
Date: Wed, 07 Apr 2021 19:58:20 +0200 [thread overview]
Message-ID: <87wntedlj7.fsf@igel.home> (raw)
In-Reply-To: <m2eefmnfrz.fsf@fastmail.fm> (Filipp Gunbin's message of "Wed, 07 Apr 2021 20:52:32 +0300")
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."
next prev parent reply other threads:[~2021-04-07 17:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 17:52 elpa - problem with stashes inside worktree Filipp Gunbin
2021-04-07 17:58 ` Andreas Schwab [this message]
2021-04-07 20:49 ` Filipp Gunbin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wntedlj7.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).