From: Angelo Borsotti <angelo.borsotti@gmail.com>
To: git <git@vger.kernel.org>
Subject: erratic behavior commit --allow-empty
Date: Tue, 2 Oct 2012 09:51:56 +0200 [thread overview]
Message-ID: <CAB9Jk9BynCunFHRFhGKoyDA-qof1iu6w952sAgSs2_JWb8+U3A@mail.gmail.com> (raw)
Hi
I have noticed an erratic behavior of git commit --allow-empty: sometimes
it creates a new commit, but sometimes not.
I have executed two times the following script, emptycommit:
#!/bin/bash
set -x
rm -rf local
mkdir local
cd local
git init
echo "aaa" >f1
git add f1
git commit -m A
git checkout --orphan feature
git commit -m A --allow-empty
git rev-list --all --pretty=oneline
This is the log of the first execution:
$ emptycommit
+ rm -rf local
+ mkdir local
+ cd local
+ git init
Initialized empty Git repository in d:/gtest/local/.git/
+ echo aaa
+ git add f1
warning: LF will be replaced by CRLF in f1.
The file will have its original line endings in your working directory.
+ git commit -m A
[master (root-commit) 07e7d37] A
warning: LF will be replaced by CRLF in f1.
The file will have its original line endings in your working directory.
1 file changed, 1 insertion(+)
create mode 100644 f1
+ git checkout --orphan feature
Switched to a new branch 'feature'
+ git commit -m A --allow-empty
[feature (root-commit) 2297c4e] A
warning: LF will be replaced by CRLF in f1.
The file will have its original line endings in your working directory.
1 file changed, 1 insertion(+)
create mode 100644 f1
+ git rev-list --all --pretty=oneline
2297c4e34ec27f3cdeca8c0dcdcd61b4a079f411 A
07e7d379c2339ed375ed4903f6196d627367b7bf A
>>>>> note that git commit -m A --allow-empty creates a commit
This is the log of the second execution:
$ emptycommit
+ rm -rf local
+ mkdir local
+ cd local
+ git init
Initialized empty Git repository in d:/gtest/local/.git/
+ echo aaa
+ git add f1
warning: LF will be replaced by CRLF in f1.
The file will have its original line endings in your working directory.
+ git commit -m A
[master (root-commit) 1b86218] A
warning: LF will be replaced by CRLF in f1.
The file will have its original line endings in your working directory.
1 file changed, 1 insertion(+)
create mode 100644 f1
+ git checkout --orphan feature
Switched to a new branch 'feature'
+ git commit -m A --allow-empty
[feature (root-commit) 1b86218] A
warning: LF will be replaced by CRLF in f1.
The file will have its original line endings in your working directory.
1 file changed, 1 insertion(+)
create mode 100644 f1
+ git rev-list --all --pretty=oneline
1b8621851f6ae2943347da655661e9d5dc978208 A
>>>>> note that git commit -m A --allow-empty DOES NOT create a commit
The script has been run on Windows 7 with git version 1.7.11.msysgit.1
-Angelo
next reply other threads:[~2012-10-02 7:52 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 7:51 Angelo Borsotti [this message]
2012-10-02 8:26 ` erratic behavior commit --allow-empty 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
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=CAB9Jk9BynCunFHRFhGKoyDA-qof1iu6w952sAgSs2_JWb8+U3A@mail.gmail.com \
--to=angelo.borsotti@gmail.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).