From ebdb3399b54e37717a8eed88996e1ad1d88333cb Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 18 May 2020 03:37:42 -0400 Subject: [PATCH] Recommend the correct option for changes in package origin For prompts like these > In repository "org-roam", remote "origin" has URL "https://github.com/jethrokuan/org-roam.git" but recipe specifies a URL of "https://github.com/org-roam/org-roam.git" 1) Abort 2) Rename remote "origin" to "origin-1", re-create "origin" with correct URL, and fetch 3) Rename remote "origin" manually, re-create it with correct URL, and fetch (Recommended) 4) Delete remote "origin", re-create it with correct URL, and fetch 5) Delete remote "origin", re-create it with manually set URL, and fetch How to proceed? (1, 2, 3, 4, 5) 4 should be recommended, not 3. --- core/core-cli.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-cli.el b/core/core-cli.el index c53207d2a..06f60355f 100644 --- a/core/core-cli.el +++ b/core/core-cli.el @@ -226,7 +226,7 @@ BODY will be run when this dispatcher is called." '(("has diverged from" . "^Reset [^ ]+ to branch") ("but recipe specifies a URL of" - . "re-create it with correct URL") + . "Delete remote \"[^\"]+\", re-create it with correct URL") ("has a merge conflict:" . "^Abort merge$") ("has a dirty worktree:"