Re: [StGIT PATCH 2/2] Don't touch ref files manually

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Aug 21, 2007, 13:23 UTC
Message-ID: <b0943d9e0708210623h112faa42p97bba06bc9fab774@mail.gmail.com>
In-Reply-To: <20070810032318.19791.70483.stgit@yoghurt>

Hi Karl,

On 10/08/07, Karl Hasselström <kha@treskal.com> wrote:

> Messing with files manually doesn't work if the refs are packed. The
> officially preferred way is to use git-update-ref, git-show-ref,
> et.al. So do that.

Thanks for this patch. I'll apply it but I have some questions below.

Show 8 quoted lines

> @@ -294,14 +301,16 @@ def set_head_file(ref):
>      # head cache flushing is needed since we might have a different value
>      # in the new head
>      __clear_head_cache()
> -    if __run('git-symbolic-ref HEAD',
> -             [os.path.join('refs', 'heads', ref)]) != 0:
> +    if __run('git-symbolic-ref HEAD', ['refs/heads/%s' % ref]) != 0:
>          raise GitException, 'Could not set head to "%s"' % ref

Why replacing os.path.join with a single string? I think the former is more portable if, in the future, someone will try to run StGIT on Windows (and GIT would be compiled directly, without cygwin).

Show 11 quoted lines

> diff --git a/t/t1000-branch-create.sh b/t/t1000-branch-create.sh
> index cca5504..e920e93 100755
> --- a/t/t1000-branch-create.sh
> +++ b/t/t1000-branch-create.sh
> @@ -13,26 +13,9 @@ Exercises the "stg branch" commands.
>  stg init
>
>  test_expect_success \
> -    'Create a spurious refs/patches/ entry' '
> -    find .git -name foo | xargs rm -rf &&
> -    touch .git/refs/patches/foo

I haven't tried this test but is there any problem if we keep them?

Thanks.

-- 
Catalin