Re: Merge selected files or folders
Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> Richard Kerry <richard.kerry@eviden.com> writes:
>
>> I'd like to merge only certain files, or folders, from another
>> branch. What command or options should I be looking at to get
>> this done?
>
> If you are using the verb "merge" in the way Git uses, then there is
> *no* option to do so and that is very much deliberate, as allowing
> such a operation will break your history.
No, it won't break history. The merge commit *content* does not break *history* in any way. Path-limiting makes perfect sense when one is about to create merge commit content and knows in advance the exact set of paths the changes from which are to be included (or ignored).
Show 7 quoted lines
>
> A "merge" commit in Git records the fact that *all* changes that
> were done in each parent since the merged branches diverged have
> been considered and the tree recorded by the merge commit is the
> result. Hence, if you later change your mind and "merge" other
> changes from the same branch, it will result in no change at all, by
> definition.
Yes, but it's not an argument against path limiting support in the merge *command* that is just a helper to create merge commits. With this feature in place I'd just tell "git merge" that I've already considered all the other paths and decided that changes from them are irrelevant and are not to be included.
Show 5 quoted lines
> But if you are porting some changes made on another branch to the
> current branch, and then planning to record the result as a regular
> single parent commit, then there is no fundamental reason to forbid
> such an operation. It is what cherry-pick ought to be able to do,
> even though I do not think it accepts a pathspec to limit currently.
I think both cherry-pick and merge can be given such a possibility, as there is nothing wrong with it (see above), provided we do properly document what we are actually doing.
Show 26 quoted lines
>
> Assuming a history of this shape:
>
> x---x---X (that other branch)
> /
> O---o---o---o---H (current branch)
>
> such a "cherry-pick" would essentially be applying all the changes
> lead to X since the histories forked at O on top of H:
>
> $ git checkout H
> $ O=$(git merge-base X H)
> $ git diff $O X | git apply
> $ git commit -m "picked changes from branch X"
>
> And if you want to limit the paths involved in the operation, the
> "git diff" step can be given a <pathspec> to limit the changes that
> are ported.
>
> $ git checkout H
> $ O=$(git merge-base X H)
> $ git diff $O X -- thisdir/ that/file | git apply
> $ git commit -m "picked changes from branch X"
>
> Teaching "git cherry-pick" to accept a pathspec and natively
> perform something like the above is left as an exercise.
Well, I'd argue that both cherry-pick and merge should learn to have this useful feature, and it's much more useful for merges, as, unlike single commits the cherry-pick deals with, the merges tend to be huge from time to time, making manual amendments a real pain.
Do such patches have a chance of being accepted?
Thanks, -- Sergey Organov
