From 80c91aa65821e318a706cb514ce88cda16f80c89 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Tue, 22 Aug 2023 00:08:33 -0700 Subject: [PATCH] dag: specify options before pathspec The `git log --date=` feature added date arguments after the user-specified pathspec, which is a regression. The user-specified part must always be at the end. Closes: #1334 Reported-by: Stanislaw Halik Signed-off-by: David Aguilar (cherry picked from commit 9242912ebebdd63f2ba5d4560af5b263199eeb2b) --- CHANGES.rst | 11 +++++++++++ cola/models/dag.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index a19e2ae7..d728fb82 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,14 @@ +.. _v4.3.2: + +v4.3.2 +====== + +Fixes +----- +* `git dag` was not displaying history when refspecs were specified. + (`#1334 `_) + + .. _v4.3.1: v4.3.1 diff --git a/cola/models/dag.py b/cola/models/dag.py index 883e92eb..63e8cb85 100644 --- a/cola/models/dag.py +++ b/cola/models/dag.py @@ -277,8 +277,8 @@ class RepoReader(object): cmd = ( self._cmd + ['-%d' % self.params.count] - + ref_args + ['--date=%s' % prefs.logdate(self.context)] + + ref_args ) self._proc = core.start_command(cmd) -- 2.11.4.GIT