# # patch "git.cc" # from [8c12529edc90ef8a404bce24e57b98e164635d7d] # to [7d8dccda87b7bf15ad601059ed389ea19aeb4dd3] # ======================================================================== --- git.cc 8c12529edc90ef8a404bce24e57b98e164635d7d +++ git.cc 7d8dccda87b7bf15ad601059ed389ea19aeb4dd3 @@ -28,11 +28,10 @@ #include #include #include +#include #ifndef WIN32 -#include - #include #include @@ -192,7 +191,7 @@ string excludestr; for (set::const_iterator i = exclude.begin(); i != exclude.end(); ++i) - excludestr += " ^" + (*i)(); + excludestr += " \"^" + (*i)() + "\""; filebuf &fb = capture_cmd_output(F("git-rev-list --topo-order %s %s") % revision % excludestr); @@ -628,7 +627,7 @@ F("path %s does not exist") % gitrepo.string()); N(fs::is_directory(gitrepo), F("path %s is not a directory") % gitrepo.string()); - setenv("GIT_DIR", gitrepo.native_directory_string().c_str(), 1); + putenv((char*)(string("GIT_DIR=")+gitrepo.native_directory_string()).c_str()); N(app.branch_name() != "", F("need base --branch argument for importing"));