Fixing fedpkg clog output to be git-friendly

August 26, 2011 in fedora git fedpkg patch bug

I have been doing proxy-maintainer now for a few people and I found
strange problem with fedpkg clog in relation to git
format-patch
and git am.

If you have a changelog message like this:


* Mon Feb 28 2011 Stanislav Ochotnicky - 2.1.1-1
- Update to 2.1.1
- Update patch
- Disable guice-eclipse for now

fedpkg commit -c would create git commit message like this:


commit 22b5306036b6ef1022498b63e40324370ff7159b (HEAD, f15)
Author: Stanislav Ochotnicky
AuthorDate: Fri Aug 26 11:45:54 2011 +0200

Update to 2.1.1
Update patch
Disable guice-eclipse for now

This works fine and mighty as long as you don’t try to produce patch
from this commit. Let’s see what happens with git format-patch
HEAD~1
.


$ head 0001-Update-to-2.1.1.patch f15 [22b5306]
From 22b5306036b6ef1022498b63e40324370ff7159b Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky
Date: Fri, 26 Aug 2011 11:45:54 +0200
Subject: [PATCH] Update to 2.1.1 Update patch Disable guice-eclipse for now

After adding this patch to repository using git am the line
breaks would disappear. This is because git expects empty line after
subject and description of the commit afterwards.

I decided to try and fix fedpkg clog a bit. Given the previous
changelog, now it creates git message like this:


commit 768964ce2145ef2b472fc5ef8781fb036d586b0e (HEAD, f15)
Author: Stanislav Ochotnicky
AuthorDate: Fri Aug 26 11:57:20 2011 +0200

Update to 2.1.1

- Update patch
- Disable guice-eclipse for now

This means that git format-patch can do the right thing. I
filed bug
report
for fedora-package so hopefully we can have this
fixed sometime.