From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Angelo Borsotti <angelo.borsotti@gmail.com>
Cc: Philip Oakley <philipoakley@iee.org>,
Junio C Hamano <gitster@pobox.com>,
Johannes Sixt <j.sixt@viscovery.net>, git <git@vger.kernel.org>
Subject: Re: erratic behavior commit --allow-empty
Date: Wed, 03 Oct 2012 13:07:39 +0200 [thread overview]
Message-ID: <vpqvcer4xvo.fsf@grenoble-inp.fr> (raw)
In-Reply-To: <CAB9Jk9DFb2s4s00yCNUytxFdrOQKPEKZGsXpKzwZDo5WAOdXaQ@mail.gmail.com> (Angelo Borsotti's message of "Wed, 3 Oct 2012 10:24:00 +0200")
Angelo Borsotti <angelo.borsotti@gmail.com> writes:
>> You still didn't tell us where the problem was.
>
> I described it few mails above. I wanted to create an orphan branch.
And you did. The branch happens to point to the same commit as another
existing commit, but this is a very common situation. Try this:
# do arbitrary hacking and commit on branch master
git checkout -b new-branch
gitk
You will see branches "master" and "new-branch" pointing to the same
commit (but you HEAD points to new-branch, as "git branch" will tell
you).
You still did not describe a _problem_. Up to now, the only "problem" I
see is that you have twice the same sha1 showing up, but you did not
describe somethine concrete that you wanted to do and did not work.
> However, the branch is not actually created until a commit is done on
> it.
Right, but the definition of "done" in your sentence includes "reusing
an object in the object database".
I just tried this:
rm -fr test
git init test
cd test
date > foo.txt
git add .
git commit --allow-empty -m foo
git checkout --orphan new-branch
git commit --allow-empty -m foo
I ended up with a branch "master" and a branch "new-branch", both
pointing to the same commit. The new branch _is_ created.
(BTW, --allow-empty is useless here as you have no parent)
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2012-10-03 11:07 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 7:51 erratic behavior commit --allow-empty Angelo Borsotti
2012-10-02 8:26 ` Johannes Sixt
2012-10-02 8:49 ` Angelo Borsotti
2012-10-02 17:27 ` Junio C Hamano
2012-10-02 19:34 ` Angelo Borsotti
2012-10-02 19:56 ` Junio C Hamano
2012-10-02 21:56 ` Angelo Borsotti
2012-10-03 2:10 ` PJ Weisberg
2012-10-03 5:37 ` Johannes Sixt
2012-10-03 6:22 ` Angelo Borsotti
2012-10-03 6:27 ` Johannes Sixt
[not found] ` <CAB9Jk9AgtNQfWDr31CWbXf2ag=11du-aruu-0+nOZ3KaaG9=og@mail.gmail.com>
2012-10-03 7:12 ` Johannes Sixt
2012-10-03 7:35 ` Angelo Borsotti
2012-10-03 20:49 ` Junio C Hamano
2012-10-03 7:29 ` Philip Oakley
2012-10-03 7:45 ` Angelo Borsotti
2012-10-03 8:04 ` Matthieu Moy
2012-10-03 8:24 ` Angelo Borsotti
2012-10-03 11:07 ` Matthieu Moy [this message]
2012-10-03 11:52 ` Angelo Borsotti
[not found] ` <CABURp0oHez6j8+FPG8Zm52TGVyC1XwWhE55TBDrXRGFrW6kWww@mail.gmail.com>
2012-10-03 13:35 ` Angelo Borsotti
2012-10-03 14:15 ` Phil Hord
2012-10-03 13:57 ` Matthieu Moy
2012-10-03 14:46 ` Angelo Borsotti
2012-10-03 14:52 ` Matthieu Moy
2012-10-03 22:32 ` Philip Oakley
2012-10-04 7:07 ` Angelo Borsotti
2012-10-04 13:24 ` Phil Hord
2012-10-04 19:00 ` Angelo Borsotti
2012-10-04 21:17 ` Philip Oakley
2012-10-04 22:09 ` Angelo Borsotti
2012-10-04 22:42 ` Philip Oakley
2012-10-04 23:10 ` Angelo Borsotti
2012-10-03 12:25 ` Tomas Carnecky
2012-10-03 13:08 ` Angelo Borsotti
2012-10-03 10:12 ` Andreas Schwab
2012-10-03 11:37 ` Angelo Borsotti
2012-10-03 13:44 ` Andreas Schwab
2012-10-03 14:37 ` Angelo Borsotti
2012-10-03 16:44 ` Andreas Schwab
2012-10-03 17:37 ` Angelo Borsotti
2012-10-03 19:03 ` Andreas Schwab
2012-10-03 19:11 ` Angelo Borsotti
2012-10-03 20:30 ` Andreas Schwab
2012-10-03 12:59 ` Phil Hord
2012-10-03 14:25 ` Angelo Borsotti
2012-10-03 16:06 ` PJ Weisberg
2012-10-03 17:34 ` Angelo Borsotti
2012-10-03 19:05 ` Andreas Schwab
2012-10-03 19:43 ` PJ Weisberg
2012-10-05 8:15 ` Lars Noschinski
2013-01-12 18:30 ` Jan Engelhardt
2013-01-16 12:26 ` Joachim Schmitz
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=vpqvcer4xvo.fsf@grenoble-inp.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=angelo.borsotti@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=philipoakley@iee.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).