kahole / edamagit

Magit for VSCode

Home Page:https://marketplace.visualstudio.com/items?itemName=kahole.magit

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

[bug] Pull --prune doesn't cleanup local branches

MarcoBuess opened this issue · comments

Using F with the --prune option, doesn't cleanup remote branches as expected. Log:

[0] git pull --prune origin master
Updating 5045ae9..a167de5
Fast-forward
 xxx/xxx/README.md                           |   1 +
 .../xxx/xxx-1.png    | Bin 0 -> 225631 bytes
 .../xxx/xxx-2.png    | Bin 0 -> 37300 bytes
 .../xxx/xxx-3.png    | Bin 0 -> 36311 bytes
 .../xxx/xxx-4.png    | Bin 0 -> 18798 bytes
 .../xxx/xxx-5.png    | Bin 0 -> 11711 bytes
 .../xxx/xxx-6.png    | Bin 0 -> 30488 bytes
 .../xxx/xxx-7.png    | Bin 0 -> 13926 bytes
 xxx/xxx/xxx/xxx.md         |  40 +++++++++++++++++++++
 9 files changed, 41 insertions(+)
 create mode 100644 xxx/xxx/xxx/xxx/xxx/xxx-1.png
 create mode 100644 xxx/xxx/xxx/xxx/xxx/xxx-2.png
 create mode 100644 xxx/xxx/xxx/xxx/xxx/xxx-3.png
 create mode 100644 xxx/xxx/xxx/xxx/xxx/xxx-4.png
 create mode 100644 xxx/xxx/xxx/xxx/xxx/xxx-5.png
 create mode 100644 xxx/xxx/xxx/xxx/xxx/xxx-6.png
 create mode 100644 xxx/xxx/xxx/xxx/xxx/xxx-7.png
 create mode 100644 xxx/xxx/xxx/xxx.md

From https://xxx.xxx
 * branch            master     -> FETCH_HEAD
   5045ae9..a167de5  master     -> origin/master

It seems to be working fine for the f (fetch) command though. Log:

[0] git fetch --prune origin
From https://xxx.xxx
 - [deleted]         (none)     -> origin/branch-name

For Reference the output of git branch -a after running F with --prune.

$ git branch -a
  secret-branch
* master
  remotes/origin/secret-branch
  remotes/origin/master

And after running f with --prune.

$ git branch -a
  secret-branch
* master
  remotes/origin/master

This switch actually doesn't exist in emacs magit for pulling. I have therefore removed it from edamagit now.
This might not have been the answer you hoped for, but at least now it's not broken.
Thanks for reporting!