From 1ad3ae4c173bd0557f0d0ebdf438db0f034710e1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 5 Nov 2005 10:58:46 -0800 Subject: [PATCH] Add Meta information. Signed-off-by: Junio C Hamano --- Distrib | 26 ++++++++++++++++++++++++++ KO | 15 +++++++++++++++ Make | 16 ++++++++++++++++ PU | 22 ++++++++++++++++++++++ info/main/doit | 20 ++++++++++++++++++++ info/main/mailmap | 10 ++++++++++ info/main/remotes/ko | 7 +++++++ info/main/remotes/ko-private | 5 +++++ info/main/remotes/paulus | 2 ++ info/main/remotes/sarge | 4 ++++ info/meta/doit | 18 ++++++++++++++++++ info/meta/remotes/ko | 3 +++ 12 files changed, 148 insertions(+) create mode 100755 Distrib create mode 100755 KO create mode 100755 Make create mode 100755 PU create mode 100755 info/main/doit create mode 100644 info/main/mailmap create mode 100644 info/main/remotes/ko create mode 100644 info/main/remotes/ko-private create mode 100644 info/main/remotes/paulus create mode 100644 info/main/remotes/sarge create mode 100755 info/meta/doit create mode 100644 info/meta/remotes/ko diff --git a/Distrib b/Distrib new file mode 100755 index 0000000000..8e6afeae7a --- /dev/null +++ b/Distrib @@ -0,0 +1,26 @@ +#!/bin/sh + +# This is not for general consumption but just a simple script +# I use on my private development environment and on kernel.org +# machine to cut binary distribution material. + +V=${1?'version'} +M=master.kernel.org +case `hostname` in +siamese) + scp $0 ${M}:./Distrib + cd /chroot/sarge/build/git && + scp git-*_$V-*.deb git-core-$V.tar.gz ${M}:debian/. + exit + ;; +esac + +G=/pub/software/scm/git +D=$G/debian + +set -x + +ln $HOME/debian/git-*_$V-* $D/. +ln $HOME/debian/git-core-$V.tar.gz $G/. +ln $HOME/rpms/RPMS/i386/git-*-$V-* $G/. +ln $HOME/rpms/SRPMS/git-*-$V-* $G/. diff --git a/KO b/KO new file mode 100755 index 0000000000..f8decd210f --- /dev/null +++ b/KO @@ -0,0 +1,15 @@ +#!/bin/sh +# +# Not for general consumption; a script I used to make sure +# I do not accidentally push a rewound master to public. + +git fetch ko +mb=$(git-merge-base ko-master master) +h=$(git-rev-parse $mb ko-master | sort -u | wc -l) +if test "$h" != 1 +then + echo "OOOOOPPPPPPPPPPPPPPSSS! master is not ko-master fast forward." +fi +git show-branch ko-master master +git show-branch ko-maint maint +git show-branch ko-pu pu diff --git a/Make b/Make new file mode 100755 index 0000000000..c4f084e11c --- /dev/null +++ b/Make @@ -0,0 +1,16 @@ +#!/bin/sh + +# DDD=' -DUSE_SYMLINK_HEAD=0' + +PATH=/usr/bin:/bin +LANG=C +LC_CTYPE=C +export PATH LANG LC_CTYPE + +#make prefix=/usr/local \ +make bindir=$HOME/bin/Linux \ + PYTHON_PATH=/usr/bin/python2.4 \ + CFLAGS='-O1 -Wall -g'"$DDD" \ + WITH_SEND_EMAIL=YesPlease \ + WITH_SVNIMPORT=YesPlease \ + "$@" diff --git a/PU b/PU new file mode 100755 index 0000000000..8d3d38f3d3 --- /dev/null +++ b/PU @@ -0,0 +1,22 @@ +#!/bin/sh +# +# Rebuild "pu" from topic branches. +# + +. git-sh-setup + +git-status && exit +git-checkout pu && +git-reset --hard master && +ORIG_HEAD=`git-rev-parse ORIG_HEAD` || exit + +for H +do + (IFS=",$IFS"; git-pull -n . $H) || exit +done + +(IFS=",$IFS"; git-show-branch master pu $* $ORIG_HEAD) + + + + diff --git a/info/main/doit b/info/main/doit new file mode 100755 index 0000000000..bd61a55320 --- /dev/null +++ b/info/main/doit @@ -0,0 +1,20 @@ +#!/bin/sh + +HERE=`dirname "$0"` + +case "$1" in +compare | '') + diff -u "$HERE/mailmap" .mailmap + diff -ru "$HERE/remotes" .git/remotes + ;; +save) + cp .mailmap "$HERE/mailmap" + cp -a .git/remotes "$HERE" + ;; +restore) + cp "$HERE/mailmap" .mailmap + cp -a "$HERE/remotes" .git/. + ;; +*) + echo >&2 "usage: $0 [compare|save|restore]" +esac diff --git a/info/main/mailmap b/info/main/mailmap new file mode 100644 index 0000000000..6868aa691a --- /dev/null +++ b/info/main/mailmap @@ -0,0 +1,10 @@ +H. Peter Anvin +H. Peter Anvin +H. Peter Anvin +David_Kågedal +Daniel Barkalow +Martin Langhoff +Jon Loeliger +Jon Loeliger +Robert Fitzsimons + diff --git a/info/main/remotes/ko b/info/main/remotes/ko new file mode 100644 index 0000000000..70359f5467 --- /dev/null +++ b/info/main/remotes/ko @@ -0,0 +1,7 @@ +URL: master.kernel.org:/pub/scm/git/git.git/ +Pull: master:refs/tags/ko-master +Pull: +pu:refs/tags/ko-pu +Pull: maint:refs/tags/ko-maint +Push: master +Push: +pu +Push: maint diff --git a/info/main/remotes/ko-private b/info/main/remotes/ko-private new file mode 100644 index 0000000000..20ffc21bb0 --- /dev/null +++ b/info/main/remotes/ko-private @@ -0,0 +1,5 @@ +URL: master.kernel.org:git/.git/ +Push: master:origin +Push: maint:maint +Push: +pu:pu + diff --git a/info/main/remotes/paulus b/info/main/remotes/paulus new file mode 100644 index 0000000000..ade7b5ae89 --- /dev/null +++ b/info/main/remotes/paulus @@ -0,0 +1,2 @@ +URL: http://www.kernel.org/pub/scm/gitk/gitk.git +Pull: :refs/tags/paulus diff --git a/info/main/remotes/sarge b/info/main/remotes/sarge new file mode 100644 index 0000000000..d6f8df6927 --- /dev/null +++ b/info/main/remotes/sarge @@ -0,0 +1,4 @@ +URL: /chroot/sarge/build/git/.git +Push: master:origin +Push: +pu +Push: maint diff --git a/info/meta/doit b/info/meta/doit new file mode 100755 index 0000000000..0bc74dfc1a --- /dev/null +++ b/info/meta/doit @@ -0,0 +1,18 @@ +#!/bin/sh + +HERE=`dirname "$0"` +REPO=`expr "$HERE" : '\(.*/\)info/meta'` + +case "$1" in +compare | '') + diff -ru "$HERE/remotes" "$REPO.git/remotes" + ;; +save) + cp -a "$REPO.git/remotes" "$HERE" + ;; +restore) + cp -a "$HERE/remotes" "$REPO.git/." + ;; +*) + echo >&2 "usage: $0 [compare|save|restore]" +esac diff --git a/info/meta/remotes/ko b/info/meta/remotes/ko new file mode 100644 index 0000000000..1b8f65fc48 --- /dev/null +++ b/info/meta/remotes/ko @@ -0,0 +1,3 @@ +URL: master.kernel.org:/pub/scm/git/git.git/ +Pull: todo:ko-master +Push: master:refs/heads/todo