# git pull fails to exit with non-zero status after fatal error 8 messages from 2007-03-03 to 2007-03-03. Participants: Larry Streepy, Johannes Schindelin, Junio C Hamano, Shawn O. Pearce. Thread: https://gitlist.dev/t/7062 ## Larry Streepy, 2007-03-03 16:45 Subject: git pull fails to exit with non-zero status after fatal error Message-ID: <45E9A641.8020002@lightspeed.com> URL: https://gitlist.dev/e/45E9A641.8020002%40lightspeed.com ``` We have just upgraded to 1.5 (don't know if this is specific to 1.5, but just in case). When I perform a git-pull on a working repo that has a modified file, git pull refuses to do the pull, as shown below: $ git pull Updating b5d9263..506b347 tools/Pvt/Pvt.py: needs update fatal: Entry 'tools/Pvt/Pvt.py' not uptodate. Cannot merge. $ echo $? 0 Notice the exit status of 0. The driver scripts I use rely on a non-zero status to send me email when the git-pull fails, but this case eludes detection. I'm assuming this is a bug, but if it's intended behavior I'd like to understand why it would use a 0 exit status after a issuing a fatal error. Thanks, Larry. ``` ## Johannes Schindelin, 2007-03-03 18:13 Subject: Re: git pull fails to exit with non-zero status after fatal error Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0703031913100.22628%40wbgn013.biozentrum.uni-wuerzburg.de In-Reply-To: <45E9A641.8020002@lightspeed.com> ``` Hi, On Sat, 3 Mar 2007, Larry Streepy wrote: > We have just upgraded to 1.5 (don't know if this is specific to 1.5, but just > in case). When I perform a git-pull on a working repo that has a modified > file, git pull refuses to do the pull, as shown below: > > $ git pull > Updating b5d9263..506b347 > tools/Pvt/Pvt.py: needs update > fatal: Entry 'tools/Pvt/Pvt.py' not uptodate. Cannot merge. > $ echo $? > 0 > > Notice the exit status of 0. Does this fix it? diff --git a/git-merge.sh b/git-merge.sh index 498c938..6b23bf5 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -295,8 +295,9 @@ f,*) new_head=$(git-rev-parse --verify "$1^0") && git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && finish "$new_head" "Fast forward" + ret=$? dropsave - exit 0 + exit $ret ;; ?,1,?*"$LF"?*,*) # We are not doing octopus and not fast forward. Need a ``` ## Larry Streepy, 2007-03-03 19:27 Subject: Re: git pull fails to exit with non-zero status after fatal error Message-ID: <45E9CC25.3030305@lightspeed.com> URL: https://gitlist.dev/e/45E9CC25.3030305%40lightspeed.com In-Reply-To: ``` I'll give it a try and let you know. Thanks for the quick feedback. Larry. Johannes Schindelin wrote: > Does this fix it? > > diff --git a/git-merge.sh b/git-merge.sh > index 498c938..6b23bf5 100755 > --- a/git-merge.sh > +++ b/git-merge.sh > @@ -295,8 +295,9 @@ f,*) > new_head=$(git-rev-parse --verify "$1^0") && > git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && > finish "$new_head" "Fast forward" > + ret=$? > dropsave > - exit 0 > + exit $ret > ;; > ?,1,?*"$LF"?*,*) > # We are not doing octopus and not fast forward. Need a > ``` ## Junio C Hamano, 2007-03-03 20:56 Subject: Re: git pull fails to exit with non-zero status after fatal error Message-ID: <7vabyu9hcp.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vabyu9hcp.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Johannes Schindelin writes: > On Sat, 3 Mar 2007, Larry Streepy wrote: > >> $ git pull >> Updating b5d9263..506b347 >> tools/Pvt/Pvt.py: needs update >> fatal: Entry 'tools/Pvt/Pvt.py' not uptodate. Cannot merge. >> $ echo $? >> 0 >> >> Notice the exit status of 0. > > Does this fix it? > > diff --git a/git-merge.sh b/git-merge.sh > index 498c938..6b23bf5 100755 > --- a/git-merge.sh > +++ b/git-merge.sh > @@ -295,8 +295,9 @@ f,*) > new_head=$(git-rev-parse --verify "$1^0") && > git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && > finish "$new_head" "Fast forward" > + ret=$? > dropsave > - exit 0 > + exit $ret > ;; > ?,1,?*"$LF"?*,*) > # We are not doing octopus and not fast forward. Need a The cation "dropsave" takes is to remove the files that are not needed after a successful merge, so I think it is better to fail if the && chain that ends with finish, like this. diff --git a/git-merge.sh b/git-merge.sh index 498c938..4afcd95 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -294,7 +294,7 @@ f,*) git-update-index --refresh 2>/dev/null new_head=$(git-rev-parse --verify "$1^0") && git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && - finish "$new_head" "Fast forward" + finish "$new_head" "Fast forward" || exit dropsave exit 0 ;; ``` ## Johannes Schindelin, 2007-03-03 21:10 Subject: Re: git pull fails to exit with non-zero status after fatal error Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0703032210010.22628%40wbgn013.biozentrum.uni-wuerzburg.de In-Reply-To: <7vabyu9hcp.fsf@assigned-by-dhcp.cox.net> ``` Hi, On Sat, 3 Mar 2007, Junio C Hamano wrote: > - finish "$new_head" "Fast forward" > + finish "$new_head" "Fast forward" || exit Doesn't "exit" default to "exit 0"? Ciao, Dscho ``` ## Shawn O. Pearce, 2007-03-03 21:23 Subject: Re: git pull fails to exit with non-zero status after fatal error Message-ID: <20070303212348.GA17796@spearce.org> URL: https://gitlist.dev/e/20070303212348.GA17796%40spearce.org In-Reply-To: ``` Johannes Schindelin wrote: > On Sat, 3 Mar 2007, Junio C Hamano wrote: > > > - finish "$new_head" "Fast forward" > > + finish "$new_head" "Fast forward" || exit > > Doesn't "exit" default to "exit 0"? No, it carries the exit status of the prior failed command if the prior command failed. ;-) For what its worth, I learned that only while hacking on git-merge. I think it is highly non-obvious. -- Shawn. ``` ## Junio C Hamano, 2007-03-03 22:17 Subject: Re: git pull fails to exit with non-zero status after fatal error Message-ID: <7vlkie7z0s.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vlkie7z0s.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20070303212348.GA17796@spearce.org> ``` "Shawn O. Pearce" writes: > Johannes Schindelin wrote: >> On Sat, 3 Mar 2007, Junio C Hamano wrote: >> >> > - finish "$new_head" "Fast forward" >> > + finish "$new_head" "Fast forward" || exit >> >> Doesn't "exit" default to "exit 0"? > > No, it carries the exit status of the prior failed command if the > prior command failed. ;-) > > For what its worth, I learned that only while hacking on git-merge. > I think it is highly non-obvious. Sorry to be a traditionalist. "sequence && of && commands || exit" is an established bourne shell idiom. I do not mind if somebody proposed to change that to "... || exit $?" to unconfuse uninitiated, though. ``` ## Johannes Schindelin, 2007-03-03 22:49 Subject: Re: git pull fails to exit with non-zero status after fatal error Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0703032348570.22628%40wbgn013.biozentrum.uni-wuerzburg.de In-Reply-To: <20070303212348.GA17796@spearce.org> ``` Hi, On Sat, 3 Mar 2007, Shawn O. Pearce wrote: > Johannes Schindelin wrote: > > On Sat, 3 Mar 2007, Junio C Hamano wrote: > > > > > - finish "$new_head" "Fast forward" > > > + finish "$new_head" "Fast forward" || exit > > > > Doesn't "exit" default to "exit 0"? > > No, it carries the exit status of the prior failed command if the > prior command failed. ;-) You live and learn, live and learn... Thanks, Dscho ```