Comments on: Easier upstreaming / back-porting of patch series with git https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/ because there's always something more interesting than what you should be doing Thu, 12 Aug 2021 16:06:58 +0000 hourly 1 https://wordpress.org/?v=7.0.2 By: Adam https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-1947592 Thu, 12 Aug 2021 16:06:58 +0000 http://blog.adamspiers.org/?p=981#comment-1947592 In reply to Alex.

Thanks for the report, any chance you could file it at https://github.com/aspiers/git-config/issues/new? Much easier to deal with technical issues there than on this blog post!

]]> By: Alex https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-1947591 Thu, 12 Aug 2021 15:49:28 +0000 http://blog.adamspiers.org/?p=981#comment-1947591 In reply to Alex.

the formatting deleted some part of my previous message. The command used was git icing -v3 TARGET_BRANCH Start_Commit_ID

]]> By: Alex https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-1947587 Thu, 12 Aug 2021 15:26:07 +0000 http://blog.adamspiers.org/?p=981#comment-1947587 Hi,

when I run the command:

git icing -v3

I get the following error:

Traceback (most recent call last):
11: from /home/user/git-config/bin/git-icing:287:in `’
10: from /home/user/git-config/bin/git-icing:281:in `main’
9: from /home/user/git-config/bin/git-icing:194:in `cherry’
8: from /home/user/git-config/bin/git-icing:194:in `popen’
7: from /home/user/git-config/bin/git-icing:195:in `block in cherry’
6: from /home/user/git-config/bin/git-icing:195:in `each_line’
5: from /home/user/git-config/bin/git-icing:197:in `block (2 levels) in cherry’
4: from /home/user/git-config/bin/git-icing:137:in `classify_line’
3: from /home/user/git-config/bin/git-icing:74:in `upstreaming_note’
2: from /usr/lib/ruby/2.7.0/open3.rb:101:in `popen3′
1: from /usr/lib/ruby/2.7.0/open3.rb:219:in `popen_run’
/home/user/git-config/bin/git-icing:80:in `block in upstreaming_note’: git notes –ref\\=upstreaming show 8fb6a57bf826ead71d154a1f846554ca exited with status 1: error: no note found for object 8fb6a57bf826ead71d154a1f846554ca23843ea5. (RuntimeError)

Do you know what is going wrong?

Thanks in advance.

Regards,

Alexander

]]> By: Ning https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-278723 Thu, 27 Feb 2014 10:48:51 +0000 http://blog.adamspiers.org/?p=981#comment-278723 Send a pull request to roughly implement the idea. Please help to review and comment.

]]> By: Adam https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-277833 Wed, 26 Feb 2014 10:56:19 +0000 http://blog.adamspiers.org/?p=981#comment-277833 Sure, you can do that any time 🙂

]]> By: Ning https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-277589 Wed, 26 Feb 2014 08:40:08 +0000 http://blog.adamspiers.org/?p=981#comment-277589 I got your point. Can we use “git notes edit” in this case? User can get a chance to modify the skip list.

]]> By: Adam https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-276644 Tue, 25 Feb 2014 17:45:59 +0000 http://blog.adamspiers.org/?p=981#comment-276644 Yes that would be better, but unfortunately it requires git cherry-menu to be able to understand the (arguments of the) command it wraps, and I deliberately avoided that in order to keep it as flexible as possible by being able to wrap any command which has the right output format. So I’m not sure how best to do this. Suggestions (or even pull requests) very welcome!

]]> By: Ning https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-276619 Tue, 25 Feb 2014 16:11:58 +0000 http://blog.adamspiers.org/?p=981#comment-276619 Thanks for the confirmation. I was able to follow all the examples. It just confused me for a while.

I have a suggestion after trying the tools.

Regarding this feature “if the patch-id changes during cherry-picking, cherry-menu will notice, and automatically add the old commit to the blacklist”, it uses “skip: all” in current implementation. This will prevent the commit to be ported to any other branches later. I think the better way is to just skip the branch which you specify as the command argument. What do you think of it?

]]> By: Adam https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-276446 Tue, 25 Feb 2014 14:41:45 +0000 http://blog.adamspiers.org/?p=981#comment-276446 That’s very weird – I can reproduce this now. I can’t explain it, but hopefully it won’t prevent you from following through the rest of the example and learning how my tools work?

]]> By: Ning https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-275969 Tue, 25 Feb 2014 04:47:17 +0000 http://blog.adamspiers.org/?p=981#comment-275969 Here is the gist log. I just copied the commands you gave in this article.

https://gist.github.com/ningjiang/cca14f9b4b76bb1c8a66

My git version is 1.7.9.5

]]> By: Adam https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-275414 Mon, 24 Feb 2014 09:37:32 +0000 http://blog.adamspiers.org/?p=981#comment-275414 In reply to Ning.

That’s strange. Any chance you could paste a gist of your entire CLI session so I can see the details?

]]> By: Ning https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-275322 Mon, 24 Feb 2014 08:35:06 +0000 http://blog.adamspiers.org/?p=981#comment-275322 The tools are very convenient for back porting patches. I’ve a problem here. When I was trying git-cherry-menu, the first commit 348cfedfca can be cherry picked successfully. But in your case, the command failed. There is definitely something wrong here. Can you please double check?

]]> By: OpenStack社区周报(9.27 – 10.4) | UnitedStack Inc. https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-171088 Fri, 11 Oct 2013 03:11:41 +0000 http://blog.adamspiers.org/?p=981#comment-171088 […] Git技巧之选择性提交 […]

]]> By: Judd Maltin https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-163299 Tue, 01 Oct 2013 22:50:28 +0000 http://blog.adamspiers.org/?p=981#comment-163299 Adam, excellent writeup of your tool that I’ll be trying out tonight! Thanks!

]]> By: Pádraig Brady https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/#comment-156626 Sun, 22 Sep 2013 13:38:30 +0000 http://blog.adamspiers.org/?p=981#comment-156626 Oh some great stuff in here. This is a common and frustrating task. I was doing something more manual leveraging commit tags. Of course the “upstream first” mantra is useful here to minimize divergences.
Thank for taking the time to document this.

]]>