Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-20 11:01:35 +01:00
Code Issues Packages Projects Releases Activity
11,134 Commits 42 Branches 215 Tags
afbac9aa7b0b618e4caffbb829c33e97c795e7ea
Commit Graph

31 Commits

Author SHA1 Message Date
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
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
Konstantin Schaper
6d409c65c0 initial implementation 2020-08-25 14:45:48 +02:00
René Pfeuffer
e5f4ad72d6 Add test for git reclaim of workdir 2020-06-02 21:31:43 +02:00
René Pfeuffer
dbc58784e4 Fix path handling 2020-05-19 09:56:24 +02:00
Rene Pfeuffer
d6b60afeac Merge with default 2020-01-08 11:22:47 +01:00
Rene Pfeuffer
88fb31c47b Add unit test for diff command 
This new tests ensures, that changes on a feature branch will be shown
in a diff even though the integration branch has been merged into the
feature branch.
 2020-01-07 15:49:35 +01:00
Rene Pfeuffer
a1ec0b0636 Merge with 2.0.0-m3 2019-11-11 13:18:07 +01:00
Rene Pfeuffer
df144e298c Add POC for diff against temporary merge result 
This fails for files with merge conflicts, because results for these
files are not added to git and therefore there is no blob the diff
formatter can use to render. This has somehow to be fixed by making
jgit use the version from the file system. Taking a look at the
implementation of Git.clone() might help here.
 2019-11-06 17:30:02 +01:00
Eduard Heimbuch
4b024c650c implement squash to mergeCommand 2019-11-04 15:16:37 +01:00
Rene Pfeuffer
4cb79ffe5a Detect proper merge and prevent empty commits 2019-10-16 14:59:38 +02:00
Rene Pfeuffer
ffcb96820e Merge with 2.0.0-m3 2019-10-08 10:49:15 +02:00
René Pfeuffer
100c73c336 Add missing test repository 2019-10-06 19:41:23 +02:00
René Pfeuffer
3ac267c2ab Add missing test repository 2019-10-06 16:57:45 +02:00
René Pfeuffer
7e5e45b488 Detect and load lfs files 2019-09-24 20:50:54 +02:00
René Pfeuffer
e649a66423 Fix unit test 2019-04-11 13:52:23 +02:00
René Pfeuffer
b14eadb13d Add missing mockito config file 2019-03-25 16:44:05 +01:00
René Pfeuffer
d82f38e0f9 Fix unit test 2019-03-11 16:00:16 +01:00
René Pfeuffer
3b33b3b0a4 Merge with 2.0.0-m3 2018-12-20 10:55:40 +01:00
René Pfeuffer
547947a1b3 Add zip for test 2018-12-19 14:38:29 +01:00
René Pfeuffer
9e963b6aeb Enrich repository collection, too 2018-12-13 10:00:03 +01:00
René Pfeuffer
bc8c776821 Introduce config rest endpoint for default git branch 2018-12-12 14:12:55 +01:00
René Pfeuffer
e377ce5988 Implement first steps for actual merge 2018-11-07 11:52:49 +01:00
René Pfeuffer
aed4c60296 Add missing unit tests 2018-10-01 12:58:53 +02:00
Johannes Schnatterer
aed70d3544 Git Plugin Config: Create fine-grained configuration permissions. 
No more hard-coded isAdmin() checks.
Also adds more tests.
 2018-08-01 16:21:05 +02:00
Michael Behlendorf
7203fe4668 Implement tests for GitConfigResource 2018-07-19 16:43:29 +02:00
Sebastian Sdorra
5dd684973a read provider implementations from classpath 2012-07-15 16:23:47 +02:00
Sebastian Sdorra
94f46d587e improve unit test repository 2012-06-11 17:37:37 +02:00
Sebastian Sdorra
b4380a0067 added unit tests for git log command 2012-06-11 16:24:14 +02:00
Sebastian Sdorra
01534177c2 added browser support for git submodules 2012-01-07 15:25:22 +01:00