RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2024-12-15 03:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream rebase detection: verify that one of the two commits is upstream

Browse Source
This commit is contained in:
Rudolf Polzer 2010-11-21 15:59:58 +01:00
parent 3747fecced
commit 7f21fe50c7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
all
View File

@ -269,6 +269,17 @@ fix_upstream_rebase()
if [ -z "$r_me" ] || [ -z "$r_other" ]; then if [ -z "$r_me" ] || [ -z "$r_other" ]; then
return return
fi fi
# one of the two sides of the merge should be remote upstream, or all is fine
r_r=`git symbolic-ref HEAD`
r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
return
fi
fi
r_base=`git merge-base "$r_me" "$r_other"` r_base=`git merge-base "$r_me" "$r_other"`
# no merge-base? upstream did filter-branch # no merge-base? upstream did filter-branch