Re: [GUILT 04/28] Allow "guilt import-commit" to run from a dir which contains spaces.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Mar 23, 2014 at 6:04 PM, Jeff Sipek <jeffpc@xxxxxxxxxxxxxx> wrote:

> On Fri, Mar 21, 2014 at 08:31:42AM +0100, Per Cederqvist wrote:
>
>> Signed-off-by: Per Cederqvist <cederp@xxxxxxxxx>
>> ---
>>  guilt-import-commit | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> 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
>
> I wonder if it'd be better to use 'git rev-parse' here instead of looking at
> the refs directly.
>
> IOW,
>
> disp "Current head: `git rev-parse \`git_branch\``" >&2

That is probably a good idea. I only made the minimum change
required to get the test suite to pass.

> Maybe even $() instead of the inner `` to clean it up some more.

Yes, given that that construct is already used in several places
it is apparently portable enough for guilt. (I guess nobody uses
/bin/sh on Solaris to run guilt. It doesn't support the $(...)
construct.)

> Jeff.

    /ceder

>>
>>  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: `cat \"$GIT_DIR\"/refs/heads/\`git_branch\``" >&2
>>
>>  }
>> --
>> 1.8.3.1
>>
>
> --
> It used to be said [...] that AIX looks like one space alien discovered
> Unix, and described it to another different space alien who then implemented
> AIX. But their universal translators were broken and they'd had to gesture a
> lot.
>                 - Paul Tomblin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]