devatherock / git-sync

CI plugin to sync the contents of a git repository with another

git-sync's Issues

Add support for another sync mode

Problem:
Sync fails when there had been any conflict resolution done in the source branch without using rebase

Solution:
Use cherry-pick as the default sync mode which will continue doing what the current code does. Introduce a sync mode that works by merging the contents of modified files. Call it file-merge. Find files modified in a commit using command git diff-tree --no-commit-id -r <commitSha>. The output of the command looks like below:

:100644 100755 772e30bf04d0b60b12ce56057dc68067f3902ff3 772e30bf04d0b60b12ce56057dc68067f3902ff3 M	path/to/file.sh

The fields are old file mode, new file mode, old file hash, new file hash, the type of change(A/M/D - Added/Modified/Deleted) and path to file. When only file mode has changed, old file hash and new file hash will be the same

Prevent commits from different tracks from being mixed together

Use git log --pretty=oneline -n ${commitLimit} --topo-order instead of git log --pretty=oneline -n ${commitLimit}

Upgrade gradle to 7, to make the build work in Java 17

Draft changes in gradle-7 branch

Add latest tag to docker image

Convert the groovy script into a native executable using graal

Add unit tests

Make the plugin compatible with vela

Use one dockerfile for all images - drone, vela and CircleCI

Refer drone-yaml-validator

Include functional tests in CI pipeline

The machine executor type allows running docker commands from within tests

Stop publishing drone-git-sync and vela-git-sync docker images