Skip to content

Commit

Permalink
git-fetch: exit with non-zero status when fast-forward check fails
Browse files Browse the repository at this point in the history
When update_local_ref() refuses to update a branch head due to
fast-forward check, it was not propagated properly in the call
chain and the command did not exit with non-zero status as a
result.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Nov 25, 2006
1 parent d25c26e commit f64d7fd
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions git-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ fetch_main () {
esac
append_fetch_head "$head" "$remote" \
"$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
"$remote_name" "$remote_nick" "$local_name" "$not_for_merge" || exit
done
Expand Down Expand Up @@ -413,15 +413,16 @@ fetch_main () {
done
local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
append_fetch_head "$sha1" "$remote" \
"$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
done
"$remote_name" "$remote_nick" "$local_name" \
"$not_for_merge" || exit
done &&
if [ "$pack_lockfile" ]; then rm -f "$pack_lockfile"; fi
) || exit ;;
esac
}
fetch_main "$reflist"
fetch_main "$reflist" || exit
# automated tag following
case "$no_tags$tags" in
Expand Down Expand Up @@ -449,7 +450,7 @@ case "$no_tags$tags" in
case "$taglist" in
'') ;;
?*)
fetch_main "$taglist" ;;
fetch_main "$taglist" || exit ;;
esac
esac
Expand Down

0 comments on commit f64d7fd

Please sign in to comment.