Skip to content

fix(fetch): use the correct FETCH_HEAD from within a worktree #1108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2021
Merged

fix(fetch): use the correct FETCH_HEAD from within a worktree #1108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions git/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
join_path,
)

import os.path as osp

from .config import (
SectionConstraint,
cp,
Expand Down Expand Up @@ -685,7 +683,8 @@ def _get_fetch_info_from_stderr(self, proc, progress):
continue

# read head information
with open(osp.join(self.repo.common_dir, 'FETCH_HEAD'), 'rb') as fp:
fetch_head = SymbolicReference(self.repo, "FETCH_HEAD")
with open(fetch_head.abspath, 'rb') as fp:
fetch_head_info = [line.decode(defenc) for line in fp.readlines()]

l_fil = len(fetch_info_lines)
Expand Down