May 14, 2017 · May 14, 2017 · May 28, 2017
diff --git a/git/config.py b/git/config.py
            # Read includes and append those that we didn't handle yet
            # We expect all paths to be normalized and absolute (and will assure that is the case)
            if self._has_includes():
                include_paths = []
                for _, include_path in self.items('include'):
                    if include_path.startswith('~'):
                        include_path = osp.expanduser(include_path)
                    if include_path in seen or not os.access(include_path, os.R_OK):
                        continue
                    seen.add(include_path)
 files_to_read.append(include_path)
 include_paths.append(include_path)
                    num_read_include_files += 1
                include_paths.reverse()
                for include_path in include_paths:
                    files_to_read.insert(0, include_path)
                # each include path in configuration file
            # end handle includes
        # END for each file object to read
Original file line number	Diff line number	Diff line change
Expand Up		@@ -410,6 +410,7 @@ def read(self):
		# Read includes and append those that we didn't handle yet
		# We expect all paths to be normalized and absolute (and will assure that is the case)
		if self._has_includes():
		include_paths = []
		for _, include_path in self.items('include'):
		if include_path.startswith('~'):
		include_path = osp.expanduser(include_path)
Expand All		@@ -424,8 +425,11 @@ def read(self):
		if include_path in seen or not os.access(include_path, os.R_OK):
		continue
		seen.add(include_path)
		files_to_read.append(include_path)
		include_paths.append(include_path)
		num_read_include_files += 1
		include_paths.reverse()
Copy link Member ByronMay 28, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I think this block should be rewritten like this: files_to_read=include_paths+files_to_read This makes clearer that included files should be read and merged first.
		for include_path in include_paths:
		files_to_read.insert(0, include_path)
		# each include path in configuration file
		# end handle includes
		# END for each file object to read
Expand Down