Re: [PATCH v3 4/7] patch-id: fix patch-id for mode changes

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 14, 2022, 21:17 UTC
Message-ID: <xmqqilkm6r6r.fsf@gitster.g>
In-Reply-To: <6e07cfd56917db16a281e06118cce312eb39a488.1665737804.git.gitgitgadget@gmail.com>

"Jerry Zhang via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 6 quoted lines

> Currently patch-id as used in rebase and cherry-pick does not account
> for file modes if the file is modified. One consequence of this is
> that if you have a local patch that changes modes, but upstream
> has applied an outdated version of the patch that doesn't include
> that mode change, "git rebase" will drop your local version of the
> patch along with your mode changes.

Hmph, it may be a feature and a curse depending on the phase of the moon and what you are using the patch-id computation to see if you already have an identical change. But attempting to apply a patch after applying the same patch with different mode bits will likely do either the right thing (i.e. taking the mode changes only) or result in conflict to draw human attention, so this change is a definite improvement over possibly dropping a change silently.

Good.