Ramkumar Ramachandra wrote: > Junio C Hamano wrote: >> Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes: >> >>>>> + elif test "$autostash" = false >>>>> + then >>>>> require_clean_work_tree "pull with rebase" "Please commit or stash them." >>>>> fi >>>> >>>> A safety net, after you run "git stash", to validate that the >>>> added "git stash" indeed made the working tree clean, is necessary >>>> below, but there does not seem to be any. >>> >>> Um, isn't that part of the "git stash" testsuite? >> >> You should always "trust but verify" what other commands do at key >> points of the operation; and I think this "require-clean-work-tree" >> is a key precondition for this mode of operation to work correctly. >> >> Especially because you do not even bother to check the result of >> "git stash" before continuing ;-). > > If you think it's enough to replicate the codepath that precedes the > actual saving in 'git stash' (which is essentially > require-clean-work-tree), I'm in agreement with you. I thought you > were implying a wider safety net, that wouldn't even assume the basic > sanity of stash. Er, s/codepath that precedes the actual saving in 'git stash'/codepath that precedes the actual pulling or merging in 'git pull'/ I'm feeling a little muddled up today; weekends are usually bad. -- 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