Merge branch '0.3' of https://github.com/firm1/GitPython into firm1-0.3 · saroad2/GitPython@9780b7a · GitHub

1. saroad2
2. GitPython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 9780b7a

Browse filesBrowse the repository at this point in the historyBrowse files

Byron

committed

Merge branch '0.3' of https://github.com/firm1/GitPython into firm1-0.3

Fixed most pressing issues, more to come in next commit as we introduced a regression here. Conflicts: git/objects/commit.py git/refs/log.py git/refs/symbolic.py

2 parents 322db07 + 3a1e0d7 commit 9780b7a
Copy full SHA for 9780b7a

4 files changed

+15-11Lines changed: 15 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• git
  • index
    • base.py
  • objects
    • commit.py
  • refs
    • log.py
    • symbolic.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎git/index/base.py‎

Copy file name to clipboardExpand all lines: git/index/base.py

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -867,7 +867,7 @@ def move(self, items, skip_errors=False, **kwargs):
867	867
868	868	return out
869	869
870		- def commit(self, message, parent_commits=None, head=True):
	870	+ def commit(self, message, parent_commits=None, head=True, author=None, committer=None):
871	871	"""Commit the current default index file, creating a commit object.
872	872
873	873	For more information on the arguments, see tree.commit.
@@ -878,7 +878,7 @@ def commit(self, message, parent_commits=None, head=True):
878	878	:return:
879	879	Commit object representing the new commit"""
880	880	tree = self.write_tree()
881		- return Commit.create_from_tree(self.repo, tree, message, parent_commits, head)
	881	+ return Commit.create_from_tree(self.repo, tree, message, parent_commits, head, author=author, committer=committer)
882	882
883	883	@classmethod
884	884	def _flush_stdin_and_wait(cls, proc, ignore_stdout=False):

Collapse file

‎git/objects/commit.py‎

Copy file name to clipboardExpand all lines: git/objects/commit.py

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -258,7 +258,7 @@ def _iter_from_process_or_stream(cls, repo, proc_or_stream):
258	258	finalize_process(proc_or_stream)
259	259
260	260	@classmethod
261		- def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False):
	261	+ def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False, author=None, committer=None):
262	262	"""Commit the given tree, creating a commit object.
263	263
264	264	:param repo: Repo object the commit should be part of
@@ -303,8 +303,8 @@ def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False):
303	303	cr = repo.config_reader()
304	304	env = os.environ
305	305
306		- committer = Actor.committer(cr)
307		- author = Actor.author(cr)
	306	+ committer = committer or Actor.committer(cr)
	307	+ author = author or Actor.author(cr)
308	308
309	309	# PARSE THE DATES
310	310	unix_time = int(time())

Collapse file

‎git/refs/log.py‎

Copy file name to clipboardExpand all lines: git/refs/log.py

+5-3Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -235,7 +235,8 @@ def append_entry(cls, config_reader, filepath, oldbinsha, newbinsha, message):
235	235	"""Append a new log entry to the revlog at filepath.
236	236
237	237	:param config_reader: configuration reader of the repository - used to obtain
238		- user information. May be None
	238	+ user information. May also be an Actor instance identifying the committer directly.
	239	+ May also be None
239	240	:param filepath: full path to the log file
240	241	:param oldbinsha: binary sha of the previous commit
241	242	:param newbinsha: binary sha of the current commit
@@ -249,8 +250,9 @@ def append_entry(cls, config_reader, filepath, oldbinsha, newbinsha, message):
249	250	raise ValueError("Shas need to be given in binary format")
250	251	#END handle sha type
251	252	assure_directory_exists(filepath, is_file=True)
252		- entry = RefLogEntry((bin_to_hex(oldbinsha), bin_to_hex(newbinsha), Actor.committer(config_reader), (int(time.time()), time.altzone), message))
253		-
	253	+ committer = isinstance(config_reader, Actor) and config_reader or Actor.committer(config_reader)
	254	+ entry = RefLogEntry((bin_to_hex(oldbinsha), bin_to_hex(newbinsha), committer, (int(time.time()), time.altzone), message))
	255	+
254	256	lf = LockFile(filepath)
255	257	lf._obtain_lock_or_raise()
256	258

Collapse file

‎git/refs/symbolic.py‎

Copy file name to clipboardExpand all lines: git/refs/symbolic.py

+5-3Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -355,9 +355,11 @@ def log_append(self, oldbinsha, message, newbinsha=None):
355	355	:param newbinsha: The sha the ref points to now. If None, our current commit sha
356	356	will be used
357	357	:return: added RefLogEntry instance"""
358		- return RefLog.append_entry(self.repo.config_reader(), RefLog.path(self), oldbinsha,
359		- (newbinsha is None and self.commit.binsha) or newbinsha,
360		- message)
	358	+ # NOTE: we use the committer of the currently active commit - this should be
	359	+ # correct. See https://github.com/gitpython-developers/GitPython/pull/146
	360	+ return RefLog.append_entry(self.commit.committer, RefLog.path(self), oldbinsha,
	361	+ (newbinsha is None and self.commit.binsha) or newbinsha,
	362	+ message)
361	363
362	364	def log_entry(self, index):
363	365	""":return: RefLogEntry at the given index

0 commit comments

Comments

0 (0)