On Thu, Apr 02, 2009 at 12:54:22AM +0200, Markus Heidelberg wrote: > David Aguilar, 01.04.2009: > > + present=false > > + base_present && > > + present=true > > + > > + run_mergetool "$merge_tool" "$present" > > + status=$? > > This last line has to be deleted, because the variable 'status' set in > run_mergetool would be overwritten then. In this case the merge will > succeed even if it didn't and the file will be staged. I think that it would be better if $status stayed as local as possible. If run_mergetool returned the value of $status as its exit code then the function will properly return whether the merge succeeded or not. This way run_mergetool's clients can just use its exit code, without having to know about a magic $status global variable. -- Charles Bailey http://ccgi.hashpling.plus.com/blog/ -- 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
