32

I have a monolith of a feature branch. Instead of one massive PR into master I would like to split it up into 3 prs.

Ideally I want to pull out some standalone code from the feature branch into a PR by itself. This code is in a new directory and isn't called into yet so it would be a relatively safe PR. However instead of just copying the directory and creating a single commit and PR I would like to retain all the commit history of the changes for the new PR.

Is this possible using Git? I've looked into filter-branch but it seems like that is for splitting a repo into two, not for splitting a diff of changes into two (if that makes sense).

user3768149
  • 331
  • 1
  • 3
  • 5
  • 3 years later and this problem persists. You still cannot easily move changes to certain files between branches. You have to wrap those changes in commits, yadda yadda yadda – Hubert Grzeskowiak Dec 11 '18 at 01:14
  • Related, and answering the general question of how to break up a large Pull Request (PR), especially when squashing your commits is impractical due to one or more merges of `master` into your `feature_branch`: https://stackoverflow.com/questions/7566416/how-to-see-which-commits-in-one-branch-arent-in-the-other/60731900#60731900 – Gabriel Staples Mar 18 '20 at 01:26

3 Answers3

21

is there a way to pull files out of a branch including their commit history into a new branch?

You pull a commit, meaning a whole repo into a branch, not just some files.

One good option would then be to reset the files you don't want to their content pre-branch

--x--x--x (master)
         \
          y--y--y (branch B1 with mixed work)
                 \
                  z (new branch B2, but with some files reset to master)

B2 starts from B1 and include the files you want, with their history.
But B2 also includes other files from B1 that you would like to be as master.

You can do (in B2) a git reset --soft master: a git status would tell you all the changes you need to do in order for your index to reflect master. Simply don't add changes that involves the files you want to keep by using git restore -- path/to/file (restore instead of checkout, since Git 2.23, Aug. 2019). And don't commit. You just want to stage changes back to master for some files.

(See also "Practical uses of git reset --soft?")

Once that is done, a git reset --soft B2 moves HEAD back to B2 (but with an index recording all the changes and deletions necessary to reflect master for the right files).

You can commit now, with the other files reverted to master and the files you want untouched, identical to B1, with their history intact.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • Thanks a ton! I'll try it out. – user3768149 Jun 11 '15 at 16:33
  • 1
    @user3768149 note: once HEAD is moved to `master`, (`reset --soft master`), you can do simple `git checkout -- afile` for the other files you want to reset to `master`, and leave the files you want untouched. Moving back HEAD to `B2` would allow you to commit the "other files" content (which are now reflecting `master`) – VonC Jun 11 '15 at 16:36
11

Github pull requests always concern a branch. If you want to "split a pull request", make sure it is split well-enough into commits, and then make a branch for each pull request you want to make and make sure each such feature branch has all the relevant commits.

It looks like a good strategy for you might be to create 3 branches next to your main branch, cherry-pick the relevant commits to each branch, delete them on main, and have main merge with each of the three branches. Then you could have a PR for each branch and shared history too.

Petr Skocik
  • 58,047
  • 6
  • 95
  • 142
  • Sorry I might not have been clear enough. I want to split a branch with a set of changes into multiple branches based upon a directory. i.e. one way would be copy the directories only into a new branch off master and commit and make a PR but then it would lose all the commit history associated with the files in that directory. so is there a way to pull files out of a branch including their commit history into a new branch? – user3768149 Jun 10 '15 at 22:21
3

This is my preferred solution, but in this case you will lose your git history. If you really want to keep it, you can simply copy-paste it into the commit message of each individual PR.

I normally go through the list of changed files and create a .patch file for each set of changes that belong in a separate PR. In this case, this would be a very simple way to separate changes by directory.

For example, the following would put changes to the README.md and users_controllers.rb files, and any files within the views directory into a match file, which could then be applied on the new branch. Then a new PR can be made.

First checkout the branch with the too-big PR, then

git diff master head -- README.md app/controller/users_controller.rb app/views > first_group_of_changes.patch

JTE
  • 1,301
  • 12
  • 14