Dear Turaga,
Thank you for your comments.
Regarding 'COMMIT_EDITMSG' I have just found a link, which explains the
contents of the '.git' directory:
http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html
Meanwhile, my changes to 'xps' were finally uploaded to:
http://bioconductor.org/checkResults/devel/bioc-LATEST/xps/
Finally I was able to upload the 'xps' code to:
https://github.com/cstrato/xps
by running:
$ git push -u origin master
Enter passphrase for key '/Users/rabbitus/.ssh/id_rsa':
Counting objects: 2552, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (707/707), done.
Writing objects: 100% (2552/2552), 5.61 MiB | 101.00 KiB/s, done.
Total 2552 (delta 1902), reused 2451 (delta 1829)
remote: Resolving deltas: 100% (1902/1902), done.
To github.com:cstrato/xps.git
* [new branch] master -> master
Branch master set up to track remote branch master from origin.
It seems that finally my adventure of moving from cvs to git did
succeed. Thank you and Martin for your help.
Best regards,
Christian
P.S.:
I found the following useful sites which are also part of your 'Helpful
links' as 'git-scm manual':
- Git-Reference:
https://book.git-scm.com/docs
- Git-Book:
https://book.git-scm.com/book/en/v2
On 10/17/17 15:14, Turaga, Nitesh wrote:
Hi Christian,
Please see my inline comments for all your questions.
On Oct 16, 2017, at 5:46 PM, cstrato <cstr...@aon.at> wrote:
Dear Turaga,
Thank you for your reply.
This is exactly the problem which I do not understand.
I did NOT add "rabbitus@lumimacs-iMac.local” as my email.
This was probably done because you did not set a default email address, and
this is the “address” of your local machine.
You don’t need to do anything fancy to change the emails,
https://help.github.com/articles/setting-your-commit-email-address-in-git/.
This was done automatically when I called 'git commit'.
The message says:
Your name and email address were configured automatically based
on your username and hostname.
I did get the following message:
$ git config --global --edit
# This is Git's per-user configuration file.
[user]
# Please adapt and uncomment the following lines:
# name = rabbitus
# email = rabbitus@lumimacs-iMac.local
I must admit that I was astonished since I did not expect this (and I did not
want this!)
So I changed it to:
# This is Git's per-user configuration file.
[user]
# Please adapt and uncomment the following lines:
name = cstrato
email = cstr...@aon.at
My other question was:
Do I have to edit the file 'COMMIT_EDITMSG'?
Why do you want to edit the commit message? You are not committing anything
here. Please don’t edit. When you do commit to a git repo from your local
machine, you should write out a informative commit message about the changes
made, these are commit specific.
Best regards,
Christian
On 10/16/17 22:09, Turaga, Nitesh wrote:
Hi
Your email and username, need to be the same as your Github ID.
I’m not sure why you are trying to add "rabbitus@lumimacs-iMac.local” as your
email and username.
Could you please explain that?
On Oct 16, 2017, at 4:07 PM, cstrato <cstr...@aon.at> wrote:
Dear All,
When I first did:
$ git commit -m "update for configure.in"
everything seemed to be ok.
However, the next day when I tried once again to run 'git commit'
I got the following message:
$ git commit -m "update for configure.in"
[master 7a9855f] update for configure.in
Committer: rabbitus <rabbitus@lumimacs-iMac.local>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:
git config --global --edit
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
3 files changed, 62 insertions(+), 58 deletions(-)
Searching for an answer I found the following link:
https://stackoverflow.com/questions/10946893/git-name-and-email-address-configuration
and did:
$ git config --global user.name "cstrato"
$ git config --global user.email cstr...@aon.at
Now the file '~/.gitconfig' does contain the corrected name and email.
Afterwards, I tried:
$ git commit --amend --reset-author
and got the following text file, 'COMMIT_EDITMSG':
update for configure.in
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
# modified: DESCRIPTION
# modified: NEWS
# modified: configure.in
#
The file 'COMMIT_EDITMSG' can be found in my 'CRAN/GIT/xps/.git' directory.
My questions now are:
1, Why did I receive this message after a did 'git commit' the second time?
2, Is it correct that I have changed my user.name and user.email to above
values?
3, Why do I need to reset the commit information?
4, Do I have to edit the file 'COMMIT_EDITMSG'?
Thank you.
Best regards,
Christian
_._._._._._._._._._._._._._._._._._
C.h.r.i.s.t.i.a.n S.t.r.a.t.o.w.a
V.i.e.n.n.a A.u.s.t.r.i.a
e.m.a.i.l: cstrato at aon.at
_._._._._._._._._._._._._._._._._._
_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
This email message may contain legally privileged and/or confidential
information. If you are not the intended recipient(s), or the employee or
agent responsible for the delivery of this message to the intended
recipient(s), you are hereby notified that any disclosure, copying,
distribution, or use of this email message is prohibited. If you have received
this message in error, please notify the sender immediately by e-mail and
delete this email message from your computer. Thank you.
This email message may contain legally privileged and/or confidential
information. If you are not the intended recipient(s), or the employee or
agent responsible for the delivery of this message to the intended
recipient(s), you are hereby notified that any disclosure, copying,
distribution, or use of this email message is prohibited. If you have received
this message in error, please notify the sender immediately by e-mail and
delete this email message from your computer. Thank you.
_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
