Git-subrepo: Possible to pull without squashing?

Created on 8 Feb 2018  路  2Comments  路  Source: ingydotnet/git-subrepo

Is it possible to pull (or do a series of git subrepo or git commands) to pull in the subrepo changes without squashing them? If not, is this a feature that other people would appreciate?

Here is our use case: We have brought in a contractor to work on a small part of our project. To simplify matters for him, and to avoid exposing our entire code base, we split that part into a subrepo--it is being actively worked on both by the contractor (in the subrepo) and other members of the team (mostly in the original project, not in the subrepo). So there is a lot of pushing and pulling going on. When the contractor finishes his work--or graduates to the full repo--we intend to go back to using just the one repo, and get rid of the subrepo. That means that we would prefer the detailed commit messages created by the contractor to make it into the main repo when we pull.

Enhancement Question

Most helpful comment

@grimmySwe Is it possible at least put all commit messages from squashed commits into message of the result "pull commit'. So the message would be more relevant to the changes inside the commit.

All 2 comments

@karptonite Currently there is no support for this.

Why?
Current solution allows us to simply create a new commit and put it at the end of the commit chain. If we should "import" all commits we would have to place them into the correct context somehow and that is not a trivial task.

Can it be done?
Probably... I would say that standard use cases would be fairly simple.

Workaround?
Pull often and use the -m flag that allows you to specify a better commit message then the standard one.

@grimmySwe Is it possible at least put all commit messages from squashed commits into message of the result "pull commit'. So the message would be more relevant to the changes inside the commit.

Was this page helpful?
0 / 5 - 0 ratings

Related issues

nandbert picture nandbert  路  4Comments

robe070 picture robe070  路  10Comments

carlokok picture carlokok  路  3Comments

mwithheld picture mwithheld  路  3Comments

qwertie picture qwertie  路  6Comments