How to commit changes in git to a release_branch?

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

How to commit changes in git to a release_branch?

Markus Neteler
Hi devs,

/me still learning :-)

So, I wanted to fix a user message ("make changelog" related) and I am
not sure if I got it right:

# the setting (directory layout based on Panos' git clone tricks):
[mneteler@oboe releasebranch_7_4 ]$ git remote -v
origin    /home/mneteler/software/grass-p2/../grass-p3/master (fetch)
origin    /home/mneteler/software/grass-p2/../grass-p3/master (push)
upstream    [hidden email]:OSGeo/grass.git (fetch)
upstream    [hidden email]:OSGeo/grass.git (push)

# the modification to be submitted
[mneteler@oboe releasebranch_7_4 ]$ git diff
diff --git a/include/Make/Docs.make b/include/Make/Docs.make
index adea0c228..15e9ef189 100644
--- a/include/Make/Docs.make
+++ b/include/Make/Docs.make
@@ -91,7 +91,7 @@ html2pdfdoccomplete:
        $(call html_pdf vector,v.*.html)

 changelog:
-       @ echo "creating ChangeLog file (following 'master' only)..."
+       @ echo "creating ChangeLog file (following 'releasebranch_7_4' only)..."
        @ # tools/gitlog2changelog.py creates a GNU style ChangeLog file:
        python tools/gitlog2changelog.py

# create feature branch
[mneteler@oboe releasebranch_7_4 ]$ git checkout -b changelog_fix_msg_74
M    include/Make/Docs.make
Switched to a new branch 'changelog_fix_msg_74'

# add the changed file
[mneteler@oboe releasebranch_7_4 ]$ git add include/Make/Docs.make

# commit
[mneteler@oboe releasebranch_7_4 ]$ git commit -m 'make changelog: fix
misleading msg'
[changelog_fix_msg_74 83a3049e6] make changelog: fix misleading msg
 1 file changed, 1 insertion(+), 1 deletion(-)

# push to feature branch
[mneteler@oboe releasebranch_7_4 ]$ git push origin changelog_fix_msg_74
Enumerating objects: 26, done.
Counting objects: 100% (26/26), done.
Delta compression using up to 4 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (19/19), 4.65 KiB | 366.00 KiB/s, done.
Total 19 (delta 13), reused 1 (delta 0)
To /home/mneteler/software/grass-p2/../grass-p3/master
 * [new branch]          changelog_fix_msg_74 -> changelog_fix_msg_74

... and now what?
I hoped to see a open-PR message in the terminal but nothing...

Hints welcome, thanks,

Markus
_______________________________________________
grass-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/grass-dev
Reply | Threaded
Open this post in threaded view
|

Re: How to commit changes in git to a release_branch?

Panagiotis Mavrogiorgos
hello Markus

In git, a "remote" is a different repository that you share common history with. It usually exists on a different server, but it can also live on your filesystem.

In your case you pushed the commit to your origin which is "grass-p3/master". You can check that by cd-ing into "grass-p3/master" and running "git log releasebranch_7_4". You should see the commit there. So if you want to push that to the main repo, you can do it either from "grass-p3/master" or you can add the main repo as a remote to "grass-p2/releasebranch_7_4"

all the best,
P.

_______________________________________________
grass-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/grass-dev