From: Heiko Voigt <hvoigt@hvoigt.net>
To: Michael Sims <michael.h.sims@gmail.com>
Cc: git@vger.kernel.org, Jens Lehmann <jens.lehmann@web.de>
Subject: Re: "sha1 information is lacking or useless" when rebasing with a submodule pointer conflict
Date: Wed, 30 Jan 2013 22:56:15 +0100 [thread overview]
Message-ID: <20130130215615.GA1053@book.hvoigt.net> (raw)
In-Reply-To: <CAFyOhY8YAO4zx6jKQxrEW=-Vbo-TTjU6wJ7UgNVEjA7B2dasng@mail.gmail.com>
Hi,
On Wed, Jan 30, 2013 at 12:43:31PM -0600, Michael Sims wrote:
> I'm seeing what might be a bug that was introduced in git 1.7.12 (also
> observed in 1.8.1.2). If not a bug, it's a changed behavior from
> previous versions that I don't understand.
>
> Here's the scenario:
> * I have a remote repo containing a pointer to a submodule.
> * Developer A and Developer B clone this repo, and both make a commit
> to first the submodule, and then the parent repo, changing some files
> and also the submodule pointer at the same time.
> * Developer A pushes his changes to both the submodule and the parent
> module to the shared remote
> * Developer B either does a "git pull --rebase" or a "git fetch && git
> rebase origin/master"
Thanks for the detailed bug report and the demo script. I can reproduce
the behavior here and will have a look into it. The submodule should be
marked as conflict.
Cheers Heiko
next prev parent reply other threads:[~2013-01-30 22:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-30 18:43 "sha1 information is lacking or useless" when rebasing with a submodule pointer conflict Michael Sims
2013-01-30 21:56 ` Heiko Voigt [this message]
2013-01-30 22:49 ` Heiko Voigt
2013-01-30 23:39 ` Junio C Hamano
2013-02-01 4:01 ` Junio C Hamano
2013-02-01 4:32 ` [PATCH 0/3] rebasing changes that update submodules Junio C Hamano
2013-02-01 4:32 ` [PATCH 1/3] git-am: record full index line in the patch used while rebasing Junio C Hamano
2013-02-01 6:25 ` Martin von Zweigbergk
2013-02-01 4:32 ` [PATCH 2/3] apply: simplify build_fake_ancestor() Junio C Hamano
2013-02-01 4:32 ` [PATCH 3/3] apply: diagnose incomplete submodule object name better Junio C Hamano
2013-02-05 19:19 ` Re* " 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130130215615.GA1053@book.hvoigt.net \
--to=hvoigt@hvoigt.net \
--cc=git@vger.kernel.org \
--cc=jens.lehmann@web.de \
--cc=michael.h.sims@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.