Updates before OLS
Junio C Hamano committed
Jul 14, 2006 at 00:48 UTC
997283a8e87179b5b87a909686869d7843c8e19a
3 files changed
+73
Gitweb
new
+65
@@ -0,0 +1,65 @@
1
+#!/bin/sh
2
+
3
+cd gitweb &&
4
+DEST=`cd ../../index && /bin/pwd` || exit
5
+
6
+sed -e '
7
+/^our .gitbin = /s|"/usr/bin"|"/home/junio/bin/Linux"|
8
+/^our .GIT = /s|"/usr/bin/|"/home/junio/bin/Linux/|
9
+/^our .projectroot = /s|".*"|"/opt/packrat/playpen/public/in-place/git"|
10
+/^our .stylesheet = /s|".*"|"/gitweb.css"|
11
+/^our .projects_list = /s|".*"|"/opt/packrat/playpen/public/in-place/git/index/index.aux"|
12
+' gitweb.cgi >gitweb.cgi++
13
+
14
+differs=
15
+
16
+if test -f "$DEST/gitweb.cgi"
17
+then
18
+ diff -u "$DEST/gitweb.cgi" gitweb.cgi++ || differs="g$differs"
19
+else
20
+ differs="g$differs"
21
+fi
22
+
23
+if test -f "$DEST/gitweb.css"
24
+then
25
+ diff -u "$DEST/gitweb.css" gitweb.css || differs="s$differs"
26
+else
27
+ differs="s$differs"
28
+fi
29
+
30
+case "$differs" in
31
+'')
32
+ echo Up to date. ;;
33
+*)
34
+ while echo -n 'Update [y/N]? '
35
+ do
36
+ read ans
37
+ case "$ans" in
38
+ [Yy])
39
+ ans=y
40
+ break ;;
41
+ '' | [Nn])
42
+ ans=n
43
+ break ;;
44
+ esac
45
+ done
46
+ case "$ans" in
47
+ y) ;;
48
+ *) exit
49
+ esac
50
+esac
51
+
52
+case "$differs" in
53
+*g*)
54
+ rm -f "$DEST/gitweb.cgi"
55
+ cp gitweb.cgi++ "$DEST/gitweb.cgi"
56
+ chmod +x "$DEST/gitweb.cgi"
57
+ ;;
58
+esac
59
+
60
+case "$differs" in
61
+*s*)
62
+ rm -f "$DEST/gitweb.css"
63
+ cp gitweb.css "$DEST/gitweb.css"
64
+ ;;
65
+esac
Make
+4
@@ -7,6 +7,10 @@ LANG=C
7
LC_CTYPE=C
8
export PATH LANG LC_CTYPE
9
10
+# for now...
11
+GIT_SVN_NO_LIB=1
12
+export GIT_SVN_NO_LIB
13
+
14
case "`git symbolic-ref HEAD`" in
15
refs/heads/next)
16
d="bindir=$HOME/bin/Linux gitexecdir=$HOME/bin/Linux" ;;
TODO
+4
@@ -122,6 +122,10 @@ Technical (milder)
122
Technical (trivial)
123
-------------------
124
125
+* git-cherry-pick should check if the original commit message is
126
+ just a single liner, in which case it should add a LF before
127
+ appending "cherry-picked from..." message.
128
+
129
* git-clone fail .git/refs/foo (Yann Dirson <ydirson@altern.org>)
130
<20060610225040.GA7766@nowhere.earth>
131