# 
# patch "git_export.cc"
#  from [50da7e2572a5cbcf613dd82c96a65f2f083fe6f9]
#    to [4627ca2e1db0d7bc3df46bd050d51dcf48d4a007]
# 
========================================================================
--- git_export.cc	50da7e2572a5cbcf613dd82c96a65f2f083fe6f9
+++ git_export.cc	4627ca2e1db0d7bc3df46bd050d51dcf48d4a007
@@ -155,7 +155,7 @@
   close(fd);
   delete_file(system_path(tmpfile));
 
-  N(mkdir(tmpfile.c_str(), 0700) == 0, F("mkdir(%s) failed") % tmpfile);
+  E(mkdir(tmpfile.c_str(), 0700) == 0, F("mkdir(%s) failed") % tmpfile);
 
 
   path = system_path(tmpfile);
@@ -176,7 +176,7 @@
   string blobpath = (path / "blob").as_external();
   {
     ofstream file(blobpath.c_str(), ios_base::out | ios_base::trunc | ios_base::binary);
-    N(file, F("cannot open file %s for writing") % blobpath);
+    E(file, F("cannot open file %s for writing") % blobpath);
     Botan::Pipe pipe(new Botan::DataSink_Stream(file));
     pipe.process_msg(blob());
   }
@@ -185,14 +185,14 @@
 
   string cmdline("cd '" + strpath + "' && git-update-cache --add blob");
   L(F("Invoking: %s") % cmdline);
-  N(system(cmdline.c_str()) == 0, F("Adding '%s' failed") % blobpath);
+  E(system(cmdline.c_str()) == 0, F("Adding '%s' failed") % blobpath);
 
   filebuf fb;
   capture_git_cmd_output(F("cd '%s' && git-ls-files --stage") % strpath, fb);
   istream stream(&fb);
   string line;
   stream_grabline(stream, line);
-  N(line.length() >= 40, F("Invalid generated index, containing: '%s'") % line);
+  E(line.length() >= 40, F("Invalid generated index, containing: '%s'") % line);
   git_object_id gitoid(line.substr(line.find(" ") + 1, 40));
 
   delete_file(index_file);
@@ -219,14 +219,14 @@
       cmdline += " '" + (*i)->path.as_external() + "' ";
     }
   L(F("Invoking: %s") % cmdline);
-  N(system(cmdline.c_str()) == 0, F("Writing tree index failed"));
+  E(system(cmdline.c_str()) == 0, F("Writing tree index failed"));
 
   filebuf fb;
   capture_git_cmd_output(F("git-write-tree"), fb);
   istream stream(&fb);
   string line;
   stream_grabline(stream, line);
-  N(line.length() == 40, F("Invalid git-write-tree output: %s") % line);
+  E(line.length() == 40, F("Invalid git-write-tree output: %s") % line);
   git_object_id gittid(line);
 
   delete_file(index_file);
@@ -267,7 +267,7 @@
   istream stream(&fb);
   string line;
   stream_grabline(stream, line);
-  N(line.length() == 40, F("Invalid git-commit-tree output: %s") % line);
+  E(line.length() == 40, F("Invalid git-commit-tree output: %s") % line);
   git_object_id gitcid(line);
   return gitcid;
 }
@@ -375,7 +375,7 @@
   cert_name commitid_name(gitcommit_id_cert_name);
   string commitid;
   load_cert(app, rid, commitid_name, commitid);
-  N(!commitid.empty(), F("Current commit's parent %s was not imported yet?!") % rid.inner());
+  E(!commitid.empty(), F("Current commit's parent %s was not imported yet?!") % rid.inner());
   gitrid = git_object_id(commitid);
 }