[petsc-dev] major git problem!

[Jed Brown]

Thanks, makes sense.

Satish Balay <balay at mcs.anl.gov> writes:

> Sorry about that.
>
> I initially had a branch 'origin/balay/update-scotch_6.0.3/maint'
> [orginally intended to merge to maint]
>
> And then later - since it was suggested it wasnt' maint-worthy - I
> created a branch [with my usual naming scheme]
> 'origin/balay/update-scotch_6.0.3'
>
> Git rejected that - so I worked arround it by deleting
> 'origin/balay/update-scotch_6.0.3/maint' and creating
> 'origin/balay/update-scotch_6.0.3'. But I didn't realise that this
> would mess up all repos [who might have the listing for
> 'origin/balay/update-scotch_6.0.3/maint'
>
> The way to fix it is:
>
> git remote prune origin
>
> I'll change my notation to: origin/balay/maint/feature-branch-name
>
> I also removed 'origin/balay/update-scotch_6.0.3' - (as it is causing
> grief) - and created 'origin/balay/update-scotch_6.0.3-new'.
> Hopefully this will prevent grief for folks who didn't pull yet.
>
> Satish
>
>
> On Mon, 16 Feb 2015, Barry Smith wrote:
>
>> 
>>   So removed ALL the logs and it stopped bitching
>> 
>> $ rm -rf .git/logs/
>> ~/Src/petsc (master<) arch-mpich
>> $ git fetch
>> From bitbucket.org:petsc/petsc
>>  * [new branch]      balay/update-scotch_6.0.3 -> origin/balay/update-scotch_6.0.3
>> ~/Src/petsc (master<) arch-mpich
>> 
>>   whatever the logs are
>> 
>> 
>> > On Feb 16, 2015, at 5:58 PM, Jed Brown <jed at jedbrown.org> wrote:
>> > 
>> > Barry Smith <bsmith at mcs.anl.gov> writes:
>> > 
>> >> $ git pull
>> >> error: There are still logs under '.git/logs/refs/remotes/origin/balay/update-scotch_6.0.3'
>> >> From bitbucket.org:petsc/petsc
>> >> ! [new branch]      balay/update-scotch_6.0.3 -> origin/balay/update-scotch_6.0.3  (unable to update local ref)
>> >> 
>> >> 
>> >> If I delete that directory .git/logs/refs/remotes/origin/balay/update-scotch_6.0.3 I still get the error message again
>> > 
>> > I can't reproduce.  Can you "git fetch"?
>> 
>> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20150217/2b4a21fe/attachment.sig>