mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
fb7dfaa710
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (MingW32) iQCVAwUAUbzwiGB90JXwhOSJAQKxtAP/TYTpKWzKiDwzu/2P6ecIWcS/4vaKlj1M WSyvp4t4stTXhRXntId7psQO7nYTb+Pb3VlY+WPr9J3xL39IjU2qHLsrQJEqtsWI FcE7SNxB0BvNreAqkdYNaKqSfGqQJPdV8K5WKaySZMpMkq/ZOT7WiOQq6wynDLuR sDopx39hLDI= =Az9M -----END PGP SIGNATURE----- Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui git-gui 0.18.0 * tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui: git-gui 0.18 git-gui: avoid an error message when removing the last remote git-gui: fix file name handling with non-empty prefix git-gui: bring wish process to front on Mac git-gui: change dialog button positions for Windows to suit platform. git-gui: allow "\ No newline at end of file" for linewise staging git-gui: fix the mergetool launcher for the Beyond Compare tool. Makefile: replace "echo 1>..." with "echo >..." French translation: copy -> copie. git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
80 lines
1.8 KiB
Bash
Executable file
80 lines
1.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
GVF=GIT-VERSION-FILE
|
|
DEF_VER=0.18.GITGUI
|
|
|
|
LF='
|
|
'
|
|
|
|
tree_search ()
|
|
{
|
|
head=$1
|
|
tree=$2
|
|
for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null)
|
|
do
|
|
test $tree = $(git rev-parse $p^{tree} 2>/dev/null) &&
|
|
vn=$(git describe --abbrev=4 $p 2>/dev/null) &&
|
|
case "$vn" in
|
|
gitgui-[0-9]*) echo $vn; break;;
|
|
esac
|
|
done
|
|
}
|
|
|
|
# Always use the tarball version file if found, just
|
|
# in case we are somehow contained in a larger git
|
|
# repository that doesn't actually track our state.
|
|
# (At least one package manager is doing this.)
|
|
#
|
|
# We may be a subproject, so try looking for the merge
|
|
# commit that supplied this directory content if we are
|
|
# not at the toplevel. We probably will always be the
|
|
# second parent in the commit, but we shouldn't rely on
|
|
# that fact.
|
|
#
|
|
# If we are at the toplevel or the merge assumption fails
|
|
# try looking for a gitgui-* tag.
|
|
|
|
if test -f version &&
|
|
VN=$(cat version)
|
|
then
|
|
: happy
|
|
elif prefix="$(git rev-parse --show-prefix 2>/dev/null)"
|
|
test -n "$prefix" &&
|
|
head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
|
|
tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) &&
|
|
VN=$(tree_search $head $tree)
|
|
case "$VN" in
|
|
gitgui-[0-9]*) : happy ;;
|
|
*) (exit 1) ;;
|
|
esac
|
|
then
|
|
VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
|
|
elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
|
|
case "$VN" in
|
|
gitgui-[0-9]*) : happy ;;
|
|
*) (exit 1) ;;
|
|
esac
|
|
then
|
|
VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
|
|
else
|
|
VN="$DEF_VER"
|
|
fi
|
|
|
|
dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
|
|
case "$dirty" in
|
|
'')
|
|
;;
|
|
*)
|
|
VN="$VN-dirty" ;;
|
|
esac
|
|
|
|
if test -r $GVF
|
|
then
|
|
VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF)
|
|
else
|
|
VC=unset
|
|
fi
|
|
test "$VN" = "$VC" || {
|
|
echo >&2 "GITGUI_VERSION = $VN"
|
|
echo "GITGUI_VERSION = $VN" >$GVF
|
|
}
|