1753068 - Failed landing due to incorrect diff for empty files/lines.

Status: RESOLVED FIXED

(Conduit :: moz-phab, defect, P2)

Description

[Henrik Skupin (:whimboo) [⌚️UTC+1]]

+++ This bug was initially created as a clone of Bug #1646831 +++

I've moz-phab version 1.0.0 and this problem is still present for https://phabricator.services.mozilla.com/D137438.

Sadly with this version of moz-phab the --arc argument is no longer available. See bug remove-arc. So maybe we should get back this argument as long as this bug exists?

Comment 1

[Masatoshi Kimura [:emk]]

Why did you clear Cc list?

Comment 2

[Zeid Zabaneh [:zeid]]

This bug should be fixed in moz-phab and/or Phabricator. I will look into it.

(In reply to Masatoshi Kimura [:emk] from comment #1)

Why did you clear Cc list?

Bugzilla cloned the CC list from the previous bug, which included 6 people (some no longer active) and figured I'll let those who want to follow the bug manually subscribe to avoid spam.

Comment 3

[Zeid Zabaneh [:zeid]]

Attachment: git: fix handling of deleted empty file hunks (Bug 1753068) r=sheehan

• check file size before generating hunk (same as mercurial handling)
• temporarily bump release version for dev release

Release version will be changed to 1.0.1 before merging.

Comment 4

[Zeid Zabaneh [:zeid]]

Patch fixes only one edge case that manifests this bug. Likely there are a few other edge cases, will file a different bug for those ones. Latest occurrence of this issue was related to a deleted empty file being submitted under a git repo. The behaviour will now match what was implemented in bug 1680836 for mercurial patches.