On samedi 4 octobre 2014 13:51:39 CEST, Jan Kundrát wrote:
On Saturday, 4 October 2014 13:38:21 CEST, Dimitrios Glentadakis wrote:
[dglent@localhost trojita (imap-idle-renewal-bug-337846)]$
LC_ALL=C git push origin
master:refs/for/imap-idle-renewal-bug-337846
You're working *locally* on branch
imap-idle-renewal-bug-337846. That's good. We want your change
on the master branch, though, and therefore you should do
something like this:
`git push origin HEAD:refs/for/master`
"HEAD" is a shorthand to your local branch (where you're right
now). "master" is the target branch.
If you ever make some changes to that commit and want to upload
the result, then do something like:
git fetch origin
git rebase origin/master
...work now...
git commit --amend
git push origin HEAD:refs/for/master
Hope the wiki is clear; clarifying edits are welcome, of course.
Cheers,
Jan
It is surely my fault as i don't have experience with git.
I have this error now:
[dglent@localhost trojita (imap-idle-renewal-bug-337846)]$ scp -p -P 29418
[email protected]:hooks/commit-msg .git/hooks/
commit-msg 100% 4361
4.3KB/s 00:00
[dglent@localhost trojita (imap-idle-renewal-bug-337846)]$ LC_ALL=C git
push origin HEAD:refs/for/master
X11 forwarding request failed on channel 0
Counting objects: 12, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 1.30 KiB | 0 bytes/s, done.
Total 12 (delta 11), reused 0 (delta 0)
remote: Resolving deltas: 100% (11/11)
remote: Processing changes: refs: 1, done
remote: ERROR: missing Change-Id in commit message footer
remote: Suggestion for commit message:
remote: - Add imap-idle-renewal time in settings (bug 337846)
remote:
remote: Change-Id: Id12a966f8498edee76d3d642cfbf09b441e4eb42
remote:
remote: Hint: To automatically insert Change-Id, install the hook:
remote: gitdir=$(git rev-parse --git-dir); scp -p -P 29418
[email protected]:hooks/commit-msg ${gitdir}/hooks/
remote:
remote:
To ssh://[email protected]:29418/trojita
! [remote rejected] HEAD -> refs/for/master (missing Change-Id in commit
message footer)
error: failed to push some refs to
'ssh://[email protected]:29418/trojita'
