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

GielVanSchijndel-TomTom · Byron · commit 037d62a99667 · 2021-01-14T12:04:03.000+08:00
FETCH_HEAD is one of the symbolic references local to the current
worktree and as such should _not_ be looked up in the 'common_dir'. But
instead of just hard coding the "right thing" (git_dir) lets defer this
to the SymbolicReference class which already contains this knowledge in
its 'abspath' property.
diff --git a/git/remote.py b/git/remote.py
@@ -22,8 +22,6 @@
 join_path,
 )
 
-import os.path as osp
-
 from .config import (
 SectionConstraint,
 cp,
@@ -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)

-Original file line number
+Diff line change
 join_path,
+)
 -importos.pathasosp
+-
 from .configimport (
 SectionConstraint,
 cp,
 continue
 # read head information
 -withopen(osp.join(self.repo.common_dir, 'FETCH_HEAD'), 'rb') asfp:
 +fetch_head=SymbolicReference(self.repo, "FETCH_HEAD")
 +withopen(fetch_head.abspath, 'rb') asfp:
 fetch_head_info= [line.decode(defenc) forlineinfp.readlines()]
 l_fil=len(fetch_info_lines)