Skip to content

Commit

Permalink
fixup! fixup! fixup! new: support annotated tags as merge source (fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaspaulb committed Jul 18, 2023
1 parent 97c77d7 commit 130ba45
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git_aggregator/repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ def _execute_shell_command_after(self):
self.log_call(cmd, shell=True, cwd=self.cwd)

def _merge(self, merge):
logger.info("Merge %s, %s", merge["remote"], merge["ref"])
logger.info("Merge %s", merge)
cmd = ("git", "merge")
if self.git_version >= (1, 7, 10):
# --edit and --no-edit appear with Git 1.7.10
Expand Down

0 comments on commit 130ba45

Please sign in to comment.