From: rohit Date: Sat, 24 Mar 2018 00:42:07 +0000 (+0000) Subject: Fixed the git fetch --tags issue. X-Git-Tag: ezk-review~12 X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=f0b2e58ed305f612aa8bf7f7a19b58c4e255998b;p=wrapfs-mgmt.git Fixed the git fetch --tags issue. --- diff --git a/wrapfs-fix-branch.sh b/wrapfs-fix-branch.sh index 1a8d2ff..7dc6e3d 100755 --- a/wrapfs-fix-branch.sh +++ b/wrapfs-fix-branch.sh @@ -47,12 +47,22 @@ case "$WRAPFS_DIR" in wrapfs-2.* | wrapfs-3.* | wrapfs-4.* ) LINUX_REPO="stable/linux-stable.git" LINUX_BRANCH=$(echo $WRAPFS_DIR | sed s/wrapfs/linux/g) + + # make sure it ends with *.y.git + if [[ "$LINUX_BRANCH" != *".y" ]]; then + LINUX_BRANCH="$LINUX_BRANCH.y" + fi ;; * ) echo "Please run the script in a wrapfs git repository." exit 1 esac +# make sure it ends with *.y.git +if [[ "$WRAPFS_REPO" != *".y" ]]; then + WRAPFS_REPO=$(echo $WRAPFS_REPO | sed s/git/y.git/g) +fi + runcmd git config merge.renameLimit 999999 # check if remote already exists