RFR: 1854: Add "clean" label for merge PRs that have no merge resolution [v3]
Zhao Song
zsong at openjdk.org
Wed Apr 12 23:22:55 UTC 2023
On Wed, 12 Apr 2023 23:01:28 GMT, Erik Joelsson <erikj at openjdk.org> wrote:
>> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
>>
>> fix a problem
>
> vcs/src/main/java/org/openjdk/skara/vcs/Repository.java line 186:
>
>> 184: }
>> 185:
>> 186: boolean isEmptyCommit(Hash hash);
>
> We should add a javadoc comment describing the expected behavior for this method, specifically for merge commits.
Sure. But I think it also works for simple empty commit(not merge commit)
> vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java line 1733:
>
>> 1731: @Override
>> 1732: public boolean isEmptyCommit(Hash hash) {
>> 1733: try (var p = capture("git", "show", "--pretty=format:%b", hash.hex())) {
>
> I think we should be explicit with how we want merge diffs to be printed, even if the default is what we want. The option is `--diff-merges=dense-combined`.
Yes, it is a good idea. Will fix it.
-------------
PR Review Comment: https://git.openjdk.org/skara/pull/1500#discussion_r1164752948
PR Review Comment: https://git.openjdk.org/skara/pull/1500#discussion_r1164752239
More information about the skara-dev
mailing list