summaryrefslogtreecommitdiff
path: root/merge-proto
blob: 6779e8ff2f90653fb6ef72a36d0448bf14737aa6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
#!/bin/sh

mkdir proto && (cd proto && git init) || exit 1
mkdir oldproto || exit 1

for i in "$@"; do
    (cd oldproto &&
    git clone git://anongit.freedesktop.org/git/xorg/proto/$i
    (cd $i &&
    mkdir $i &&
    for j in `git ls-files | sed 's;/.*;;' | sort -u`; do
    	git mv $j $i/$j
    done &&
    git commit -s -m"Move $i files to their sub-directory")) &&
    (cd proto &&
    git remote add $i ../oldproto/$i &&
    git fetch $i &&
    git merge $i/master) || exit 1
done