From: Johannes Sixt <j.sixt@viscovery.net>
To: Angelo Borsotti <angelo.borsotti@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git <git@vger.kernel.org>
Subject: Re: erratic behavior commit --allow-empty
Date: Wed, 03 Oct 2012 07:37:29 +0200 [thread overview]
Message-ID: <506BCF19.7020800@viscovery.net> (raw)
In-Reply-To: <CAB9Jk9D-eJ8goYx7LWqGcWcLgRDS8+qLZVUsvvJ+QOtryP9-zg@mail.gmail.com>
Am 10/2/2012 23:56, schrieb Angelo Borsotti:
> The problem I am trying to solve is to push to a remote server the
> source files only,
> while keeping in the local repo both sources and binaries. To do it, I
> keep an orphan
> branch, [...]
>
> # this is the commit on the master branch
> git init
> echo "aaa" >f1
> git add f1
> git commit -m A
>
> # this is the piece of the script that builds the sources branch
> git checkout --orphan sources
> # git rm --cached ... remove binaries, if any"
> git commit -m A --allow-empty
> git rev-list --all --pretty=oneline
>
> When there are binaries in the commit A, they are removed, and the
> tree for the second
> git commit is then different, and the commit is actually created.
> When there are no binaries (as in the script above, in which the
> removal is commented out),
> the second git commit would not create any new commit, and I would not
> have an orphan
> branch. Thence the --allow-empty to force it to create a new commit.
> Unfortunately, it creates a new commit only if the system clock
> changes the seconds of
> the system time between the two git commits.
But the existing-and-not-created-commit has exactly the content that you
wanted. What's the point in insisting that it is different from any other
commit?
-- Hannes
next prev parent reply other threads:[~2012-10-03 5:38 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=506BCF19.7020800@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=angelo.borsotti@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.