Regarding unable to commit the changes in local repository.

SGaist

"Updated submodules" ?

What exactly are you trying to do for a submission ?

Pradeep Kumar

I modified one of the file in qtbase submodule.

After i added the filename which i modified.
then i tried git commit --amend --reset-author

Is it wrong?.

SGaist

Then you should explain clearly what you modified and why.

The first line of the commit is a small summary of what the patch does, then leave a blank line and after that explain precisely what your patch is about. Take a look at other submissions to see how it's done. Not all patches requires tons of description but it should always be clear what it does.

Pradeep Kumar

I explained the purpose in one line and left one line blank and provided the report no:

JKSH

@Pradeep-Kumar said in Regarding unable to commit the changes in local repository.:

Change-Id: If1195243a052f8cd20079345dbc7b2783e7bf459

OK, there are 2 issues here:

You have modified an existing commit which was written by someone else: https://codereview.qt-project.org/#/c/159622/
- First, backup all the files you've changed. Then, restore the original commit by calling git reset --hard HEAD~1 and then calling git pull.
You are in the wrong git repository. This is not qtbase.git!
- Call cd qtbase to enter the qtbase.git repository.

And i am not using any gui git.

You should. It makes life much easier.

Inside qtbase, call git gui to launch the GUI. Click Repository -> Visualize All Branch History. Now, explore the repository: Click on other peoples' commits and study them. (You can see the changes they made, and you can read their commit messages)

After this what has to be done?. guide me further.

What do you want to do?

Your topic says "unable to commit the changes in local repository". Can you commit changes to your local repository now? If yes, then please mark this thread as "solved". If not, tell us what issues you are facing when you try to commit changes to your local repository.

If you want to push your changes to the Qt Project, please start a new forum thread. That is a different topic.

Pradeep Kumar

Sorry for that ,

list item I was trying not to commit remotely, trying to commit locally.
And i have downloaded git-cola. for gui.

*And i revoked back to original commit and used the command git pull.

I will follow the steps as mentioned in the previous post of this topic,

Thanks,

SGaist

You can't commit remotely, all commits are local. You can push remotely however you don't have any write access to Qt's repositories. Nobody has, you must pass by the code review process.

Pradeep Kumar

After the gap i am taking again the qtsource code.

even if i now add file which i modified using git add filename
and use git commit in terminal

root@pthinks:~/qt5/qtbase# git commit

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'root@pthinks.(none)')
root@pthinks:~/qt5/qtbase# git commit

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'root@pthinks.(none)')

Previouly it used to open a editor to fill the description of what has been changed and task no , now directly i am the error.

jsulm

@Pradeep-Kumar You get this error because Git does not have user name/email. I don't know what you did recently, but for some reason user name/email disappeared. You need to do what the error message tells you. In general you should read about Git as this issue is completely unrelated to Qt.

Pradeep Kumar

K but when i used git config --local --list , user name and email is present.
Even if name is present , will it show error?.
And we need to rely on git?.

kshegunov

Firstly, you shouldn't do anything but system maintenance with the root user. Secondly, gerrit, being somewhat smart, will want you to configure your e-mail and name. Here[2] it's written pretty clearly how you should set it up. If I had to guess what the problem is, when pulling the Qt's source for development git pulled the git triggers for you, which would happen if you ran:

perl init-repository --codereview-username <Jira/Gerrit username>

which you should have according to this[1]. Getting the triggers in the local repo is perfectly normal and desirable, so my guess is you can't commit currently just because your name and email aren't configured.

Basically you have all the information in [1], [2] and [3], you just have to follow the instructions. Start by cloning the source with your gerrit username[1], set up gerrit [2] and ultimately use it to push for review[3].

[1]: https://wiki.qt.io/Building_Qt_5_from_Git
[2]: https://wiki.qt.io/Setting_up_Gerrit
[3]: https://wiki.qt.io/Gerrit_Introduction