(recur code)


Week 13 - the last week of GSoC Work period!

Hello everyone, Sorry for the late post as you know I have been very busy lately giving finishing touches to the builtin/rebase.c. Yes, you read it right. We have a complete rebase.c, it has some nits still, as some tests particularly t5520 and t7406 are not passing but the good news is, the tests t34* are passing. Yipee! Regarding the status on the mailing list, after some regression tests suggested by @dscho, we found out that certain key changes need to be done to v5, so I requested the Git maintainer to hold it for some time i.

Week 11 and Week 12 merge!

Hello everyone, How are you? I apologize for not updating my blog post the previous week. So, on week 11, if you had followed my week 10 post, you would think by this time I will have gotten all the options of the rebase. Well, my week technically started by cleaning all the options to create them as separate commits and polish them for reviewing. Why is that more important? Well, it's because every reviewer is a human being and it's a natural tendency to review a lot of smaller things rather than a big monolithic one.

Week 10 Progress

Hello from Kathmandu where it has been raining a lot! This week also there were some development on rebase land! Continuing form the past week blog post, I submitted newer iterations of patch. Well, after some excellent review, the patch seemed to need some important changes, it was merged into pu but a re-roll is expected to fix some issues in it. New iteration of this patch series will take some time to arrive.

Week 09 Progress

Hi, This week I submitted patch v1 ,[v2] (https://public-inbox.org/git/20180702091509.15950-1-predatoramigo@gmail.com/) and am working on v3. On the other hand, there are other works going on towards converting the options of git-rebase.sh. Currently, the options supported are --onto, --quiet, --verify, --continue and support for an upstream that is actually a symmetric range i.e. <rev1>...<rev2> is also done. All of these progress can be seen from pull requests. Cleanup and addition of proper message will be done in the coming days.

Week 08 Progress

Hello Everyone. This is week was awesome. Though there were some difficulties due to electricity cuts, cool improvements were made to the previous patch series. The patch series I'm working on hit a milestone. Now, it can perform a real rebase. Of course, the environment variables are kept default and this might introduce bugs but for development purposes; to see real development, this is one amazing way. There was also some work on refactoring out codes from sequencer.

Week 07 Progress

Hello everyone. This week there was lots of progress in builtin rebase. Lots of thanks to Johannes Schindelin, without him the patch wouldn't be in current state. Rather than work on emulating smaller functions from git-rebase.sh like I explained previously in my blog post. Me and Dscho went a lot farther and implemented a super simple rebase. You can find the code here. If you're feeling adventurous get the code and run some rebase tasks.

Week 06 Progress

Hi everyone. Hope all of you readers had a great weekend. This week I worked on emulating run_specific_rebase () which is in git-rebase.sh. Firstly, I have tried to emulate specifically, this shell script: . git-rebase--$type git_rebase__$type${preserve_merges:+__preserve_merges} The work in progress patch of this conversion can be found here. The patch isn't ready as apply_autostash() function need some extra working. To make it working slight modifications to sequencer.c is required which will be done in the coming days.

Week 05 Progress

Hello everyone, This week I have been working on migrating small shell scripting component to C builtin. The work will be towards parsing a small modular component so that it can directly be used. With the development of my current patch, the rebase built-in that I will work on can do a super simple rebase. I might be able to demonstrate something in 2-3 days. That's a wrap up for this week.

Week 03 and Week 04 Progress

Hi everyone, Sorry for the late blog. There wasn't more action on week 03 and there was some action on week 04 *finally*. So, I had to merge both. Oh and a note to the readers, the previously assured Part II of Git Rebase will take some time as I plan to explain you the workings from the rebase builtin I will create. :-) So, during these two weeks, a skeletal for rebase builtin was created.

Git Inside® Part I: Don't Fear the Rebase

Ok, you've read my previous Git blog. There were nice feedback in the mailing list and in emails and IRC. This week I did a close study on git-rebase. There are _a_lot_of_posts_ about git-rebase which talk of benefits of rebase and some are negative towards rebase. By convention, it is understood that rebase is harder to understand for beginners that's why most will prefer merging. Even Github has merging of pull requests by default and to do rebase and merge you'll have to select it from the drop-down menu in the pull-requests section.