From: Elijah Newren <newren@gmail.com>
Date: Thu, 12 Aug 2010 12:43:25 GMT
Subject: Re: What's cooking in git.git (Aug 2010, #02; Wed, 11)
Message-ID: <AANLkTikWnVKxdUcuNHLet20HOuBuzdF9C5fOOtVaY5p8@mail.gmail.com>
In-Reply-To: <4C63BD9B.6000608@viscovery.net>

On Thu, Aug 12, 2010 at 3:23 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> [Sorry for the Cc spam; I lack the time to conduct individual messages.]
>
> I compiled many topics in pu and ran the test suite on Windows,
> particularly those that "look good" and "will merge to next". Here's a report.
>
> Today's next produces this warning:
>
> merge-recursive.c: In function 'process_df_entry':
> merge-recursive.c:1246: warning: unused variable 'o_sha'
>
> (line number may be different) because o_sha is only used inside assert().
> I don't know how you would like this fixed.

This is caused by en/d-f-conflict-fix.  I could remove the definition
of o_sha and the corresponding assert, or (my preference) just add a
simple null statement:
   (void)o_sha;
What would others prefer?

> Am 8/12/2010 1:35, schrieb Junio C Hamano:
>> * en/rebase-against-rebase-fix (2010-08-06) 2 commits
>>  - pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
>>  - t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
>
> This should not use "sed -i" in the test suite.

Already fixed in v4 sent out last night (and was fixed in v3 that
Junio commented on, but for some reason he merged v1 instead).

>> * en/d-f-conflict-fix (2010-07-27) 7 commits
>>   (merged to 'next' on 2010-08-03 at 7f78604)
>>  + t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
>>  + fast-import: Improve robustness when D->F changes provided in wrong order
>>  + fast-export: Fix output order of D/F changes
>>  + merge_recursive: Fix renames across paths below D/F conflicts
>>  + merge-recursive: Fix D/F conflicts
>>  + Add a rename + D/F conflict testcase
>>  + Add additional testcases for D/F conflicts
>
> The new tests in t/t3509-cherry-pick-merge-df.sh and t9350-fast-export.sh
> need SYMLINKS prerequisite.

I'll fix them up.  Sorry for being less familiar with the rules, but
since these are in next, do I resend the series or just the new fixes?

Thanks,
Elijah