- out=$( (
- if [ -n "$repodir" ]; then
- cd "$repodir"
- fi
- git reset --hard >/dev/null 2>&1
- if out=`git merge --no-commit -- "$REFNAME" 2>&1`; then
- good=true
- else
- good=false
- echo "$out"
- fi
- git reset --hard >/dev/null 2>&1
- ) )
+ out=$(
+ (
+ if [ -n "$repodir" ]; then
+ cd "$repodir"
+ fi
+ git reset --hard "$masterhash" >/dev/null 2>&1
+ if out=`git merge --no-commit -- "$REFNAME" 2>&1`; then
+ good=true
+ else
+ good=false
+ echo "$out"
+ fi
+ git reset --hard "$masterhash" >/dev/null 2>&1
+ )
+ )