Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/git-01-solaris-shell.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 920 953f78df3d88
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
920
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     1
 
--- git-1.5.4.2/git-gui/GIT-VERSION-GEN.orig	2008-02-21 15:36:15.765867000 +0800
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     2
 
+++ git-1.5.4.2/git-gui/GIT-VERSION-GEN	2008-02-21 16:05:11.234436000 +0800
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     3
 
@@ -10,10 +10,10 @@
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     4
 
 {
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     5
 
 	head=$1
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     6
 
 	tree=$2
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     7
 
-	for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null)
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     8
 
+	for p in `git rev-list --parents --max-count=1 $head 2>/dev/null`
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
     9
 
 	do
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    10
 
-		test $tree = $(git rev-parse $p^{tree} 2>/dev/null) &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    11
 
-		vn=$(git describe --abbrev=4 $p 2>/dev/null) &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    12
 
+		test $tree = `git rev-parse $p^{tree} 2>/dev/null` &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    13
 
+		vn=`git describe --abbrev=4 $p 2>/dev/null` &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    14
 
 		case "$vn" in
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    15
 
 		gitgui-[0-9]*) echo $vn; break;;
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    16
 
 		esac
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    17
 
@@ -35,32 +35,32 @@
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    18
 
 # try looking for a gitgui-* tag.
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    19
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    20
 
 if test -f version &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    21
 
-   VN=$(cat version)
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    22
 
+   VN=`cat version`
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    23
 
 then
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    24
 
 	: happy
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    25
 
-elif prefix="$(git rev-parse --show-prefix 2>/dev/null)"
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    26
 
+elif prefix="`git rev-parse --show-prefix 2>/dev/null`"
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    27
 
    test -n "$prefix" &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    28
 
-   head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    29
 
-   tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    30
 
-   VN=$(tree_search $head $tree)
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    31
 
+   head=`git rev-list --max-count=1 HEAD -- . 2>/dev/null` &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    32
 
+   tree=`git rev-parse --verify "HEAD:$prefix" 2>/dev/null` &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    33
 
+   VN=`tree_search $head $tree`
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    34
 
    case "$VN" in
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    35
 
    gitgui-[0-9]*) : happy ;;
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    36
 
    *) (exit 1) ;;
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    37
 
    esac
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    38
 
 then
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    39
 
-	VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    40
 
-elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    41
 
+	VN=`echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'`;
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    42
 
+elif VN=`git describe --abbrev=4 HEAD 2>/dev/null` &&
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    43
 
    case "$VN" in
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    44
 
    gitgui-[0-9]*) : happy ;;
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    45
 
    *) (exit 1) ;;
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    46
 
    esac
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    47
 
 then
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    48
 
-	VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    49
 
+	VN=`echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'`;
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    50
 
 else
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    51
 
 	VN="$DEF_VER"
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    52
 
 fi
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    53
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    54
 
-dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    55
 
+dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    56
 
 case "$dirty" in
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    57
 
 '')
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    58
 
 	;;
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    59
 
@@ -70,7 +70,7 @@
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    60
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    61
 
 if test -r $GVF
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    62
 
 then
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    63
 
-	VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF)
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    64
 
+	VC=`sed -e 's/^GITGUI_VERSION = //' <$GVF`
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    65
 
 else
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    66
 
 	VC=unset
953f78df3d88 2008-02-21 Halton Huo <[email protected]>
nonsea
parents:
diff changeset 
    67
 
 fi
upstream/spec-files-extra