diff options
Diffstat (limited to 'project.py')
| -rw-r--r-- | project.py | 19 |
1 files changed, 9 insertions, 10 deletions
| @@ -2396,26 +2396,25 @@ class Project: | |||
| 2396 | try: | 2396 | try: |
| 2397 | # if revision (sha or tag) is not present then following function | 2397 | # if revision (sha or tag) is not present then following function |
| 2398 | # throws an error. | 2398 | # throws an error. |
| 2399 | revs = [f"{self.revisionExpr}^0"] | ||
| 2400 | upstream_rev = None | ||
| 2401 | if self.upstream: | ||
| 2402 | upstream_rev = self.GetRemote().ToLocal(self.upstream) | ||
| 2403 | revs.append(upstream_rev) | ||
| 2404 | |||
| 2399 | self.bare_git.rev_list( | 2405 | self.bare_git.rev_list( |
| 2400 | "-1", | 2406 | "-1", |
| 2401 | "--missing=allow-any", | 2407 | "--missing=allow-any", |
| 2402 | "%s^0" % self.revisionExpr, | 2408 | *revs, |
| 2403 | "--", | 2409 | "--", |
| 2404 | log_as_error=False, | 2410 | log_as_error=False, |
| 2405 | ) | 2411 | ) |
| 2412 | |||
| 2406 | if self.upstream: | 2413 | if self.upstream: |
| 2407 | rev = self.GetRemote().ToLocal(self.upstream) | ||
| 2408 | self.bare_git.rev_list( | ||
| 2409 | "-1", | ||
| 2410 | "--missing=allow-any", | ||
| 2411 | "%s^0" % rev, | ||
| 2412 | "--", | ||
| 2413 | log_as_error=False, | ||
| 2414 | ) | ||
| 2415 | self.bare_git.merge_base( | 2414 | self.bare_git.merge_base( |
| 2416 | "--is-ancestor", | 2415 | "--is-ancestor", |
| 2417 | self.revisionExpr, | 2416 | self.revisionExpr, |
| 2418 | rev, | 2417 | upstream_rev, |
| 2419 | log_as_error=False, | 2418 | log_as_error=False, |
| 2420 | ) | 2419 | ) |
| 2421 | return True | 2420 | return True |
