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

fix another bug in the script ;)

Browse Source
This commit is contained in:
Rudolf Polzer 2010-11-23 10:24:23 +01:00
parent bdc9d82566
commit 30ec2898f5
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
all
View File

@ -275,6 +275,7 @@ fix_upstream_rebase()
r_r=${r_r#refs/heads/}
r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
r_bra=${r_bra#refs/heads/}
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