From: Keith Packard <keithp@keithp.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: keithp@keithp.com
Subject: rebase from ambiguous ref discards changes
Date: Thu, 06 Sep 2007 14:48:28 -0700 [thread overview]
Message-ID: <1189115308.30308.9.camel@koto.keithp.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1768 bytes --]
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.
$
Note the lack of the usual 'Applying <patch>' messages.
checking the tree, I now had
---*
\
-- origin/master
master
with my patch lost.
recovering my patch (having the ID in my terminal window from the
commit), I named it 'master-with-fix'
---*--- master-with-fix
\
-- origin/master
master
Now the rebase from 'master-with-fix worked as expected:
$ git-rebase origin/master
First, rewinding head to replay your work on top of it...
HEAD is now at 2a8592f... Fix G33 GTT stolen mem range
Applying Switch to pci_device_map_range/pci_device_unmap_range APIs.
Adds trailing whitespace.
.dotest/patch:225:
Adds trailing whitespace.
.dotest/patch:226: if (IS_I965G(pI830))
Adds trailing whitespace.
.dotest/patch:446:
dev->regions[mmio_bar].size,
Adds trailing whitespace.
.dotest/patch:449:
warning: 4 lines add whitespace errors.
Wrote tree cd373666254d56a137d282deeb15a2ccaf8da22b
Committed: 286f5df0b62f571cbb4dbf120679d3af029b8775
$
And the tree looks right too:
--- origin/master --- master-with-fix
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.
Git made me sad today; I'm not sure it's ever disappointed like this
before.
--
keith.packard@intel.com
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2007-09-06 22:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-06 21:48 Keith Packard [this message]
2007-09-06 22:37 ` rebase from ambiguous ref discards changes Pierre Habouzit
2007-09-06 23:26 ` Junio C Hamano
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=1189115308.30308.9.camel@koto.keithp.com \
--to=keithp@keithp.com \
--cc=git@vger.kernel.org \
/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).