[Development] git submodules

[Jiergir Ogoerg]

Thanks,
I managed to commit my changes to local qtbase, but when trying to
push from the folder qtbase to gerrit it complains about
"Change-Id"...
Here's the log:

// START
qtbase$ git branch
* (detached from 260fe98)
  stable
qtbase$ git branch
* (detached from 260fe98)
  stable
qtbase$ git checkout stable
Warning: you are leaving 2 commits behind, not connected to
any of your branches:

  300ea73 Fast locale cache
  c029767 Quick cache

If you want to keep them by creating a new branch, this may be a good time
to do so with:

 git branch new_branch_name 300ea73

Switched to branch 'stable'
qtbase$ git branch working 300ea73
qtbase$ git branch
* stable
  working
qtbase$ git commit working
error: pathspec 'working' did not match any file(s) known to git.
qtbase$ git merge working
Merge made by the 'recursive' strategy.
 .../compose/generator/qtablegenerator.cpp          | 350 +++++++++++++++++----
 .../compose/generator/qtablegenerator.h            |   5 +-
 2 files changed, 298 insertions(+), 57 deletions(-)
qtbase$ git push
ssh://f35f22fan@codereview.qt-project.org:29418/qt/qtbase
HEAD:refs/for/stable
Enter passphrase for key '/home/fox/.ssh/id_rsa':
Counting objects: 32, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (21/21), done.
Writing objects: 100% (21/21), 5.34 KiB | 0 bytes/s, done.
Total 21 (delta 14), reused 0 (delta 0)
remote: Resolving deltas:   0% (0/14)
remote: ERROR: missing Change-Id in commit message
remote: Suggestion for commit message:
remote: Quick cache
remote:
remote: Change-Id: Ic029767da3653a93ccfeccf4459e6f081c8a4cf7
To ssh://f35f22fan@codereview.qt-project.org:29418/qt/qtbase
 ! [remote rejected] HEAD -> refs/for/stable (missing Change-Id in
commit message)
error: failed to push some refs to
'ssh://f35f22fan@codereview.qt-project.org:29418/qt/qtbase'
// END

It's like I'm on the finish line.. please help.
In case it matters, patch attached, created with:
git diff 56d141a >> /home/fox/patch.bin



On Tue, Dec 31, 2013 at 7:29 AM, Mandeep Sandhu
<mandeepsandhu.chd at gmail.com> wrote:
> On Tue, Dec 31, 2013 at 9:19 AM, Jiergir Ogoerg <f35f22fan at gmail.com> wrote:
>> Hi,
>> the Qt tutorials that explain how to use git don't mention git submodules.
>
> There are quite a few tutorials on the web on git submodules. In a
> nutshell, a submodule is an independent git repository that can
> reside/be referenced by another git repository. So eg "qt5" is one git
> repositroty (with it's own commit history etc) and "qtbase" is another
> git repo (with it's independent commit history) which is just 'housed'
> inside the qt5 directory. The qt5 dir references a particular commit
> of it's submodules.
>
>>
>> Is that why after doing changes to some source file "git diff" doesn't
>> show the changes as expected from reading this:
>> http://qt-project.org/wiki/Git_Introduction
>
> Are you running 'git diff' from the qt5 dir? There's an option to
> ignore dirty submodules, but inspecting the '.gitmodules' file, I see
> that it's not set (that would've suppressed any changes to show up in
> the parent/referencing repo, i.e qt5).
>
>>
>> I'm working with the files from
>> qt5/qtbase/src/plugins/platforminputcontexts/compose/generator/
>>
>>
>> What commands in git do I have to issue after updating those files for
>> them to show up in "git diff"?
>
> Try a 'git status/diff' from the qtbase dir and see what shows up.
>
> You can also try 'git submodule status qtbase'.
>
> HTH,
> -mandeep
>
>
>>
>> Git commit doesn't work either btw.
>> _______________________________________________
>> Development mailing list
>> Development at qt-project.org
>> http://lists.qt-project.org/mailman/listinfo/development
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch.bin.zip
Type: application/zip
Size: 3726 bytes
Desc: not available
URL: <http://lists.qt-project.org/pipermail/development/attachments/20131231/63b71037/attachment.zip>