Skip to content

Commit 67b54dc

Browse files
authored
vcs: don't assume that the base rev has a single child (#640)
In case of branching or history rewrite, `{base_rev}~-1` is ambiguous and causes an error.
1 parent 7e01bbb commit 67b54dc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/taskgraph/util/vcs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def get_changed_files(
281281
return self.run("status", "--no-status", f"-{df}").splitlines()
282282
else:
283283
template = self._files_template(diff_filter)
284-
revision_argument = rev if base_rev is None else f"{base_rev}~-1::{rev}"
284+
revision_argument = rev if base_rev is None else f"{rev} % {base_rev}"
285285
return self.run("log", "-r", revision_argument, "-T", template).splitlines()
286286

287287
def get_outgoing_files(self, diff_filter="ADM", upstream=None):

0 commit comments

Comments
 (0)