{"id":457,"date":"2015-11-30T10:13:40","date_gmt":"2015-11-30T08:13:40","guid":{"rendered":"http:\/\/www.rinta-aho.org\/blog\/?p=457"},"modified":"2015-11-30T10:22:37","modified_gmt":"2015-11-30T08:22:37","slug":"how-to-merge-massive-formatting-only-commits-between-git-branches","status":"publish","type":"post","link":"http:\/\/www.rinta-aho.org\/blog\/how-to-merge-massive-formatting-only-commits-between-git-branches\/","title":{"rendered":"How to merge massive formatting-only commits between git branches"},"content":{"rendered":"

*** As always, first backup everything (your git working directory etc.) ***<\/p>\n

Let’s assume formatting changed in branch A, and you’re working in branch B<\/p>\n

To make life easier, prepare two git clones, the other one is checked out
\nwith branch A (in dir gitA), the other one with branch B (in dir gitB).
\nYou need to have both branches in gitB up-to-date, so:<\/p>\n

gitB> checkout A\r\ngitB> git pull\r\ngitB> checkout B\r\ngitB> git pull<\/pre>\n
Let’s assume the formatting-only megacommit has hashcode AAAA and the commit
\nbefore that has hashcode BBBB. You can check the latest commits to
\nbranch A like this:<\/p>\n
gitA> git log | less<\/pre>\n
First, merge A to B until the last commit before the formatting-only commit.<\/p>\n
gitB> git merge BBBB<\/pre>\n
Do the usual merge-stuff and commit. Do not push. For later analysis store
\nthe changed filenames:<\/p>\n
gitB> git diff --name-only A > ..\/diffsbeforemerge<\/pre>\n
Close Eclipse or other clever software that is holding to your git working clone.<\/p>\n
Clean:<\/p>\n
gitB> git clean -d -x -f .<\/pre>\n
Copy all files to a safe place, e.g.<\/p>\n
gitB> cd ..\r\nxxxx> tar cf gitB.tar gitB<\/pre>\n
Create another tar file without .git directory:<\/p>\n
xxxx> cp gitB.tar gitB-nogit.tar\r\nxxxx> tar --delete -f gitB-nogit.tar gitB\/.git<\/pre>\n
Merge the formatting-only megacommit (hashcode AAAA):<\/p>\n
xxxx> cd gitB\r\ngitB> git merge AAAA<\/pre>\n
Don’t worry about any conflicts… Just copy over the old files:<\/p>\n
gitB> cd ..\r\nxxxx> tar xf gitB-nogit.tar<\/pre>\n
At this point, format all source codes with the same formatter as in branch A,
\ne.g. by starting Eclipse and importing the correct formatter and then selecting
\nall projects and ‘Source\/Format’.<\/p>\n
Then:<\/p>\n
xxxx> cd gitB\r\ngitB> git add *\r\ngitB> git commit -m \"Synchronized formatting with branch A.\"<\/pre>\n
Now it is a good time to check what was changed before you push your changes
\nanywhere. Remember that you have the backup of the situation before merging,
\nso you can just wipe away the gitB directory and extract the tarball gitB.tar.<\/p>\n
You can check that the formatting-only-merge did not add any new diffs to
\nbranches:<\/p>\n
gitB> git diff --name-only A > ..\/diffsaftermerge\r\ngitB> diff -u ..\/diffsbeforemerge ..\/diffsaftermerge<\/pre>\n\"Facebook\"<\/a>\"twitter\"<\/a>\"reddit\"<\/a>\"pinterest\"<\/a>\"linkedin\"<\/a>\"mail\"<\/a>","protected":false},"excerpt":{"rendered":"
*** As always, first backup everything (your git working directory etc.) *** Let’s assume formatting changed in branch A, and you’re working in branch B To make life easier, prepare two git clones, the other one is checked out with branch A (in dir gitA), the other one with branch B (in dir gitB). You … <\/p>\n
Continue reading “How to merge massive formatting-only commits between git branches”<\/span><\/a><\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-457","post","type-post","status-publish","format-standard","hentry","category-coding"],"_links":{"self":[{"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/posts\/457","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/comments?post=457"}],"version-history":[{"count":4,"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/posts\/457\/revisions"}],"predecessor-version":[{"id":461,"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/posts\/457\/revisions\/461"}],"wp:attachment":[{"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/media?parent=457"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/categories?post=457"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.rinta-aho.org\/blog\/wp-json\/wp\/v2\/tags?post=457"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}