On Monday 01 August 2011 20:06:58 Ramkumar Ramachandra wrote: > + > +test_expect_success 'cherry-pick persists opts correctly' ' > + rm -rf .git/sequencer && > + pristine_detach initial && pristine_detach() does a "rm -rf .git/sequencer" already. > + test_must_fail git cherry-pick -s -m 1 --strategy=recursive -X patience > -X ours base..anotherpick && + test_path_is_dir .git/sequencer && > + test_path_is_file .git/sequencer/head && > + test_path_is_file .git/sequencer/todo && > + test_path_is_file .git/sequencer/opts && > + echo "true" >expect "&&" is missing at the end of the line. > + git config --file=.git/sequencer/opts --get-all options.signoff >actual > && > + test_cmp expect actual && > + echo "1" >expect "&&" is missing at the end of the line. > + git config --file=.git/sequencer/opts --get-all options.mainline >actual > && > + test_cmp expect actual && > + echo "recursive" >expect "&&" is missing at the end of the line. > + git config --file=.git/sequencer/opts --get-all options.strategy >actual > && > + test_cmp expect actual && > + cat >expect <<-\EOF "&&" is missing at the end of the line. > + patience > + ours > + EOF > + git config --file=.git/sequencer/opts --get-all options.strategy-option > >actual && > >+ test_cmp expect actual > ' Thanks, Christian. -- 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