From: Junio C Hamano <gitster@pobox.com>
To: Keith Packard <keithp@keithp.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: rebase from ambiguous ref discards changes
Date: Thu, 06 Sep 2007 16:26:52 -0700 [thread overview]
Message-ID: <7vsl5r8jer.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1189115308.30308.9.camel@koto.keithp.com> (Keith Packard's message of "Thu, 06 Sep 2007 14:48:28 -0700")
Keith Packard <keithp@keithp.com> writes:
> So, I started with a very simple repository
>
> ---*--- master
> \
> -- origin/master
>
> From master, I did
>
> $ git-rebase origin/master
> warning: refname 'master' is ambiguous.
> First, rewinding head to replay your work on top of it...
> HEAD is now at 2a8592f... Fix G33 GTT stolen mem range
> Fast-forwarded master to origin/master.
> ...
> Seems like there's something going on when 'master' is ambiguous, or
> perhaps some other problem.
>
> This is all from version 1.5.3, but I think I've seen this on 1.5.2 as
> well.
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'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
say? I have 11 lines of output from the above and I have never
seen a problem like this.
Perhaps you have ".git/master" by mistake?
next prev parent reply other threads:[~2007-09-06 23:27 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 [this message]
2007-09-07 2:58 ` Keith Packard
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=7vsl5r8jer.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=keithp@keithp.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).