Issues running gitmerge

Issues running gitmerge

[Jim Porter]

I noticed that it's been about a week since we last ran gitmerge, and so 
I attempted it since I have a couple of changes to the Eshell manual on 
the release branch that I want to merge into master. However, running 
gitmerge fails, I think due to our pre-commit hook complaining. The 
failing files are:

   ChangeLog.android
     The hook rejects files with ChangeLog in the name, but reports the 
wrong error due to a (probable) bug in the hook.

   java/INSTALL
     Whitespace "issues" (which are probably non-issues since these are 
part of in-line diffs).

   java/README
     Extraneous newline at the end.

   java/res/drawable/emacs_background.xml:30
     Trailing whitespace (probably a real issue)

The last two are easy enough to fix, but I'm not sure what to do about 
the others. Can we tell Git to ignore these problems? Should we fix them 
somehow? I'm no expert on the gitmerge process, so maybe I'm just 
missing something obvious.

Re: Issues running gitmerge

[Po Lu]

Jim Porter <jporterbugs@gmail.com> writes:

> I noticed that it's been about a week since we last ran gitmerge, and
> so I attempted it since I have a couple of changes to the Eshell
> manual on the release branch that I want to merge into
> master. However, running gitmerge fails, I think due to our pre-commit
> hook complaining. The failing files are:
>
>   ChangeLog.android
>     The hook rejects files with ChangeLog in the name, but reports the
>     wrong error due to a (probable) bug in the hook.

ChangeLog.android should be kept.  The hook should be fixed.

>   java/INSTALL
>     Whitespace "issues" (which are probably non-issues since these are
>     part of in-line diffs).
>
>   java/README
>     Extraneous newline at the end.

The hook must be taught to ignore these files.

>   java/res/drawable/emacs_background.xml:30
>     Trailing whitespace (probably a real issue)
>
> The last two are easy enough to fix, but I'm not sure what to do about
> the others. Can we tell Git to ignore these problems? Should we fix
> them somehow? I'm no expert on the gitmerge process, so maybe I'm just
> missing something obvious.

I asked this question a week ago, but none of the Git experts who
frequent this list replied.

I will fix emacs_background.xml.

Re: Issues running gitmerge

[Jim Porter]

Ok, I've made a couple of changes to fix the merge (see commit 
0df2efa4d69), and then I ran gitmerge successfully and pushed the 
result. Additional details below.

On 8/21/2023 6:03 PM, Po Lu wrote:
> Jim Porter <jporterbugs@gmail.com> writes:
> 
>> The failing files are:
>>
>>    ChangeLog.android
>>      The hook rejects files with ChangeLog in the name, but reports the
>>      wrong error due to a (probable) bug in the hook.
> 
> ChangeLog.android should be kept.  The hook should be fixed.

Fixed.

>>    java/INSTALL
>>      Whitespace "issues" (which are probably non-issues since these are
>>      part of in-line diffs).
>>
>>    java/README
>>      Extraneous newline at the end.
> 
> The hook must be taught to ignore these files.

I've set Git to ignore the whitespace in the former file. Looking more 
closely at the latter, I think the extra newline really is unnecessary, 
so I removed it. However, if I've made a mistake, just let me know.

> I will fix emacs_background.xml.

Thanks.