This fixes two issues in next for Windows reported by Hannes, both due to my en/d-f-conflict-fix patch series: On Thu, Aug 12, 2010 at 3:23 AM, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote: > 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. >> * 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. Elijah Newren (2): merge-recursive: Workaround unused variable warning Mark tests that use symlinks as needing SYMLINKS prerequisite merge-recursive.c | 1 + t/t3509-cherry-pick-merge-df.sh | 6 ++++++ t/t9350-fast-export.sh | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) -- 1.7.2.1.119.gca9fe.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html