Browse Source
* master:
JGit CLI: allow to call git init with specific directory
Redirect all Show output to outs
Support git config [include] section with absolute path(s)
Added filter for merge and non-merges commits.
[findBugs] Prevent potential NPE in FS_POSIX.readUmask()
[findBugs] Fix calculation of host header in SignerV4
Update Orbit repository to S20160518051658 for Neon RC2
Fix StashApply regarding handling of untracked files
GC should not pack objects only referenced by ORIG_HEAD,...
Make sure to overwrite files when "reset --hard" detects conflicts
Allow setting FileMode to executable when applying patches in
ApplyCommand
Fix config value get to return last instead of 1st just like git
Remove UTF-8 checking duplication in Config lib subclasses
Update Maven plugins
Fix type parameter in javadoc in TestRepository.delete(String ref)
TestRepository: Add delete() method
Make BaseReceivePack.setAtomic public
ReceivePack: Pass atomic setting from client to BatchRefUpdate
Change-Id: I5c9c5b7ccb23fb48b44b3da10b2c5d876d043d24
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.4
Matthias Sohn
9 years ago
40 changed files with 672 additions and 57 deletions
@ -1,7 +1,7 @@
|
||||
target "jgit-4.6" with source configurePhase |
||||
|
||||
include "projects/jetty-9.2.13.tpd" |
||||
include "orbit/S20160501200945-Neon.tpd" |
||||
include "orbit/S20160518051658-Neon.tpd" |
||||
|
||||
location "http://download.eclipse.org/releases/neon/" { |
||||
org.eclipse.osgi lazy |
||||
|
||||
@ -0,0 +1,90 @@
|
||||
/* |
||||
* Copyright (C) 2016, Rüdiger Herrmann <ruediger.herrmann@gmx.de> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.pgm; |
||||
|
||||
import static org.junit.Assert.assertArrayEquals; |
||||
|
||||
import java.io.File; |
||||
|
||||
import org.eclipse.jgit.lib.CLIRepositoryTestCase; |
||||
import org.eclipse.jgit.lib.Constants; |
||||
import org.junit.Rule; |
||||
import org.junit.Test; |
||||
import org.junit.rules.TemporaryFolder; |
||||
|
||||
public class InitTest extends CLIRepositoryTestCase { |
||||
|
||||
@Rule |
||||
public final TemporaryFolder tempFolder = new TemporaryFolder(); |
||||
|
||||
@Test |
||||
public void testInitBare() throws Exception { |
||||
File directory = tempFolder.getRoot(); |
||||
|
||||
String[] result = execute( |
||||
"git init '" + directory.getCanonicalPath() + "' --bare"); |
||||
|
||||
String[] expecteds = new String[] { |
||||
"Initialized empty Git repository in " |
||||
+ directory.getCanonicalPath(), |
||||
"" }; |
||||
assertArrayEquals(expecteds, result); |
||||
} |
||||
|
||||
@Test |
||||
public void testInitDirectory() throws Exception { |
||||
File workDirectory = tempFolder.getRoot(); |
||||
File gitDirectory = new File(workDirectory, Constants.DOT_GIT); |
||||
|
||||
String[] result = execute( |
||||
"git init '" + workDirectory.getCanonicalPath() + "'"); |
||||
|
||||
String[] expecteds = new String[] { |
||||
"Initialized empty Git repository in " |
||||
+ gitDirectory.getCanonicalPath(), |
||||
"" }; |
||||
assertArrayEquals(expecteds, result); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,9 @@
|
||||
diff --git a/M1 b/M1
|
||||
new file mode 100755
|
||||
index 0000000..de98044
|
||||
--- /dev/null
|
||||
+++ b/M1
|
||||
@@ -0,0 +1,3 @@
|
||||
+a
|
||||
+b
|
||||
+c
|
||||
@ -0,0 +1,3 @@
|
||||
a |
||||
b |
||||
c |
||||
@ -0,0 +1,10 @@
|
||||
diff --git a/M2 b/M2
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index 0000000..de98044
|
||||
--- a/M2
|
||||
+++ b/M2
|
||||
@@ -1,3 +1,1 @@
|
||||
a
|
||||
-b
|
||||
-c
|
||||
@ -0,0 +1 @@
|
||||
a |
||||
@ -0,0 +1,3 @@
|
||||
a |
||||
b |
||||
c |
||||
@ -0,0 +1,10 @@
|
||||
diff --git a/M3 b/M3
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index 0000000..de98044
|
||||
--- a/M3
|
||||
+++ b/M3
|
||||
@@ -1,1 +1,3 @@
|
||||
a
|
||||
+b
|
||||
+c
|
||||
@ -0,0 +1,3 @@
|
||||
a |
||||
b |
||||
c |
||||
@ -0,0 +1 @@
|
||||
a |
||||
Loading…
Reference in new issue