elpa - problem with stashes inside worktree

elpa - problem with stashes inside worktree

[Filipp Gunbin]

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."
 
 (provide 'javaimp)
 
+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)…

Filipp

Re: elpa - problem with stashes inside worktree

[Andreas Schwab]

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."

Re: elpa - problem with stashes inside worktree

[Filipp Gunbin]

On 07/04/2021 19:58 +0200, Andreas Schwab wrote:

> The main elpa branch just doesn't contain anything related to packages.

(I've done "make setup" / "make worktrees" some time ago)

Yes, I see why the problem happens, but that doesn't help :-)

Filipp