mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into jc/globfetch

Browse Source 
This is to pick up the fix made on master:

  git-fetch: exit with non-zero status when fast-forward check fails
This commit is contained in:
Junio C Hamano
2006-11-25 01:04:54 -08:00
parent 5677882be7 f64d7fd267
commit cadd8a7d4d
18 changed files with 1015 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
git-fetch.sh
View File

@ -360,7 +360,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
@ -414,15 +414,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
@ -450,7 +451,7 @@ case "$no_tags$tags" in
case "$taglist" in
'') ;;
?*)
fetch_main "$taglist" ;;
fetch_main "$taglist" || exit ;;
esac
esac