Integrated: 1879: Make GitRepository#isEmptyCommit be compatible with old versions of Git
Zhao Song
zsong at openjdk.org
Thu Apr 13 20:08:47 UTC 2023
On Thu, 13 Apr 2023 17:32:47 GMT, Zhao Song <zsong at openjdk.org> wrote:
> In SKARA-1854, we introduced a method GitRepository#isEmptyCommit. In addition, the git show command includes the option '--diff-merges=dense-combined' in git 2.30.0. However, this option is not available in old versions of git. To ensure compatibility with old versions of Git, we should replace '--diff-merges=dense-combined' with the '--cc' option.
>
> References:
> [1]https://git-scm.com/docs/git-show/2.29.0
> [2]https://git-scm.com/docs/git-show/2.30.0
This pull request has now been integrated.
Changeset: 80b3fc6a
Author: Zhao Song <zsong at openjdk.org>
URL: https://git.openjdk.org/skara/commit/80b3fc6a6ac1cf1b813d1bcd45ff81447f4f6bdb
Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
1879: Make GitRepository#isEmptyCommit be compatible with old versions of Git
Reviewed-by: erikj
-------------
PR: https://git.openjdk.org/skara/pull/1501
More information about the skara-dev
mailing list