Regarding unable to commit the changes in local repository.

Pradeep Kumar

Hi,

I have made the changes and want to commit to local repository Git and if i select the modified changes and try to click to commit, the pushbutton is not enabled, commit pushbutton is disabled .
I can see the difference in diif selected files, what the changes i have done in Qt source code.

Please Guidance is required.

Thanks,

SGaist

Hi,

Where are you calling git from ? Qt Creator ? Command line ?

Pradeep Kumar

I am calling from Qt creator.

SGaist

Silly question but is git correctly configured in Qt Creator ?

Pradeep Kumar

@SGaist

I followed Configuring the git from Qt Contribution guidelines.
and followed the same. And i have made the documentation. below is the steps. Is their any mistake while configuring the Git. Please let me know if i am missing any steps or commands.?

Configuring the Git

   download the git if it is not installed in your system using the command : sudo apt-get git install

1) We need to have all files in the repository , so type the below command.

   git config --global core.autocrlf input

2) We need to provide commitor information correctly, so that we can commit and push it to server.

3) Dont use nick names, provide the specific names which was provided for Gerrit account.

4) Gerrit will not accept the commits unless the committer information matches the email address(es) you registered. 

5) Below are the commands to be provided.

   git config --global user.name "username"                             // within the double quotes provide username, provided 												   to Gerrit

   git config --global user.email "emailid"				// within the double quotes provide email, provided 												   to Gerrit


6) It is necessary to install Qt commit message template , the command is provided below:

    git config --global commit.template

7) It is necessary to show git in git stat or git commit, the command is provided below.

    git config --global status.showuntrackedfiles all

8) git push will push all branches to the upstream repository, which is almost never what user want. the command is provided below to 		    fix this.

    git config --global push.default tracking

9) Conflicts has to be resolved, git does not provide the by default , so the command is provided below.

    git config --global rerere.enabled true
    git config --global rerere.autoupdate true

10) git pull will provide changes from upstream, but it is not provdided by default ,the below command is used for that.

    git config --global rebase.stat true

11) to provide the colour patches for the differences , provide the below command.

    git config --global color.ui auto
    git config --global core.pager "less -FRSX"	

12) Git also support alias and the command is provided below.

    git config --global alias.di diff
    git config --global alias.ci commit
    git config --global alias.co checkout
    git config --global alias.ann blame

Thanks,
git config --global alias.st status

VRonin

Silly question but did you stage the files to commit?

Try using a GUI client just for git ( https://git-scm.com/download/gui/linux ). I use Git Extensions (but I run Windows)

Pradeep Kumar

May i know what is stage the files to commit?.

jsulm

@Pradeep-Kumar git add FILE

VRonin

git status will also tell you what is staged and what isn't

Pradeep Kumar

i used git status command and it showed me list which was not staged and
as @jsulm said i used git add filenames which i modified.

VRonin

Then you are done, just call git commit

Pradeep Kumar

k i will use the command git commit.
But is their any wrong in the above document which i posted?.

Pradeep Kumar

*** Suspicious changes in commit HEAD ( filepath):

*** - Suspicious author real name (key "email")

*** commit message:
*** - Hint: Aim for shorter summaries

*** examples/sql/doc/src/cachedtable.qdoc:
*** - Style issues (key "style")
*** 53: Trailing whitespace
*** 54: Trailing whitespace

*** See http://wiki.qt.io/Early_Warning_System for explanations.

Pradeep Kumar

I found this messages after i used git command , where i provided the information.
What does it represent.

SGaist

Check the configuration of git particularly the email and name you provided.

The first line of your commit is too long. IIRC It shouldn't be more than 72 character.

The long version of the commit message should be below after one empty line. Note that the line length is still a rule to be followed.

Remove all useless whitespaces you added on lines 53 and 54 of from cachedtale.qdoc

Pradeep Kumar

I used the command to check git config --list, below was the contents.

core.autocrlf=input
core.pager=less -FRSX
status.showuntrackedfiles=all
push.default=tracking
rerere.enabled=true
rerere.autoupdate=true
rebase.stat=true
color.ui=auto
alias.di=diff
alias.ci=commit
alias.co=checkout
alias.ann=blame
alias.st=status
user.email=pradeepkm186@gmail.com
user.name=pradeep_kumar.m

Is the configuration wrong?.

SGaist

The name is wrong. It's not a "username". When you contribute to Qt it should match the name you used for the Gerrit account. In your case, likely "Pradeep Kumar".

Pradeep Kumar

Username pradeep_kumar.m
Full Name Pradeep Kumar.M
Email Address pradeepkm186@gmail.com

this is from Gerrit account.

Pradeep Kumar

@SGaist

Commit button is enabled , it was parsing i had to wait for a while.
sorry was being impatient.

Another query is i am getting the below error

Cannot commit 1 file(s):
*** 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 'pradeep@pthinks.(none)')

Please provide further guidance?.
Thanks,

SGaist

Did you forgot the extension after @pthinks ?