This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: git pull --rebase problems.

From: Roland McGrath <roland at hack dot frob dot com>
To: Carlos O'Donell <carlos at systemhalted dot org>
Cc: Andrew Pinski <pinskia at gmail dot com>, "H.J. Lu" <hjl dot tools at gmail dot com>, GNU C Library <libc-alpha at sourceware dot org>
Date: Wed, 3 Oct 2012 16:30:43 -0700 (PDT)
Subject: Re: git pull --rebase problems.
References: <CAE2sS1iK+XfK+BMAub2TRrz7ZBGszhH2uBCCA51Sjm+ep87a0Q@mail.gmail.com><CA+=Sn1k5Q9ypaPwQ5YavPkM9pv5rAAQ_FAjm10cL01F=0d_7dg@mail.gmail.com><506CC9CA.5060305@systemhalted.org>

> >> error: 'refs/remotes/origin/hjl/pr14557' exists; cannot create
> >> 'refs/remotes/origin/hjl/pr14557/map'
[...]
> What causes this to happen?
> 
> Deleting and recreating remote branches with the same names?

As the error message indicates, there was previously a branch called
hjl/pr14557.  That translates (sometimes) to a (plain-text) file called
.git/refs/.../hjl/pr14557 existing.  Now there is a branch called
hjl/pr14557/map, which translates (sometimes) to a file called
.git/refs/.../hjl/pr14557/map needing to exist.  That implies that
a directory called .git/refs/.../hjl/pr14557 needs to be created,
but there is already a non-directory file by that name.

> I don't like having to obey git without knowing what it's doing...

Nobody ever knows exactly what git is doing.

Follow-Ups:
- Re: git pull --rebase problems.
  - From: H.J. Lu

References:
- git pull --rebase problems.
  - From: Carlos O'Donell
- Re: git pull --rebase problems.
  - From: Andrew Pinski
- Re: git pull --rebase problems.
  - From: Carlos O'Donell

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]