Karthik Nayak <karthik.188@xxxxxxxxx> writes: >>> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh >>> index 7c9bec7..6fc569e 100755 >>> --- a/t/t6300-for-each-ref.sh >>> +++ b/t/t6300-for-each-ref.sh >>> @@ -385,6 +385,28 @@ test_expect_success 'Check short objectname format' ' >>> test_cmp expected actual >>> ' >>> >>> +cat >expected <<EOF >>> +$(git rev-parse --short=1 HEAD) >>> +EOF >> >> Please write all code within test_expect_success including this >> (t/README: >> >> - Put all code inside test_expect_success and other assertions. >> >> Even code that isn't a test per se, but merely some setup code >> should be inside a test assertion. >> ). >> > > Was just following the previous syntax, should have read that. fixed it The common practice (not necessarily a rule, though) when you write code next to other code that does not follow the style is: * If it's not too disturbing, adopt the new style and keep the old code as-is. I think we are in this case. * If the new and the old style do not mix well, prepend a "modernize style" patch to the series, and adopt the new style in the patch itself. * If you're too lazy to do a "modernize style", adopt the old style for consistency. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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