search

AGWA / git-crypt

Transparent file encryption in git
https://www.agwa.name/projects/git-crypt/
GNU General Public License v3.0
8.18k stars 475 forks source link

Add git-crypt merge driver to support secret files merging (refactored #107) #180

Open jirutka opened 5 years ago

jirutka commented 5 years ago

This PR is a refactoring of PR #107. The original PR mixes multiple unrelated changes in a single commit, including some maybe unwanted changes and code-style violations, which is probably the reason why it’s still not merged.

This PR contains only and only the changes needed for the merge driver support with minimum changes to the existing code (separated into an extra commit), so it should be easy for review. I’ve also fixed a few shortcomings in the original PR.

brandsimon commented 5 years ago

Will this fix git add -p?

rpasche commented 4 years ago

Any news here? I would love to see this merged but I also have to test it myself.

Quentin-M commented 3 years ago

Couple of years since my last comment on this feature.. Any plan to merge @AGWA? :)

For anyone lurking, @jirutka's solution works like a charm - simply compile it, place it in your PATH and git-crypt unlock again which will update your .git/config with the proper [merge "git-crypt{-<key>}"] blocks and allow for git rebase and git merge.

joaosa commented 3 years ago

@AGWA This would be incredibly useful, as it addresses a common hinderance to using git-crypt. Is there any chance this could get merged? :)

YellowOnion commented 2 years ago

Maybe someone else can take over maintaining the project, There's 21 pull requests open, and this one is basically an essential feature.