On Thu, Jun 11, 2015 at 09:34:08PM +0800, Paul Tan wrote: > On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt <m...@ikke.info> wrote: > > From: Kevin Daudt <compufr...@gmail.com> > > > > Signed-off-by: Kevin Daudt <m...@ikke.info> > > Ehh? The sign-off does not match the author of the patch.
I changed it, but aparently forgot to reset the author for that commit > > > ' > > > > +test_expect_success 'pull --rebase succeeds with dirty working directory > > and rebase.autostash set' ' > > + test_config branch.to-rebase.rebase true && > > Ok, though I wonder why not just a git pull --rebase... Copied that from another test, but was doubting whether to use it or not. > > > + test_config rebase.autostash true && > > + git checkout HEAD -- file && > > Why not git reset --hard before-rebase? If we don't reset HEAD, then > how would we know if we actually did a rebase? > Good tip, thanks. > > + echo dirty > new_file && > > style: echo dirty >new_file && > Fixed > > + git add new_file && > > + git pull . copy && > > + test $(git rev-parse HEAD^) = $(git rev-parse copy) && > > Okay, although it would be better to use "test_cmp_rev HEAD^ copy" > because it prints out the hashes if they are different. > Didn't know about that, and aparently, also not documented. Thanks. > > + test $(cat new_file) = dirty && > > "$(cat new_file)" should be quoted to prevent field splitting. > Fixed New patch is coming. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
