Index: vcpx/git.py
===================================================================
--- vcpx/git.py	(revision 1036)
+++ vcpx/git.py	(revision 1038)
@@ -246,10 +246,12 @@
         (out, _) = c.execute(stdout=PIPE, env=env, input=logmessage)
         if c.exit_status:
-            if out is None or out.readline().strip() != 'nothing to commit':
+	    failed = True
+	    if out:
+		for line in [x.strip() for x in out if x[0] != '#']:
+		    if line == 'nothing to commit':
+			failed = False
+	    if failed:
                 raise ChangesetApplicationFailure("%s returned status %d" %
                                                   (str(c), c.exit_status))
-            else:
-                # empty changeset, which git-core doesn't support
-                pass
 
     def _tag(self, tag):
Index: vcpx/repository.py
===================================================================
--- vcpx/repository.py	(revision 1037)
+++ vcpx/repository.py	(revision 1039)
@@ -208,4 +208,5 @@
                 path.insert(0, ppath)
 
+
 class CdvRepository(Repository):
     METADIR = '.cdv'
@@ -311,4 +312,5 @@
         self.custom_lua = cget(self.name, 'custom_lua')
 
+
 class SvnRepository(Repository):
     METADIR = '.svn'