projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Possible cleanups for local-pull.c
[git.git]
/
git-checkout-script
diff --git
a/git-checkout-script
b/git-checkout-script
index
a377407
..
b31ded7
100755
(executable)
--- a/
git-checkout-script
+++ b/
git-checkout-script
@@
-37,7
+37,6
@@
while [ "$#" != "0" ]; do
fi
;;
esac
fi
;;
esac
- i=$(($i+1))
done
[ -z "$new" ] && new=$old
done
[ -z "$new" ] && new=$old
@@
-72,4
+71,6
@@
if [ "$?" -eq 0 ]; then
fi
[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
rm -f "$GIT_DIR/MERGE_HEAD"
fi
[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
rm -f "$GIT_DIR/MERGE_HEAD"
+else
+ exit 1
fi
fi