From: Jeff Sipek Date: Tue, 13 May 2014 21:06:44 GMT Subject: Re: [GUILT v2 04/29] Allow "guilt import-commit" to run from a dir which contains spaces. Message-ID: <20140513210644.GD4791@meili.valhalla.31bits.net> In-Reply-To: <1400013065-27919-5-git-send-email-cederp@opera.com> Signed-off-by: Josef 'Jeff' Sipek On Tue, May 13, 2014 at 10:30:40PM +0200, Per Cederqvist wrote: > Signed-off-by: Per Cederqvist > --- > guilt-import-commit | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/guilt-import-commit b/guilt-import-commit > index 20dcee2..f14647c 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: `git rev-parse \`git_branch\``" >&2 > > for rev in `git rev-list $rhash`; do > s=`git log --pretty=oneline -1 $rev | cut -c 42-` > @@ -46,7 +46,7 @@ for rev in `git rev-list $rhash`; do > do_make_header $rev > echo "" > git diff --binary $rev^..$rev > - ) > $GUILT_DIR/$branch/$fname > + ) > "$GUILT_DIR/$branch/$fname" > > # FIXME: grab the GIT_AUTHOR_DATE from the commit object and set the > # timestamp on the patch > @@ -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: `git rev-parse \`git_branch\``" >&2 > > } > -- > 1.8.3.1 > -- Once you have their hardware. Never give it back. (The First Rule of Hardware Acquisition)