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 - 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