diff options
| author | Paulo Gomes <paulo.gomes@suse.com> | 2024-03-09 09:00:21 +0000 |
|---|---|---|
| committer | Paulo Gomes <paulo.gomes@suse.com> | 2024-03-09 09:00:21 +0000 |
| commit | 3ee5bc9dd308a5503d60cc26d17d7f10df28c37a (patch) | |
| tree | cdc736274162b804e12d4bd55617b5811d470248 /remote.go | |
| parent | 4bed23037f0e374d85bce1506e9df98ce0cfcd32 (diff) | |
| download | go-git-3ee5bc9dd308a5503d60cc26d17d7f10df28c37a.tar.gz | |
git: Implement Merge function with initial FastForwardMerge support
Introduces the Merge function for merging branches in the codebase.
Currently, the function only supports FastForwardMerge strategy, meaning it
can efficiently update the target branch pointer if the source branch history
is a linear descendant.
Support for additional merge strategies (e.g., three-way merge) will be added
in future commits.
Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>
Diffstat (limited to 'remote.go')
| -rw-r--r-- | remote.go | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1128,7 +1128,7 @@ func isFastForward(s storer.EncodedObjectStorer, old, new plumbing.Hash, earlies } found := false - // stop iterating at the earlist shallow commit, ignoring its parents + // stop iterating at the earliest shallow commit, ignoring its parents // note: when pull depth is smaller than the number of new changes on the remote, this fails due to missing parents. // as far as i can tell, without the commits in-between the shallow pull and the earliest shallow, there's no // real way of telling whether it will be a fast-forward merge. |