madduck's droppings

personally

reportbug
mdadm
$ git-svn clone --stdlayout --no-metadata \
    svn+ssh://svn.debian.org/svn/pkg-mdadm/mdadm mdadm

--stdlayout
-T trunk -t tags -b branches
git-branch -r
git-svn
--no-metadata
mdadm
mdadm
SVN
git branch -r | sed -rne 's, *tags/([^@]+)$,\1,p' | while read tag; do
  echo "git tag debian/$tag tags/${tag}^; git branch -r -d tags/$tag"
done

git branch -r | while read tag; do
  echo "git branch -r -d $tag"
done

--no-metadata
git-svn
.git/
$ git config --remove-section svn-remote.svn
$ rm -r .git/svn

2.5.6-9
etch
SVN
$ git tag -d debian/2.5.6-10            # never existed
$ git tag -f debian/2.5.6-8 2.5.6-8~2   # mistagged
$ git checkout -b maint/etch 2.5.6-8    # this is when we diverged
$ git apply < /tmp/mdadm-2.5.6-8..2.5.6-9.diff
$ git add debian/po/gl.po debian/po/pt.po debian/changelog
$ git commit -s
$ git tag debian/2.5.6-9

SVN
--amend
$ git checkout master
$ git rm OBSOLETE debian/OBSOLETE
$ git commit --amend

./debian/
upstream
pkg-mdadm
$ git remote add upstream-repo git://git.debian.org/git/pkg-mdadm/mdadm
$ git config remote.upstream-repo.fetch \
    +refs/heads/upstream:refs/remotes/upstream-repo/upstream
$ git fetch upstream-repo
$ git checkout -b upstream upstream-repo/master

2.6.2
2.6.2-1
2.6.2
2.6.2-1
$ git checkout -b tmp/join debian/2.6.2-1
$ git merge mdadm-2.6.2

$ git rebase tmp/join master
$ git branch -d tmp/join

SVN
master
2.6.2-2
$ git tag debian/2.6.2-2

$ git tag -s git-birth

dpatch
dpatch
master
$ git checkout -b deb/conffile-location
$ debian/patches/01-mdadm.conf-location.dpatch -apply
$ git rm debian/patches/01-mdadm.conf-location.dpatch
$ git commit -s
$ git commit -s $(git ls-files --others --modified)

dpatch
git-rm
git-commit
dpatch
git-commit
dpatch
git-ls-files
deb/conffile-location
master
$ git cherry-pick deb/conffile-location^

master
./debian/
build
deb/conffile-location
master
dpatch
master
master
deb/docs
dpatches
dpatch
99-*-FIX.dpatch
master branch
dpatch
99-monitor-6+10-FIX.dpatch
66f8bbb
-x
$ git cherry-pick -x 66f8bbb
$ git rm debian/patches/99-monitor-6+10-FIX.dpatch
$ git commit -s -m"remove dpatch obsoleted by $(git rev-parse --short HEAD)"

dpatch
dpatch
build
build
upstream
upstream
2.6.3
2.6.4
23dc1ae
HEAD
4450e59
$ git fetch upstream-repo
$ git checkout upstream
$ git merge upstream-repo
$ git tag mdadm-2.6.3+200709292116+4450e59 4450e59

$ git checkout master
$ git merge --no-commit mdadm-2.6.3+200709292116+4450e59
$ dch -v mdadm-2.6.3+200709292116+4450e59-1
$ git add debian/changelog
$ git commit -s

poor-mans-gitbuild
master
deb/*
build
dpatch
upstream
dpatch
$DEITY
#git/freenode
#vcs-pkg/irc.oftc.net
mdadm
mdadm
collab-maint
2.6.3+200709292116+4450e59-3
-2
-3
$ ssh alioth
$ cd /git/collab-maint
$ ./setup-repository pkg-mdadm mdadm Debian packaging
$ exit
$ apt-get source --download-only mdadm
$ mkdir mdadm && cd mdadm
$ git init
$ git remote add origin ssh://git.debian.org/git/collab-maint/pkg-mdadm
$ git config branch.master.merge refs/heads/master

git-pull
git-push
git.debian.org
$ git remote add upstream-repo git://git.debian.org/git/pkg-mdadm/mdadm

upstream
pkg-mdadm
-t
git-remote
$ git config remote.upstream-repo.fetch \
    +refs/heads/upstream:refs/remotes/upstream-repo/upstream

HEAD
$ git fetch upstream-repo
warning: no common commits
[…]
  # in the real world, we'd be branching off upstream-repo/master
$ git checkout -b upstream upstream-repo/upstream
warning: You appear to be on a branch yet to be born.
warning: Forcing checkout of upstream-repo/upstream.
Branch upstream set up to track remote branch
  refs/remotes/upstream-repo/upstream.
$ git branch
* upstream
$ ls | wc -l
77

diff.gz
2.6.3+200709292116+4450e59
4450e59
git.debian.org
pkg-mdadm
$ #git tag -s mdadm-2.6.3+200709292116+4450e59 4450e59
$ git checkout -b master mdadm-2.6.3+200709292116+4450e59
$ zcat ../mdadm_2.6.3+200709292116+4450e59-2.diff.gz | git apply

git-status
diff.gz
debian
diff.gz
master
debian/changelog
debian/control
debian/rules
upstream-patches
deb/conffile-location
/etc/mdadm/mdadm.conf
/etc/mdadm.conf
deb/
deb/initramfs
initramfs
deb/docs
dpatch
master
deb/initramfs
mdadm
initramfs
git-checkout
./debian/
git-status
$ git checkout -b upstream-patches mdadm-2.6.3+200709292116+4450e59
M Makefile
M ReadMe.c
M mdadm.8
M mdadm.conf.5
M mdassemble.8
M super1.c
$ git add super1.c     #444682
$ git commit -s

  # i now branch off master, but that's the same as 4450e59 actually
  # i just do it so i can make this point…
$ git checkout -b deb/conffile-location master
$ git add Makefile ReadMe.c mdadm.8 mdadm.conf.5 mdassemble.8
$ git commit -s

$ git checkout -b deb/initramfs master
$ git add debian/initramfs/*
$ git commit -s

$ git checkout -b deb/docs master
$ git add RAID5_versus_RAID10.txt md.txt rootraiddoc.97.html
$ git commit -s

  # and finally, the ./debian/ directory:
$ git checkout master
$ chmod +x debian/rules
$ git add debian
$ git commit -s

$ git branch
  deb/conffile-location
  deb/docs
* master
  upstream
  upstream-patches

git.debian.org
origin
git-push --all
upstream
--tags
--all
git
push refs/heads/* refs/tags/*
$ git push --all
$ git push --tags

upstream
master
debian/changelog
upstream
git-tag $branch/$tagname $branch
$ git checkout -b build mdadm-2.6.3+200709292116+4450e59

poor-mans-gitbuild
upstream
#!/bin/sh
set -eu
git checkout master
debver=$(dpkg-parsechangelog | sed -ne 's,Version: ,,p')
git checkout build
git merge ${1:-upstream}
git merge upstream-patches
git merge master
for b in $(git for-each-ref --format='%(refname)' refs/heads/deb/*); do
  git merge -- $b
done
git tag -s debian/$debver
debuild -i.git
git checkout master

-i.git
debuild
.git
diff.gz
$ git tag -d debian/$debver
$ git checkout build
$ git reset --hard upstream
$ git checkout master
$ editor debian/rules    # or whatever
$ git add debian/rules
$ git commit -s

$ poor-mans-gitbuild

gitk --all
git.debian.org
--all
--tags
$ git push origin build tag debian/2.6.3+200709292116+4450e59-3

$ git checkout upstream-patches
$ git-apply < patch-from-lunar.diff   #444682 again
$ git commit --author 'Jérémy Bobbio <lunar@debian.org>' -s

  # this should also be automated, see below
$ git checkout master
$ dch -i
$ dpkg-parsechangelog | sed -ne 's,Version: ,,p'
2.6.3+200709292116+4450e59-3
$ git commit -s debian/changelog

$ poor-mans-gitbuild

$ git push
$ git push origin tag debian/2.6.3+200709292116+4450e59-3

git-push
git-push
build
mdadm
poor-mans-gitbuild
$ git checkout -b tmp/start-arrays-rework master

initramfs
$ git merge master deb/initramfs
$ editor debian/mdadm-raid                     # …
$ git commit -s debian/mdadm-raid
$ editor debian/initramfs/script.local-top     # …
$ git commit -s debian/initramfs/script.local-top
[many hours of iteration pass…]

[… until you are done]
$ git checkout -b tmp/start-arrays-rework-init master
  # for each commit $c in tmp/start-arrays-rework
  # applicable to the master branch:
$ git cherry-pick $c
$ git checkout -b tmp/start-arrays-rework-initramfs deb/initramfs
  # for each commit $c in tmp/start-arrays-rework
  # applicable to the deb/initramfs branch:
$ git cherry-pick $c

$ git cherry-pick --no-commit <commit7>
$ git cherry-pick --no-commit <commit4>
$ git cherry-pick --no-commit <commit5>
$ git commit -s

- - - O             >> merge T >>     - - - = - - OT
       ` - - T      >>  into O >>

$ git checkout deb/initramfs
$ git merge tmp/start-arrays-rework-initramfs
$ git checkout master
$ git merge tmp/start-arrays-rework-init

mdadm
$ git format-patch -s -M origin/master

origin/master
--compose
$ git send-email --compose --to your@email.address <file1> <file2> <…>

upstream-patches
upstream
$ git checkout -b tmp/cool-feature upstream
[…]

mdadm-2.6.4
$ git fetch upstream-repo
$ git checkout upstream
$ git merge upstream-repo/master

git-pull
tmp/cool-feature
upstream
upstream
$ git checkout tmp/cool-feature
$ git rebase upstream

git-pull
gitk
tmp/*
git.debian.org
patches
upstream-patches
upstream
build
poor-mans-gitbuild
md.txt
deb/docs
$ git checkout deb/docs
$ git rm md.txt
$ git commit -s

Makefile
upstream
deb/conffile-location
$ git checkout deb/conffile-location
$ git merge upstream
CONFLICT!
$ git-mergetool
$ git commit -s

$ git checkout master
$ dch -i
$ dpkg-parsechangelog | sed -ne 's,Version: ,,p'
2.6.3+200709292116+4450e59-3
# git commit -s debian/changelog

$ poor-mans-gitbuild

# git push
$ git push origin tag debian/2.6.3+200709292116+4450e59-3

upstream-patches
2.6.4
upstream-patches
mdadm
2.7.6-1
$ git checkout -b maint/lenny debian/2.7.6-1

mdadm
2.7.6
mdadm
2.7.8
deadbeef
c0ffee
maint/lenny
$ git checkout upstream
$ git pull
$ git checkout maint/lenny
$ git cherry-pick deadbeef
$ git cherry-pick c0ffee

git-mergetool
$ dch -i
$ dpkg-parsechangelog | sed -ne 's,Version: ,,p'
2.7.6-1lenny1
$ git commit -s debian/changelog

$ poor-mans-gitbuild

$ git push origin maint/lenny
$ git push origin tag debian/2.7.6-1lenny1

debian/changelog
build
+ pending patch
#git/freenode
#vcs-pkg/irc.oftc.net
git tag -s -m'preparing release of upstream 1.2.3' upstream/1.2.3
git archive --prefix=foo-1.2.3/ upstream/1.2.3 | gzip -9 \
  > ../foo_1.2.3.orig.tar.gz

debian/1.2.3-1
mdadm_2.6.3+200709292116+4450e59.orig.tar.gz
mdadm-2.6.3.tar.gz
mdadm-2.6.3.tar.gz
../mdadm_2.6.3.orig.tar.gz
2.6.3-1
orig
diff.gz
2.6.3-2
git-archive
tar
diff.gz
orig
orig
mdadm
git
fedora-devel
CVS
Git
$ ldapsearch -xLLLH ldap://db.debian.org -b ou=users,dc=debian,dc=org \
  gidNumber=800 keyFingerPrint \
  | sed -rne ':s;/^dn:/bl;n;bs;:l;n;/^keyFingerPrint:/{p;bs}' \
  | wc -l
1049

$ ldapsearch -xLLLH ldap://db.debian.org -b ou=users,dc=debian,dc=org \
  gidNumber=800 keyFingerPrint \
  | sed -rne ':s;/^dn:/bl;n;bs;
              :l;n;/^keyFingerPrint:/{s,keyFingerPrint: ,,p;bs}' \
  | sort -u > ldapfprs

$ rsync -az --progress \
  keyring.debian.org::keyrings/keyrings/debian-keyring.gpg \
  ./debian-keyring.gpg

$ gpg --homedir . --no-default-keyring --keyring debian-keyring.gpg \
  --no-options --always-trust --no-permission-warning \
  --no-auto-check-trustdb --armor --rfc1991 --fingerprint \
  --fast-list-mode --fixed-list-mode --with-colons --list-keys \
  | sed -rne 's,^fpr:::::::::([[:xdigit:]]+):,\1,p' \
  | sort -u > gpgfprs

$ rsync -az --progress \
  keyring.debian.org::keyrings/keyrings/debian-keyring.pgp \
  ./debian-keyring.pgp

$ gpg --homedir . --no-default-keyring --keyring debian-keyring.pgp \
  --no-options --always-trust --no-permission-warning \
  --no-auto-check-trustdb --armor --rfc1991 --fingerprint \
  --fast-list-mode --fixed-list-mode --list-keys \
  | sed -rne 's,^[[:space:]]+Key fingerprint = ,,;T;s,[[:space:]]+,,gp' \
  | sort -u > pgpfprs

$ sort ldapfprs pgpfprs gpgfprs | uniq -c \
  | egrep -c '^[[:space:]]+2[[:space:]]'
1048

--fixed-list-mode
while read i; do
  grep "^${i}$" pgpfprs gpgfprs || echo $i >&2
done < ldapfprs >/dev/null

9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5
$ gpg --list-keys 9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5
pub   4096R/AB2A91F5 2004-08-20
uid                  James Troup <james@nocrew.org>

--fast-list-mode
/etc/network/interfaces
/etc
X
ssh
X
i855
root
root
X

madduck's droppings

bugscripts and rng

Rewarding geek^W survey participants

Converting a package to Git

Importing the package into Git

Cleaning up the SVN references

Setting things straight

Making ends meet

Turning `dpatch` files into feature branches

… and then Git let me down

The end

Not so chatty

Packaging with Git

Introduction

Setting up the infrastructure

Importing the Debian package

The idea of feature branches

Setting up feature branches

Building the package (theory)

Building the package (practise)

Uploading a new Debian version

Hacking on the software

… when a new upstream version comes around

Creating and using a maintenance branch

Future directions

Wrapping up

Pristine tarballs and VCS

Counting developers

Netconf status update

Happy Birthday, Debian

DebConf7

Keysigning in Edinburgh

60 efficient minutes of Intel

Starting netconf development