<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
On 01/19/2012 02:03 PM, Christina wrote:
<blockquote cite="mid:4F186911.4040109@redhat.com" type="cite">
<meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1">
forgive me as this is my first checkin using git. Something
unexpected happened.<br>
<br>
I was on the master branch and when ready I did "git push" and it
unexpectedly told me the following:<br>
Counting objects: 50, done.<br>
Delta compression using up to 4 threads.<br>
Compressing objects: 100% (23/23), done.<br>
Writing objects: 100% (28/28), 2.89 KiB, done.<br>
Total 28 (delta 19), reused 0 (delta 0)<br>
To <a class="moz-txt-link-freetext" href="ssh://git.fedorahosted.org/git/pki.git">ssh://git.fedorahosted.org/git/pki.git</a><br>
5bf257b..5314d04 DOGTAG_9_BRANCH -> DOGTAG_9_BRANCH<br>
<br>
I did happen to have worked on DOGTAG_9_BRANCH as well but I did
not expect it to be pushed as I was on the master at the time,
although I was getting it ready as well. I just did not expect it
to be pushed.<br>
<br>
So does git push push everything even though you are not on that
branch at the moment?<br>
Now I see something called <a moz-do-not-send="true" class="list
subject" title="Merge branch 'DOGTAG_9_BRANCH' of
ssh://git.fedorahosted.org/git/pki into DOGTAG_9_BRANCH"
href="http://git.fedorahosted.org/git?p=pki.git;a=commit;h=5314d049fadd54666dbdae7444b8134f8b98cba0">Merge
branch 'DOGTAG_9_BRANCH' of ssh://git.fedorahoste..</a> being
pushed onto DOGTAG_9_BRANCH. Is it supposed to be?<br>
</blockquote>
<br>
<br>
I find it essential to control exactly which branch I push from and
to. So what you want to do is<br>
<br>
git push <remote> <localbranch>:<remotebranch><br>
<br>
Git push with no arguments...I have nevere done that so I can't
say, but I suspect it pushes for each of you local tracking
branches, so it depends on how you made the branch in the first
place.<br>
<br>
<br>
What you want to do on DOGTAG_9_BRANCH is create a revert commit,
that undoes the last commit, and then push that to the <br>
DOGTAG_9_BRANCH.<br>
<br>
<br>
There is some discussion about merges versus rebases, but I think
the teams (IPA, DS and now CS) all want to go with the rebase
approach. So before you push changes to DOGTAG_9_BRANCH you
should do<br>
<br>
git checkout DOGTAG_9_BRANCH<br>
git fetch<br>
git rebase DOGTAG_9_BRANCH<br>
<br>
I like doing it as specific steps as I understand what each step is
doing.<br>
<br>
checkout makes sure I am in the right local branch.<br>
git fetch pulls the changes down from the central repo to my local
repo but makes *NO* changes to my local branch<br>
git rebase only makes the changes, and will warn if there are any
errors. ONce that is done, you will be able to push using<br>
<br>
push origin DOGTAG_9_BRANCH:DOGTAG_9_BRANCH<br>
<br>
<br>
You probably shouldn't be pushing to master, unless you are working
with Ade and Endi on some issue.<br>
<br>
<br>
<br>
<br>
<br>
<blockquote cite="mid:4F186911.4040109@redhat.com" type="cite"> <br>
thanks,<br>
Christina<br>
<br>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Pki-devel mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Pki-devel@redhat.com">Pki-devel@redhat.com</a>
<a class="moz-txt-link-freetext" href="https://www.redhat.com/mailman/listinfo/pki-devel">https://www.redhat.com/mailman/listinfo/pki-devel</a>
</pre>
</blockquote>
<br>
</body>
</html>