Commit Graph

415 Commits

Author SHA1 Message Date
René Pfeuffer
8ca64c3440 Fix signature check for git tags 2020-11-27 13:35:54 +01:00
Konstantin Schaper
6652a039dd fix unit tests 2020-11-27 12:40:02 +01:00
Konstantin Schaper
280f3e005e work on getting signatures running 2020-11-26 13:08:10 +01:00
Konstantin Schaper
b64d34afa4 add hook events to tag command and update unit tests 2020-11-26 11:15:26 +01:00
René Pfeuffer
181806f84b Read last commit date for git branches 2020-11-26 08:31:14 +01:00
Konstantin Schaper
0c5ab90852 work in progress 2020-11-24 22:07:24 +01:00
Sebastian Sdorra
9fe065f796 Merge pull request #1399 from scm-manager/feature/default_branch
Make default branch for git configurable
2020-11-03 08:23:03 +01:00
René Pfeuffer
5eea6e430e Remove code redundancies 2020-10-30 14:24:31 +01:00
René Pfeuffer
c3baf274d1 Set default branch for repository on init 2020-10-30 14:24:31 +01:00
René Pfeuffer
854940a514 Fix unit test 2020-10-30 14:24:31 +01:00
René Pfeuffer
e9a173616b Use branch from request if specified 2020-10-30 14:24:31 +01:00
René Pfeuffer
39e521a8d4 Set default branch after initial commit 2020-10-30 14:12:56 +01:00
Sebastian Sdorra
ecab3ce13b Fix internal server error for git sub modules without tree object 2020-10-28 17:00:12 +01:00
René Pfeuffer
c5f8d975a3 Remove unnecessary null check
The function RevWalk#parseAny indeed never returns null. This check only
was there to satisfy the (therefore wrong) unit test.
2020-10-12 19:02:28 +02:00
René Pfeuffer
e8506ff14d Fix recursive iteration
Due to the api of TreeWalk we have no real change to iterate this
recursively, so we get back to good old loops.
2020-10-08 09:24:56 +02:00
René Pfeuffer
cd9da7e658 Determine correct revision for tags in hooks
The former code only resolved the object id of the tags, when those were
annotated tags (for "simple" tags the code worked fine). Now we even can
handle nested tags (tags that reference other tags).
2020-09-24 08:28:52 +02:00
Eduard Heimbuch
1cad9c3fbc Merge branch 'develop' into feature/rebase 2020-09-21 14:01:34 +02:00
Konstantin Schaper
3e96d89480 implement requested review changes 2020-09-18 08:47:04 +02:00
Sebastian Sdorra
ec19291393 Fire missing BranchCreatedEvent for mercurial
The event is now fired in the builder instead of command implementation
2020-09-17 11:03:13 +02:00
Konstantin Schaper
2d024fe210 update head of scm-git-spi-test.zip back to master 2020-09-17 09:15:53 +02:00
Konstantin Schaper
b30a97948e implement git rebase 2020-09-15 15:48:22 +02:00
René Pfeuffer
96d16fe4cc "Unpeel" annotated tags to get correct changeset
If we just parse the object id of the reference for annotated tags, we
get the annotated tag object and not the reference the tag refers to.
2020-08-27 11:15:13 +02:00
René Pfeuffer
565ec3ff3c Cleanup 2020-08-27 10:48:54 +02:00
Konstantin Schaper
15fac8ba2c remove ref usage and directly use objectId 2020-08-26 15:06:00 +02:00
Konstantin Schaper
ecfc70eb77 wip refactoring 2020-08-26 10:01:51 +02:00
Konstantin Schaper
36231d077a cleanup and update tests 2020-08-25 18:08:31 +02:00
Konstantin Schaper
6d409c65c0 initial implementation 2020-08-25 14:45:48 +02:00
Konstantin Schaper
5a5289f381 fix merge issues 2020-08-11 15:04:52 +02:00
Konstantin Schaper
8576b66559 Merge branch 'develop' into feature/create_gpg_signatures
# Conflicts:
#	CHANGELOG.md
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHookContextProvider.java
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
2020-08-11 13:33:21 +02:00
Konstantin Schaper
0601770262 resolve review findings 2020-08-11 13:28:16 +02:00
Sebastian Sdorra
e7535903f7 Fix unit test on platforms which are not using UTF-8 as default 2020-08-10 09:22:29 +02:00
René Pfeuffer
a3a26c057e Cleanup 2020-08-07 10:53:08 +02:00
René Pfeuffer
2433c50d64 Add test for "real" merge commits 2020-08-07 08:01:13 +02:00
René Pfeuffer
6f20781812 Add first integration tests for merge detection 2020-08-06 17:12:14 +02:00
Konstantin Schaper
7072761ba1 implementation and unit tests 2020-08-05 13:02:02 +02:00
Eduard Heimbuch
b22ead23de show signature key on changeset 2020-07-29 15:43:14 +02:00
Eduard Heimbuch
ebb6a1fdb8 Merge branch 'develop' into feature/verify_gpg_signatures 2020-07-28 12:36:15 +02:00
Eduard Heimbuch
5e10f6b730 Invalidate branches cache synchronously on create new branch 2020-07-22 10:20:37 +02:00
Sebastian Sdorra
64da676348 revisit gpg api and use it with from git plugin 2020-07-22 08:22:04 +02:00
Sebastian Sdorra
7cb349242c introduces GitChangesetConverterFactory
This change introduces a GitChangesetConverterFactory to allow injections for the GitChangesetConverter.
2020-07-21 07:34:14 +02:00
Sebastian Sdorra
6e27051ed9 use child injector pattern for git commands
We are using a Google Guice child injector to reduce the amount of injection dependencies for the GitRepositoryServiceResolver and the GitRepositoryServiceProvider.
2020-07-20 16:18:00 +02:00
René Pfeuffer
086a471161 Fix migration of non-bare git repositories
During the migration of git repositories from v1 to v2, we have to
create an "scmm" config section with the repository id of the current
repository. If this does not happen, further write requests to this
repository will fail, because the hooks cannot determine the id.

However, the migration failed to write this configuration for non-bare
repositories. Therefore this fix checks beforehand, whether a '.git'
folder exists in the date directory. If this is the case, we assume that
this is a non-bare repository and write the config file inside this
folder.
2020-06-23 11:47:52 +02:00
René Pfeuffer
3e5ee53dc2 Adapt test to change from 52a09a9 2020-06-17 11:16:04 +02:00
Sebastian Sdorra
acc3306450 rename trailer to contributor 2020-06-10 11:08:11 +02:00
René Pfeuffer
cf02192315 Extract committer as trailer in git 2020-06-08 12:21:17 +02:00
René Pfeuffer
77d6784386 Remove unnecessary interfaces 2020-06-02 21:31:44 +02:00
René Pfeuffer
4c73f27389 Make reclaimer and initializer top level classes 2020-06-02 21:31:44 +02:00
René Pfeuffer
f74b7626eb New package for working copy related classes 2020-06-02 21:31:44 +02:00
René Pfeuffer
8bd17a03d7 Use better names
The name 'workdir' is now only used for a concrete directory, where a
clone can be created in. The new name 'working copy' is used for a
concrete instance of such a directory, where a clone has been created in
for a repository stored in SCM-Manager. Such a working copy can be
cached and reused for further changes.
2020-06-02 21:31:43 +02:00
René Pfeuffer
e5f4ad72d6 Add test for git reclaim of workdir 2020-06-02 21:31:43 +02:00