Juni 2010 - Grml-devel - lists.mur.at

Working with git and sending in patches
by Tong Sun 29 Jul '10

29 Jul '10

Hi, Just trying to put all jigsaw puzzle together here. Please correct me if I'm wrong. First of all, philosophy for version control with git: . While developing, small/independent commits are good thing, so that it's easy to decouple different changes. . But when integrating something in a main branch, commits should contain all logical/related changes. Steps (using grml-debootstrap as an example): - do initial git pull into grml-debootstrap git pull git://git.grml.org/grml-debootstrap master - Go into grml-debootstrap and start a new branch git checkout -b t/my-working-branch - work on the code, commit, hack, commit, hack, commit -- commit often & commit small - when AOK and need to integrate patches into main branch, squash all patches into one git rebase -i origin/master - send in patches via email (to grml-devel(a)ml.grml.org) git format-patch origin git send-email --to grml-devel(a)ml.grml.org ... Please correct me if anything above is wrong. Now, question, having following the above, I am having problem pulling in the latest master from head: $ git pull [ . . . ] You asked me to pull without telling me which branch you want to merge with, and 'branch.t/apt_cache.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull <repository> <refspec>'). See git-pull(1) for details. $ git pull git://git.grml.org/grml-debootstrap master >From git://git.grml.org/grml-debootstrap * branch master -> FETCH_HEAD Auto-merging chroot-script CONFLICT (content): Merge conflict in chroot-script Auto-merging cmdlineopts.clp CONFLICT (content): Merge conflict in cmdlineopts.clp Auto-merging config Auto-merging grml-debootstrap CONFLICT (content): Merge conflict in grml-debootstrap Auto-merging grml-debootstrap.8.txt Automatic merge failed; fix conflicts and then commit the result. So, - what's the normal steps here to pulling in the latest master from head? - how to solve the above specific problem? I'm thinking just to abandon this directory and pull from git from scratch again. Thanks

2 3

2 changes to grml-crypt
by Thomas Koehler 25 Jun '10

25 Jun '10

Sorry for the mistake I made in my previous patch for grml-crypt. Using DM_NAME_ (fsck grml-crypt_sda1) won't work of course, I had to change it to DM_PATH_ (fsck /dev/mapper/grml-crypt_sda1). While fixing that, I introduced another addition to the -F option: If given twice, it will add "-f" to fsck's options, forcing a full fsck. So I'm sending two small patches :)

2 3

Re: [Grml-devel] [Grml] bug report from grml-medium
by Michael Prokop 09 Jun '10

09 Jun '10

* T o n g <mlist4suntong(a)yahoo.com> [Thu Jun 03, 2010 at 04:54:18PM +0000]: > On Tue, 01 Jun 2010 16:45:08 +1000, Jason White wrote: > >> Does anyone know some small-footprint browser that can let me paste > >> into web forms? > > lynx > Thanks Jason. > @mika, lynx is a tool that I miss in grml-medium for other reasons as > well. Can we have it in future releases? Adding lynx would consume 5,288kB additional disk space. So from my POV it's not really worth adding. What do other users/devs say? regards, -mika-

3 3

[PATCH] [issue806] final fix
by Tong Sun 09 Jun '10

09 Jun '10

remove 'umount -a',see http://bts.grml.org/grml/issue806 --- grml-debootstrap | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/grml-debootstrap b/grml-debootstrap index dc4006d..f9b5ebb 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -644,7 +644,7 @@ bailout(){ [ -x "$MNTPOINT"/etc/init.d/ssh ] && "$MNTPOINT"/etc/init.d/ssh stop [ -x "$MNTPOINT"/etc/init.d/mdadm ] && "$MNTPOINT"/etc/init.d/mdadm stop # ugly, but make sure we really don't leave anything (/proc /proc is intended) - for ARG in /sys -a /proc /proc ; do + for ARG in /sys /proc /proc ; do [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1 || true done umount "$MNTPOINT"/dev >/dev/null 2>&1 || true -- 1.7.1

2 1

grml-debootstrap git tree is dirty?
by Tong Sun 07 Jun '10

07 Jun '10

Hi, Does the following mean that grml-debootstrap git tree is dirty, or I'm doing something wrong? $ rm -rf grml-debootstrap $ git clone git://git.grml.org/grml-debootstrap.git Initialized empty Git repository in /lfs/cache11/my-caches/repositories/gitwork/grml/grml-debootstrap/.git/ remote: Counting objects: 1659, done. remote: Compressing objects: 100% (1017/1017), done. remote: Total 1659 (delta 1080), reused 975 (delta 638)iB/s Receiving objects: 100% (1659/1659), 413.68 KiB | 367 KiB/s, done. Resolving deltas: 100% (1080/1080), done. $ cd grml-debootstrap $ git checkout -b t/unmount Switched to a new branch 't/unmount' # hack grml-debootstrap $ git rebase -i origin/master grml-debootstrap: needs update Working tree is dirty $ git describe --dirty --long v0.38-0-gc62dadf-dirty Please help. Thanks

2 1

How to "move" files
by Tong Sun 07 Jun '10

07 Jun '10

Hi, Files in the git repo are flat in a single directory. e.g., http://git.grml.org/?p=grml-debootstrap.git;a=tree - How they are arranged into different places when packed into the .deb? - I want to move /etc/debootstrap/config to /usr/share/grml-debootstrap/functions/config, what other steps should I take, apart from altering the source code? Thanks

2 1