--- oslo-series-final/0004-Allow-guilt-import-commit-to-run-from-a-dir-which-co.patch
+++ oslo-series-v2/v2-0004-Allow-guilt-import-commit-to-run-from-a-dir-which.patch
@@ -1,7 +1,7 @@

-From a5102becbbdb0e2b9843febf1f5defa123a61598 Mon Sep 17 00:00:00 2001
+From 069a55c02209d45c2173e6e1dc8d45eb8397cd70 Mon Sep 17 00:00:00 2001
 From: Per Cederqvist <cederp@opera.com>
-Date: Wed, 19 Mar 2014 20:24:54 +0100
-Subject: [GUILT 04/28] Allow "guilt import-commit" to run from a dir which
+Date: Tue, 13 May 2014 21:03:38 +0200
+Subject: [GUILT v2 04/29] Allow "guilt import-commit" to run from a dir which
  contains spaces.
 To: Jeff Sipek <jeffpc@josefsipek.net>
 Cc: git@vger.kernel.org
  diff --git a/guilt-import-commit b/guilt-import-commit
  index 20dcee2..9488ded 100755
  --- a/guilt-import-commit
  +++ b/guilt-import-commit
  @@ -23,7 +23,7 @@ if ! must_commit_first; then
   fi
   
   disp "About to begin conversion..." >&2
  -disp "Current head: `cat $GIT_DIR/refs/heads/\`git_branch\``" >&2
- +disp "Current head: `cat \"$GIT_DIR\"/refs/heads/\`git_branch\``" >&2
+ +disp "Current head: `git rev-parse \`git_branch\``" >&2
   
   for rev in `git rev-list $rhash`; do
   	s=`git log --pretty=oneline -1 $rev | cut -c 42-`
  @@ -68,6 +68,6 @@ for rev in `git rev-list $rhash`; do
   done
   
   disp "Done." >&2
  -disp "Current head: `cat $GIT_DIR/refs/heads/\`git_branch\``" >&2
- +disp "Current head: `cat \"$GIT_DIR\"/refs/heads/\`git_branch\``" >&2
+ +disp "Current head: `git rev-parse \`git_branch\``" >&2
   
   }
  --