So from what it sounded like in the IRC, the attachments got stripped off somehow o_O' Thorsten, I remember you experimented with rejecting multipart mails, maybe that's why it got stripped off? Or sourceforge has an option for stripping HTML which is badly implemented? This is the structure of the mails I sent: 1 <no description> [multipa/mixed, 7bit, 1.9K] 2 ├─><no description> [text/plain, quoted, us-ascii, 0.7K] 3 └─>0001-Add-git-version-info- [text/x-diff, quoted, us-ascii, 0.9K] 4 <no description> [applica/pgp-signat, 7bit, 0.8K] Anyways, here are the patches again inline, because git am can probably handle such stuff just fine anyways. Also, try git am --scissors :) ----------------------------- 8< -------------------------------------- From 383e9d9f9559eb3642e1eedfbfa5a1a0937992bb Mon Sep 17 00:00:00 2001 From: Florian Bruhin <git _at_ the _minus_ compiler _dot_ org> Date: Mon, 17 Jun 2013 23:24:27 +0200 Subject: [PATCH] Add git version info to version.mk and "hc version" --- version.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/version.mk b/version.mk index 5ebd85e..ede426f 100644 --- a/version.mk +++ b/version.mk @@ -4,5 +4,11 @@ VERSION_MAJOR = 0 VERSION_MINOR = 5 # patch level VERSION_PATCH = 1 +# git version +ifneq (,$(wildcard .git)) +ifneq (,$(shell which git 2>/dev/null)) +VERSION_GIT = \ \($(shell git rev-parse --short HEAD)\) +endif +endif VERSION_SUFFIX = "" -VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)$(VERSION_SUFFIX) +VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)$(VERSION_SUFFIX)$(VERSION_GIT) -- 1.8.3.1 From 518e1d437e323a40b05d21250dcf9d9f136a84e6 Mon Sep 17 00:00:00 2001 From: Florian Bruhin <git _at_ the _minus_ compiler _dot_ org> Date: Mon, 17 Jun 2013 22:04:49 +0200 Subject: [PATCH] Fix dzen2 SVN checking in panel.sh --- share/panel.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/panel.sh b/share/panel.sh index f9cc0d4..6bb01b1 100755 --- a/share/panel.sh +++ b/share/panel.sh @@ -33,8 +33,9 @@ else fi #### # true if we are using the svn version of dzen2 -dzen2_version=$(dzen2 -v 2>&1 | head -n 1 | cut -d , -f 1|cut -d - -f 2) -if [ -z "$dzen2_version" ] ; then +# depending on version/distribution, this seems to have version strings like +# "dzen-" or "dzen-x.x.x-svn" +if dzen2 -v 2>&1 | head -n 1 | grep -q '^dzen-\([^,]*-svn\|\),'; then dzen2_svn="true" else dzen2_svn="" -- 1.8.3
Attachment:
pgpvzlFXYaazZ.pgp
Description: PGP signature
Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev