From: Keith Packard <keithp@keithp.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: keithp@keithp.com, Git Mailing List <git@vger.kernel.org>
Subject: Re: rebase from ambiguous ref discards changes
Date: Thu, 06 Sep 2007 19:58:18 -0700 [thread overview]
Message-ID: <1189133898.30308.58.camel@koto.keithp.com> (raw)
In-Reply-To: <7vsl5r8jer.fsf@gitster.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]
On Thu, 2007-09-06 at 16:26 -0700, Junio C Hamano wrote:
> We haven't touched this area for a long time (like "v1.3.0" or
> "since March 2006"). I wish you told us about this earlier.
I would have were I certain that it wasn't user-error last time. I took
a few minutes this time to verify precisely what I saw and reproduce it.
> I'd like to reproduce this, but I need to be sure what your
> "ambiguous" situation is really like. What ambiguous "master"s
> do you have? IOW, what does:
>
> git show-ref | grep master
$ git show-ref | grep master
286f5df0b62f571cbb4dbf120679d3af029b8775 refs/heads/master
1feb733eb8b09a8b07b7a6987add5149c53b0157 refs/heads/master-guitar
d957c6b8e1dde8e11c1db3431e0ff58c5d984880 refs/heads/master-i830
0fd3ba0518b3cde9ca0e4e2fc1854c00d8a43d5c refs/remotes/kyle/master
e25f8e145f4f73b62c32389b922291fd561af9d2 refs/remotes/origin/lg3d-master
286f5df0b62f571cbb4dbf120679d3af029b8775 refs/remotes/origin/master
e25f8e145f4f73b62c32389b922291fd561af9d2 refs/remotes/otc/lg3d-master
6781575f734f05547d7d5ceef4116fc157bba44d refs/remotes/otc/master
so, nothing obviously amiss here.
> Perhaps you have ".git/master" by mistake?
oops.
$ find .git -name master
.git/master
.git/refs/heads/master
.git/refs/remotes/kyle/master
.git/refs/remotes/origin/master
.git/refs/remotes/otc/master
.git/logs/refs/heads/master
.git/logs/refs/remotes/fdo/master
.git/logs/refs/remotes/kyle/master
.git/logs/refs/remotes/origin/master
.git/logs/refs/remotes/otc/master
So, I think that explains where the ambiguous master came from. Seems
like rebase should be able to bail out before breaking things though.
--
keith.packard@intel.com
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-09-07 2:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-06 21:48 rebase from ambiguous ref discards changes Keith Packard
2007-09-06 22:37 ` Pierre Habouzit
2007-09-06 23:26 ` Junio C Hamano
2007-09-07 2:58 ` Keith Packard [this message]
2007-09-07 6:55 ` Pierre Habouzit
2007-09-07 11:21 ` [PATCH] HEAD, ORIG_HEAD and FETCH_HEAD are really special Junio C Hamano
2007-09-07 12:36 ` Johannes Sixt
2007-09-07 12:42 ` Pierre Habouzit
2007-09-07 20:39 ` Junio C Hamano
2007-09-07 21:04 ` Pierre Habouzit
2007-09-08 22:20 ` Alex Riesen
2007-09-07 16:03 ` Keith Packard
2007-09-07 16:08 ` Keith Packard
2007-09-07 16:29 ` Nicolas Pitre
2007-09-07 20:32 ` Junio C Hamano
2007-09-07 21:53 ` Carl Worth
2007-09-07 22:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1189133898.30308.58.camel@koto.keithp.com \
--to=keithp@keithp.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).