From: "Philip Oakley" <philipoakley@iee.org>
To: "Angelo Borsotti" <angelo.borsotti@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Johannes Sixt" <j.sixt@viscovery.net>,
"git" <git@vger.kernel.org>,
"Matthieu Moy" <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: erratic behavior commit --allow-empty
Date: Thu, 4 Oct 2012 23:42:49 +0100 [thread overview]
Message-ID: <74938A94D25C4F1887F30C281A02B35F@PhilipOakley> (raw)
In-Reply-To: CAB9Jk9CiDNNBM9V-VvwCK6q-N0JNwEbf4vJj0ffT82iLnrUwog@mail.gmail.com
From: "Angelo Borsotti" <angelo.borsotti@gmail.com>
Sent: Thursday, October 04, 2012 11:09 PM
>>
>> A reasonable solution. You can also create a sentinel (--root) commit
>> for
>> any time that you need to create the source branch, just so it (the
>> real
>> source code commit) has a different parent when on source branch to
>> that on
>> the binaries branch.
>
> Do you mean I could create an empty root commit to be used as parent
> for the
> real source commit? Or that there is some --root option to be used?
I was using "--root" in a colloquial way. It is used in some other
commands when the very first commit is to be included in its operation.
At the point where you do the 'git checkout --orphan <new_branch>
<start_point>' you could have separate start points ready for the source
branch and the binaries branch, and immediately do a 'git commit' to
create the unique sentinel commit before you re-checkout the developers
latest and greatest (with --force), and then do your commits on the
source branch as before.
Another technique could be to simply switch to the sources branch, and
then use a 'git clean -x' with an updated .gitignore ('reset' the file
from the source branch)[or use the exclude file] to remove those now
ignored binaries, before doing the commit.
Philip
next prev parent reply other threads:[~2012-10-04 22:42 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
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 [this message]
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=74938A94D25C4F1887F30C281A02B35F@PhilipOakley \
--to=philipoakley@iee.org \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=angelo.borsotti@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/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).