Jonathan Nieder wrote: > Maybe something like this? > > test_expect_success 'setup: clear [merge] configuration' ' > test_might_fail git config --unset-all merge.log && > test_might_fail git config --unset-all merge.summary > ' > > test_expect_success 'set up FETCH_HEAD' ' > git checkout master && > git fetch . left > ' > > test_expect_success 'merge.log=3 limits shortlog length' ' > test_might_fail git config --unset merge.log && > test_might_fail git config --unset merge.summary && Erm, these two lines wouldn't be necessary given the earlier setup, of course. > > cat >expected <<-\EOF && > Left #3 > ... > EOF > git -c merge.log=3 fmt-merge-msg <.git/FETCH_HEAD >msg && > > tail -n 2 msg >actual && > test_cmp expected actual > ' Sorry for the noise. *goes off to sleep* -- 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