The scripts that attempt to make a commit on top of the current
HEAD need to use the same logic in check_base() to make sure the
current index is based on the HEAD commit we are going to build
on top of. Move this function from git-commit to git-sh-setup,
so that it is available to everybody else.
Signed-off-by: Junio C Hamano <junkio@xxxxxxx>
---
git-commit.sh | 16 ----------------
git-sh-setup.sh | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/git-commit.sh b/git-commit.sh
index 42f1c93..6b4c784 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -25,22 +25,6 @@ refuse_partial () {
exit 1
}
-check_base () {
- quiet="$1"
- if HEAD=`git rev-parse --verify HEAD 2>/dev/null` &&
- BASE=`git update-index --get-base` &&
- test -n "$BASE" &&
- test "$BASE" != "$HEAD"
- then
- test -z "$quiet" || exit 1
- ours=`git show -s --pretty=oneline --abbrev-commit $BASE`
- theirs=`git show -s --pretty=oneline --abbrev-commit $HEAD`
- echo >&2 "* The index is based on '$ours', however, the HEAD"
- echo >&2 " points at different commit '$theirs'"
- exit 1
- fi
-}
-
THIS_INDEX="$GIT_DIR/index"
NEXT_INDEX="$GIT_DIR/next-index$$"
rm -f "$NEXT_INDEX"
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index f24c7f2..0797acd 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -28,6 +28,22 @@ set_reflog_action() {
fi
}
+check_base () {
+ quiet="$1"
+ if HEAD=`git rev-parse --verify HEAD 2>/dev/null` &&
+ BASE=`git update-index --get-base` &&
+ test -n "$BASE" &&
+ test "$BASE" != "$HEAD"
+ then
+ test -z "$quiet" || exit 1
+ ours=`git show -s --pretty=oneline --abbrev-commit $BASE`
+ theirs=`git show -s --pretty=oneline --abbrev-commit $HEAD`
+ echo >&2 "* The index is based on '$ours', however, the HEAD"
+ echo >&2 " points at different commit '$theirs'"
+ exit 1
+ fi
+}
+
is_bare_repository () {
git-config --bool --get core.bare ||
case "$GIT_DIR" in
--
1.5.1.730.g0d43be
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html