* Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>
From: Jason van Zyl @ 2009-10-01 13:55 UTC (permalink / raw)
To: Mark Struberg; +Cc: Shawn O. Pearce, Jonas Fonseca, Robin Rosenberg, git
In-Reply-To: <138076.57408.qm@web27806.mail.ukl.yahoo.com>
Sorry, what do you want?
A fork of the EGit repository with the EGit specific changes we have
made to use Tycho to build EGit?
Or do you want a fork of the JGit repo with the Maven build (i.e. not
Tycho) changes?
On 2009-10-01, at 4:15 AM, Mark Struberg wrote:
> Can you please create an EGit repo on github.com/sonatype and push
> the JGit changes to a fresh branch in sonatype/JGit ?
>
> txs,
> strub
>
> --- On Thu, 10/1/09, Jason van Zyl <jason@sonatype.com> wrote:
>
>> From: Jason van Zyl <jason@sonatype.com>
>> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the
>> initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de
>> >
>> To: "Mark Struberg" <struberg@yahoo.de>
>> Cc: "Shawn O. Pearce" <spearce@spearce.org>, "Jonas Fonseca" <jonas.fonseca@gmail.com
>> >, "Robin Rosenberg" <robin.rosenberg.lists@dewire.com>, git@vger.kernel.org
>> Date: Thursday, October 1, 2009, 1:16 AM
>>
>> On 2009-09-30, at 4:13 PM, Mark Struberg wrote:
>>
>>> Hi!
>>>
>>> I now squashed all my changes into 2 commits and
>> omitted the eclipse parts. They are available at
>>>
>>> http://github.com/sonatype/JGit/commits/mavenize2
>>>
>>> As Shawn pointed out on IRC, the next step would be to
>> migrate this patch over to the eclipe.org-post branch which
>> I will do tomorrow evening.
>>>
>>
>> I also have a Tycho build for the EGIT part, and I have
>> bundle creation working for the JGIT part. I've already
>> integrated these two builds into our product so it all
>> works. I can put it somewhere as you're ready to absorb it
>> if you want it.
>>
>>> LieGrue,
>>> strub
>>>
>>> --- On Wed, 9/30/09, Shawn O. Pearce <spearce@spearce.org>
>> wrote:
>>>
>>>> From: Shawn O. Pearce <spearce@spearce.org>
>>>> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1:
>> moved over the initial poms from Jasons branch
>> Signed-off-by: Mark Struberg <struberg@yahoo..de>
>>>> To: "Mark Struberg" <struberg@yahoo.de>
>>>> Cc: "Jonas Fonseca" <jonas.fonseca@gmail.com>,
>> "Robin Rosenberg" <robin.rosenberg.lists@dewire.com>,
>> git@vger.kernel.org,
>> "Jason van Zyl" <jvanzyl@sonatype.com>
>>>> Date: Wednesday, September 30, 2009, 11:16 PM
>>>> Mark Struberg <struberg@yahoo.de>
>>>> wrote:
>>>>>> From: Jonas Fonseca <jonas.fonseca@gmail.com>
>>>>>> actually
>>>>>> removes features (by not keeping the JGit
>>>> specific
>>>>>> settings), which
>>>>>> you then try to amend later in the patch
>> series.
>>>>>
>>>>> I'm not sure what JGit specific settings you
>> speak
>>>> about?
>>>>
>>>> I think he's talking about the Eclipse settings
>>>> files? Or is it
>>>> something else?
>>>>
>>>>>> In terms of making the patch series more
>>>> manageable for
>>>>>> you, I think
>>>>>> the best approach is to start with the
>> patches
>>>> not relevant
>>>>>> to the
>>>>>> mavenizing (renaming PathSuffixTestCase).
>>>>>
>>>>> In fact the fix of the PathSuffixTestCase came
>> a few
>>>> days later
>>>>> after I found the reason why I miss a few
>> tests. This
>>>> should be
>>>>> fixed in the current master anyway and has not
>> so much
>>>> todo with
>>>>> the mavenization itself.
>>>>
>>>> But it should be earlier in the series because its
>> easier
>>>> to apply.
>>>> Use rebase -i to swap the order of the patches.
>>>>
>>>>> I had the following in mind: every single
>> commit
>>>> should be
>>>>> compileable and working. So
>> it's not easily
>>>> manageable to move the
>>>>> directory structure in one patch and apply all
>> the
>>>> changes into
>>>>> the poms in another commit.
>>>>
>>>> Well, you need to edit the pom to change the
>> source
>>>> directory and do
>>>> the move in one commit, and then edit the pom
>> further in
>>>> another,
>>>> possibly removing the source directory directories
>> once it
>>>> is the
>>>> standard maven layout.
>>>>
>>>>> We could for sure squash the later few
>> commits, but I
>>>> didn't
>>>>> liked to rebase and push since there have been
>> a few
>>>> forks of the
>>>>> mavenize branch and I hoped I could pull back
>> a few
>>>> commits from
>>>>> others and later do a rebase -i.
>>>>
>>>> True.
>>>>
>>>> At this point we need to rebase the patches on the
>> new
>>>> history in
>>>> the eclipse.org-post branch, which contains a
>> massive
>>>> rename of
>>>> org.spearce to org.eclipse. That may make
>> the tree
>>>> reorg patch in
>>>> your Maven series harder to bring over to the new
>> history,
>>>> sorry.
>>>>
>>>> Worse, we now have to start following the Eclipse
>> IP
>>>> process[1]
>>>> for submissions to JGit...
>>>>
>>>> [1] http://www.eclipse.org/projects/dev_process/ip-process-in-cartoons.php
>>>>
>>>> --Shawn.
>>>> --
>>>> To unsubscribe from this list: send the line
>> "unsubscribe
>>>> git" in
>>>> the body of a message to majordomo@vger.kernel.org
>>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>>
>>>
>>>
>>>
>>>
>>
>> Thanks,
>>
>> Jason
>>
>> ----------------------------------------------------------
>> Jason van Zyl
>> Founder, Apache Maven
>> http://twitter.com/jvanzyl
>> ----------------------------------------------------------
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe
>> git" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>
>
>
Thanks,
Jason
----------------------------------------------------------
Jason van Zyl
Founder, Apache Maven
http://twitter.com/jvanzyl
----------------------------------------------------------
^ permalink raw reply
* Re: gitignore: how to exclude a directory tree from being ignored
From: Peter @ 2009-10-01 13:00 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git
In-Reply-To: <4AC4A310.8000507@viscovery.net>
Johannes Sixt wrote:
> Peter schrieb:
>
>> Hi
>> I want to exclude binaries except in a dir tree that I do not control.
>>
>> In .gitignore I have:
>>
>>
>> I would expect that all *.exe and *.o are ignored except those somewhere
>> in the vendor dir tree.
>> However, the *.exe and *.o in the vendor dir tree are also ignored.
>>
>
> This works for me:
>
> *.exe
> *.o
> !vendor/*.exe
> !vendor/*.o
>
> Note that git-status does not descend into directories from which no files
> are tracked. Therefore, this will work only after you have git-added at
> least one file from vendor/.
>
> git ls-files -o --exclude-standard does descend into the directory.
>
> Furthermore, the !vendor/*.exe patterns are not recursive. Perhaps it is
> easier for you to have a separate vendor/.gitignore that has:
>
> !*.exe
> !*.o
>
> These _are_ recursive.
>
> -- Hannes
>
Thanks a lot, that clarifies the problem for me. As far as I understand now:
1) I can't have just one .gitignore file in the root dir, if I want to
_recursively_ inverse the exclude pattern for a sub dir tree.
In this case, I have to put individual .gitignore files in the sub trees
I want to re-include.
2) In order to see what will be staged, I have to use the :
git ls-files -o --exclude-standard
instead of :
git ls-files -o -i --exclude-from=.gitignore
because the latter won't consider .gitignore patterns in subtree
Peter
^ permalink raw reply
* [JGIT PATCH] Add support for logAllRefUpdates configuration parameter
From: Christian Halstrick @ 2009-10-01 14:13 UTC (permalink / raw)
To: Shawn O. Pearce, Robin Rosenberg; +Cc: git, Christian Halstrick, Matthias Sohn
From: Christian Halstrick <christian.halstrick@sap.com>
Honor the configuration parameter core.logAllRefUpdates when writing reflogs.
Instead of writing reflog entries always only write reflogs if this parameter
is set to true or if the corresponding file in the <git-dir>/logs directory
already exists. In other words: if you are updating a ref and this parameter is
set to false and there is no file corresponding to your ref in the
<git-dir>/logs folder then no reflog will be written.
This is a fix for the issue http://code.google.com/p/egit/issues/detail?id=4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
---
.../tst/org/eclipse/jgit/lib/ReflogConfigTest.java | 116 ++++++++++++++++++++
.../src/org/eclipse/jgit/lib/CoreConfig.java | 10 ++
.../src/org/eclipse/jgit/lib/RefLogWriter.java | 18 ++--
.../src/org/eclipse/jgit/lib/Repository.java | 1 +
4 files changed, 137 insertions(+), 8 deletions(-)
create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java
new file mode 100644
index 0000000..6021050
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2009, Christian Halstrick, Matthias Sohn, SAP AG
+ *
+ * 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.lib;
+
+import java.io.IOException;
+
+public class ReflogConfigTest extends RepositoryTestCase {
+ public void testlogAllRefUpdates() throws Exception {
+ long commitTime = 1154236443000L;
+ int tz = -4 * 60;
+ int nrOfReflogs;
+
+ // check how many entries exist in the reflog and turn off writing
+ // reflogs
+ assertTrue(db.getConfig().getCore().isLogAllRefUpdates());
+ nrOfReflogs = db.getReflogReader(Constants.HEAD).getReverseEntries()
+ .size();
+ db.getConfig().setBoolean("core", null, "logAllRefUpdates", false);
+
+ // do one commit and check that reflog size is 0: no reflogs should be
+ // written
+ final Tree t = new Tree(db);
+ addFileToTree(t, "i-am-a-file", "and this is the data in me\n");
+ commit(t, "A Commit\n", new PersonIdent(jauthor, commitTime, tz),
+ new PersonIdent(jcommitter, commitTime, tz));
+ commitTime += 100;
+ assertTrue(
+ "Reflog for HEAD should contain one entry",
+ db.getReflogReader(Constants.HEAD).getReverseEntries().size() == nrOfReflogs);
+
+ // set the logAllRefUpdates parameter to true and check it
+ db.getConfig().setBoolean("core", null, "logAllRefUpdates", true);
+ assertTrue(db.getConfig().getCore().isLogAllRefUpdates());
+
+ // do one commit and check that reflog size is increased
+ addFileToTree(t, "i-am-another-file", "and this is other data in me\n");
+ commit(t, "A Commit\n", new PersonIdent(jauthor, commitTime, tz),
+ new PersonIdent(jcommitter, commitTime, tz));
+ commitTime += 100;
+ assertTrue(
+ "Reflog for HEAD should contain one additional entry",
+ db.getReflogReader(Constants.HEAD).getReverseEntries().size() == nrOfReflogs + 1);
+
+ // set the logAllRefUpdates parameter to false and check it
+ db.getConfig().setBoolean("core", null, "logAllRefUpdates", false);
+ assertFalse(db.getConfig().getCore().isLogAllRefUpdates());
+
+ // do one commit and check that reflog size is 2
+ addFileToTree(t, "i-am-anotheranother-file",
+ "and this is other other data in me\n");
+ commit(t, "A Commit\n", new PersonIdent(jauthor, commitTime, tz),
+ new PersonIdent(jcommitter, commitTime, tz));
+ assertTrue(
+ "Reflog for HEAD should contain two additional entries",
+ db.getReflogReader(Constants.HEAD).getReverseEntries().size() == nrOfReflogs + 2);
+ }
+
+ private void addFileToTree(final Tree t, String filename, String content)
+ throws IOException {
+ FileTreeEntry f = t.addFile(filename);
+ writeTrashFile(f.getName(), content);
+ t.accept(new WriteTree(trash, db), TreeEntry.MODIFIED_ONLY);
+ }
+
+ private void commit(final Tree t, String commitMsg, PersonIdent author,
+ PersonIdent committer) throws IOException {
+ final Commit commit = new Commit(db);
+ commit.setAuthor(author);
+ commit.setCommitter(committer);
+ commit.setMessage(commitMsg);
+ commit.setTree(t);
+ ObjectWriter writer = new ObjectWriter(db);
+ commit.setCommitId(writer.writeCommit(commit));
+
+ int nl = commitMsg.indexOf('\n');
+ final RefUpdate ru = db.updateRef(Constants.HEAD);
+ ru.setNewObjectId(commit.getCommitId());
+ ru.setRefLogMessage("commit : "
+ + ((nl == -1) ? commitMsg : commitMsg.substring(0, nl)), false);
+ ru.forceUpdate();
+ }
+}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java
index d44120a..a945894 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java
@@ -57,9 +57,12 @@ public CoreConfig parse(final Config cfg) {
private final int packIndexVersion;
+ private final boolean logAllRefUpdates;
+
private CoreConfig(final Config rc) {
compression = rc.getInt("core", "compression", DEFAULT_COMPRESSION);
packIndexVersion = rc.getInt("pack", "indexversion", 2);
+ logAllRefUpdates = rc.getBoolean("core", "logAllRefUpdates", true);
}
/**
@@ -77,4 +80,11 @@ public int getCompression() {
public int getPackIndexVersion() {
return packIndexVersion;
}
+
+ /**
+ * @return whether to log all refUpdates
+ */
+ public boolean isLogAllRefUpdates() {
+ return logAllRefUpdates;
+ }
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefLogWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefLogWriter.java
index 4141a13..a473c42 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefLogWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefLogWriter.java
@@ -112,16 +112,18 @@ private static void appendOneRecord(final ObjectId oldId,
final byte[] rec = Constants.encode(r.toString());
final File logdir = new File(db.getDirectory(), Constants.LOGS);
final File reflog = new File(logdir, refName);
- final File refdir = reflog.getParentFile();
+ if (reflog.exists() || db.getConfig().getCore().isLogAllRefUpdates()) {
+ final File refdir = reflog.getParentFile();
- if (!refdir.exists() && !refdir.mkdirs())
- throw new IOException("Cannot create directory " + refdir);
+ if (!refdir.exists() && !refdir.mkdirs())
+ throw new IOException("Cannot create directory " + refdir);
- final FileOutputStream out = new FileOutputStream(reflog, true);
- try {
- out.write(rec);
- } finally {
- out.close();
+ final FileOutputStream out = new FileOutputStream(reflog, true);
+ try {
+ out.write(rec);
+ } finally {
+ out.close();
+ }
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
index f2451d4..1eb5895 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
@@ -187,6 +187,7 @@ public void create(boolean bare) throws IOException {
cfg.setBoolean("core", null, "filemode", true);
if (bare)
cfg.setBoolean("core", null, "bare", true);
+ cfg.setBoolean("core", null, "logAllRefupdates", !bare);
cfg.save();
}
--
1.6.4.msysgit.0
^ permalink raw reply related
* Re: gitignore: how to exclude a directory tree from being ignored
From: Peter @ 2009-10-01 14:48 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git
In-Reply-To: <4AC4AD25.5010708@viscovery.net>
>> 1) I can't have just one .gitignore file in the root dir, if I want to
>> _recursively_ inverse the exclude pattern for a sub dir tree.
>>
>
> No, it's not the inversion of the pattern, but the slash (if it is not at
> the end) that makes the pattern non-recursive.
>
>
from the gitignore manpage:
>> If the pattern ends with a slash, it is removed for the purpose of
the following description, but it would only find a match with a
directory. In other words, foo/ will match a directory foo and paths
underneath it, but will not match a regular file or a symbolic link foo
(this is consistent with the way how pathspec works in general in git). <<
Doesn't this mean, that if I say:
vendor/
matches the directory and ( recursively ) the paths underneath it.?
And, consequently:
!vendor/
inverse the exclusion for vendor ( that is: include ) and everything
that is contained in it ? ( This is obviously not the case, but this is
what I would expect )
>> In this case, I have to put individual .gitignore files in the sub trees
>> I want to re-include.
>>
>
> If you have only the directory vendor/ with no further interesting
> subdirectories, then you can use my first suggestion. But if you have your
> *.exe and *.o distributed over several directories of different depths
> below vendor/, then it might be easier to have a separate
> vendor/.gitignore with recursive patterns (i.e. that do not contain a slash).
>
>
This works for me ( I have indeed distributed them over several dirs )
>> 2) In order to see what will be staged, I have to use the :
>> git ls-files -o --exclude-standard
>> instead of :
>> git ls-files -o -i --exclude-from=.gitignore
>> because the latter won't consider .gitignore patterns in subtree
>>
>
> After reading the documentation, I don't know, and I won't try now ;-)
>
>
At least it seams to work here ..
> -- Hannes
>
Thanks !
^ permalink raw reply
* Re: Alles wird Git, Berlin, Oct 3rd, 2009
From: Johannes Schindelin @ 2009-10-01 15:20 UTC (permalink / raw)
To: Heiko Voigt; +Cc: git
In-Reply-To: <20090930190809.GF567@book.hvoigt.net>
Hi,
On Wed, 30 Sep 2009, Heiko Voigt wrote:
> On Fri, Sep 25, 2009 at 08:19:44AM +0200, Johannes Schindelin wrote:
> > as some of you already know, I will be unable to Git Together with
> > other Gits in California this year. So the only version of such a Git
> > Together I will have this year is the Berlin one.
>
> Just announcing that Jens Lehmann and me will also come. Just added us
> to the wiki page. What about important stuff like coffee during the day?
> Is there access to such things nearby or is it better to bring
> everything needed?
Steffen said that he'll take care of the coffee, I'll make sure there is
some beer.
Feel free to bring whatever you feel is missing, but beware: this Saturday
is a German holiday ;-)
Ciao,
Dscho
^ permalink raw reply
* Re: gitignore: how to exclude a directory tree from being ignored
From: Johannes Sixt @ 2009-10-01 15:25 UTC (permalink / raw)
To: Peter; +Cc: git
In-Reply-To: <4AC4C125.10609@mycircuit.org>
Peter schrieb:
>>> 1) I can't have just one .gitignore file in the root dir, if I want to
>>> _recursively_ inverse the exclude pattern for a sub dir tree.
>>>
>>
>> No, it's not the inversion of the pattern, but the slash (if it is not at
>> the end) that makes the pattern non-recursive.
>>
>>
> from the gitignore manpage:
>>> If the pattern ends with a slash, it is removed for the purpose of
> the following description, but it would only find a match with a
> directory. In other words, foo/ will match a directory foo and paths
> underneath it, but will not match a regular file or a symbolic link foo
> (this is consistent with the way how pathspec works in general in git). <<
>
> Doesn't this mean, that if I say:
> vendor/
> matches the directory and ( recursively ) the paths underneath it.?
The paragraph you are citing is talking about *what* the pattern matches,
but it says nothing about *where* the pattern matches.
When I was saying "recursively", then I was refering to the "where"
aspect, not the "what" aspect.
If you have directories
src/bar/vendor/
src/foo/bar/vendor/
src/vendor/
and you have the file src/.gitignore with the single pattern
vendor/
then it applies to recursively ("where") these directories:
src/bar/vendor/
src/foo/bar/vendor/
src/vendor/
and everything ("what") below them.
But if the same src/.gitignore has only this pattern:
bar/vendor/
then it will not match ("where") recursively and only apply to
src/bar/vendor/
and everything ("what") below it, but will not apply to
src/foo/bar/vendor/
> And, consequently:
> !vendor/
> inverse the exclusion for vendor ( that is: include ) and everything
> that is contained in it ? ( This is obviously not the case, but this is
> what I would expect )
You should update your expectations. ;-)
You think that git starts with the .gitignore files, and somehow applies
the rules that it finds to all files (perhaps recursively).
But it does not work like this; rather it is in the oppsite direction: git
starts with a file name, and then checks the rules in the .gitignore files
that it has available.
For example, take the path "src/vendor/foo.exe". git finds the file
src/.gitignore and there it sees the pattern "*.exe". The pattern matches,
and so git obeys the rule (ignores the file). But the pattern "!vendor/"
does not match (because the path ends with "foo.exe", not "vendor").
Before git had seen the path "src/vendor/foo.exe", it had already seen
"src/vendor". This time the pattern "!vendor/" did match (because the name
is identical *and* it is a directory, as per the cited paragraph) and git
obeyed the rule (which was not to ignore the directory).
-- Hannes
^ permalink raw reply
* Re: gitignore: how to exclude a directory tree from being ignored
From: Peter @ 2009-10-01 16:26 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git
In-Reply-To: <4AC4C9DB.2090907@viscovery.net>
Johannes Sixt wrote:
> Peter schrieb:
>
>>>> 1) I can't have just one .gitignore file in the root dir, if I want to
>>>> _recursively_ inverse the exclude pattern for a sub dir tree.
>>>>
>>>>
>>> No, it's not the inversion of the pattern, but the slash (if it is not at
>>> the end) that makes the pattern non-recursive.
>>>
>>>
>>>
>> from the gitignore manpage:
>>
>>>> If the pattern ends with a slash, it is removed for the purpose of
>>>>
>> the following description, but it would only find a match with a
>> directory. In other words, foo/ will match a directory foo and paths
>> underneath it, but will not match a regular file or a symbolic link foo
>> (this is consistent with the way how pathspec works in general in git). <<
>>
>> Doesn't this mean, that if I say:
>> vendor/
>> matches the directory and ( recursively ) the paths underneath it.?
>>
>
> The paragraph you are citing is talking about *what* the pattern matches,
> but it says nothing about *where* the pattern matches.
>
> When I was saying "recursively", then I was refering to the "where"
> aspect, not the "what" aspect.
>
> If you have directories
>
> src/bar/vendor/
> src/foo/bar/vendor/
> src/vendor/
>
> and you have the file src/.gitignore with the single pattern
>
> vendor/
>
> then it applies to recursively ("where") these directories:
>
> src/bar/vendor/
> src/foo/bar/vendor/
> src/vendor/
>
> and everything ("what") below them.
>
> But if the same src/.gitignore has only this pattern:
>
> bar/vendor/
>
> then it will not match ("where") recursively and only apply to
>
> src/bar/vendor/
>
> and everything ("what") below it, but will not apply to
>
> src/foo/bar/vendor/
>
>
>> And, consequently:
>> !vendor/
>> inverse the exclusion for vendor ( that is: include ) and everything
>> that is contained in it ? ( This is obviously not the case, but this is
>> what I would expect )
>>
>
> You should update your expectations. ;-)
>
> You think that git starts with the .gitignore files, and somehow applies
> the rules that it finds to all files (perhaps recursively).
>
> But it does not work like this; rather it is in the oppsite direction: git
> starts with a file name, and then checks the rules in the .gitignore files
> that it has available.
>
> For example, take the path "src/vendor/foo.exe". git finds the file
> src/.gitignore and there it sees the pattern "*.exe". The pattern matches,
> and so git obeys the rule (ignores the file). But the pattern "!vendor/"
> does not match (because the path ends with "foo.exe", not "vendor").
>
> Before git had seen the path "src/vendor/foo.exe", it had already seen
> "src/vendor". This time the pattern "!vendor/" did match (because the name
> is identical *and* it is a directory, as per the cited paragraph) and git
> obeyed the rule (which was not to ignore the directory).
>
> -- Hannes
>
Ok, In fact, my problem therefore derives from the fact that I can't
specify *what* and *where* for one item in the same .gitignore file. (
all *.o files - what - underneath vendor - where )
*.o
!vendor/
The *.o refers to the *what* and !vendor/ to the *where* and this does
not work. And this seems to be the reasons why we need to split the
rules over different .gitignore files:
in the root .gitignore:
*.o
and in the vendor/.gitignore:
!*.o
does exactly what I want.
To me , the *where* aspect relates indeed to recursion but the *what*
aspect perhaps more to pattern matching...
You should update your expectations. ;-)
Done !
At revision 1238945761623511 :-(
Thanks a lot !
Peter
^ permalink raw reply
* Trying to split repository
From: Josef Wolf @ 2009-10-01 16:03 UTC (permalink / raw)
To: git
Hello,
One of my repositories has grown a subdirectory that I'd like to split off,
so other can use it as a subproject. With the help of google, I found this
solution:
# first extract the library from the original repository
#
git clone --no-hardlinks repository library.tmp
(
cd library.tmp
git filter-branch --subdirectory-filter CF -- --all
git reset --hard
git gc --aggressive
git prune
git gc
git clone --bare . ../library
)
rm -rf library.tmp
# Now remove the library from the original repository, so it can be
# included as a subproject
#
git clone --no-hardlinks repository repository.new.tmp
(
cd repository.new.tmp
git filter-branch \
--index-filter "git rm -r -f --cached --ignore-unmatch CF" \
-- --all
git reset --hard
git gc --aggressive
git prune
git gc
git clone --bare . ../repository.new
)
rm -rf repository.new.tmp
This works fine. But there's one problem, though. "gitk --all" in the new
repository still shows all the history of the removed library. The patch
show no modifications, but the log entry is still there.
Any hints how to get rid of those log entries?
^ permalink raw reply
* Re: Trying to split repository
From: Adam Brewster @ 2009-10-01 16:49 UTC (permalink / raw)
To: Josef Wolf, git
In-Reply-To: <20091001160335.GA26068@raven.wolf.lan>
>
> Any hints how to get rid of those log entries?
git-filter-branch accepts a --prune-empty option that does what I
think you're looking for.
Adam
^ permalink raw reply
* Re: Trying to split repository
From: Tomas Carnecky @ 2009-10-01 16:49 UTC (permalink / raw)
To: Josef Wolf; +Cc: git
In-Reply-To: <20091001160335.GA26068@raven.wolf.lan>
On Oct 1, 2009, at 6:03 PM, Josef Wolf wrote:
> Hello,
>
> One of my repositories has grown a subdirectory that I'd like to
> split off,
> so other can use it as a subproject. With the help of google, I
> found this
> solution:
Take a look at git-subtree (http://github.com/apenwarr/git-subtree).
tom
^ permalink raw reply
* Re: [PATCH 2/2] add NORETURN_PTR for function pointers
From: Erik Faye-Lund @ 2009-10-01 16:57 UTC (permalink / raw)
To: Jeff King; +Cc: Shawn O. Pearce, git, msysgit, gitster, Erik Faye-Lund
In-Reply-To: <20091001081710.GC13436@coredump.intra.peff.net>
On Thu, Oct 1, 2009 at 1:17 AM, Jeff King <peff@peff.net> wrote:
> Thanks, this version and (your 1/2) both look sane to me. The only thing
> missing are some Makefile knobs to tweak this, but I will assume that
> will come as part of a later MSVC-compatibility series.
Thanks for reviewing :)
I sent an additional patch to the msysgit mailing-list that defines
NORETURN for MSVC, but I think it's better to keep it out of git.git
for a little while. There's no Makefile-knobs, it checks for _MSC_VER
(similar to what's done for GCC).
--
Erik "kusma" Faye-Lund
kusmabite@gmail.com
(+47) 986 59 656
^ permalink raw reply
* MSVC build broken (on cygwin)
From: Ramsay Jones @ 2009-10-01 17:11 UTC (permalink / raw)
To: mstormo; +Cc: GIT Mailing-list
Hi Marius,
I know that I'm somewhat late to comment on your recent MSVC
build patches, but I was busy at the time; better late than
never... maybe ;-)
While the patches were traversing the list, I was feeling
somewhat nervous about the effect of the patches on the
cygwin build; in fact I remember thinking that they had
*probably* broken the build. But I was busy...
Well I finally found time, yesterday, to take a closer look.
I spent 10-15 minutes squinting at the code in order to
convince myself that you had in fact *not* broken the cygwin
build. :)
(which I already suspected, since they were committed some time
ago and nobody else had screamed!)
[Note: I was mainly concerned about commit 435bdf8 and, to a
lesser degree, commit 71064e3]
I'm sure you are probably aware of the following, but for the
benefit of others, the following session on cygwin may help to
explain my nervousness:
$ cat -n hello.c
1 #include <stdio.h>
2
3 #ifdef IW_H
4 # include <windows.h>
5 #endif
6
7 int main(int argc, char *argv[])
8 {
9
10 #ifdef __CYGWIN__
11 printf("__CYGWIN__\n");
12 #endif
13 #ifdef __MINGW32__
14 printf("__MINGW32__\n");
15 #endif
16 #ifdef _WIN32
17 printf("_WIN32\n");
18 #endif
19 #ifdef WIN32
20 printf("WIN32\n");
21 #endif
22 printf("Hello world\n");
23 return 0;
24 }
25
$
$ gcc hello.c
$ ./a.exe
__CYGWIN__
Hello world
$
$ gcc -DIW_H hello.c
$ ./a.exe
__CYGWIN__
_WIN32
WIN32
Hello world
$
$ gcc -mno-cygwin hello.c
$ ./a.exe
__MINGW32__
_WIN32
WIN32
Hello world
$
[Note: I don't know if the above is exactly equivalent to an
MSYS/Mingw-gcc installation, but it does, at least, not link with
the cygwin dll]
However, while squinting at the code, I noticed what I think is a
problem with the MSVC build on cygwin. Viz:
$ cl hello.c
[...compiler output snipped...]
$ ./hello.exe
_WIN32
Hello world
$
$ cl -DIW_H hello.c
[...compiler output snipped...]
$ ./hello.exe
_WIN32
WIN32
Hello world
$
$ cl -DWIN32-D_CONSOLE hello.c
[...compiler output snipped...]
$ ./hello.exe
_WIN32
Hello world
$
Note the last compiler command line above. As part of commit 164a5e3,
the Makefile (on line 917) sets the BASIC_CFLAGS macro to contain the
above string. I had expected the compiler to complain about this
malformed -Define (gcc does), but it remains quiet and seems to be
ignoring the parameter entirely. So I tried upping the warning level:
$ cl -W4 -DWIN32-D_CONSOLE hello.c
Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 15.00.30729.01 for 80x86
Copyright (C) Microsoft Corporation. All rights reserved.
hello.c
hello.c(7) : warning C4100: 'argv' : unreferenced formal parameter
hello.c(7) : warning C4100: 'argc' : unreferenced formal parameter
Microsoft (R) Incremental Linker Version 9.00.30729.01
Copyright (C) Microsoft Corporation. All rights reserved.
/out:hello.exe
hello.obj
$ ./hello.exe
_WIN32
Hello world
$
[Note: I also tried the above using the "Visual Studio 2008 command
prompt" with exactly the same result]
So, at least on cygwin with the version of msvc I'm using (see above),
the build should be broken; as a quick check I made the following
change (on top of commit f5c3178):
-- >8 --
diff --git a/git-compat-util.h b/git-compat-util.h
index 8d6e29c..72275a3 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -69,6 +69,8 @@
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
#include <winsock2.h>
#include <windows.h>
+#else
+#error "WIN32 *not* defined in MSVC build"
#endif
#include <unistd.h>
-- >8 --
and then tried to build using msvc, thus:
$ make MSVC=1
GIT_VERSION = 1.6.5.rc1.37.gf5c31.dirty
* new build flags or prefix
CC fast-import.o
fast-import.c
c:\cygwin\home\ramsay\git\git-compat-util.h(73) : fatal error C1189: #error : "WIN32 *not* defined in MSVC build"
[...lots of similar output (940 lines) snipped...]
$
Finally, I removed the above change and applied the patch given below.
Now, I didn't expect this to work because I don't have all of the
dependencies installed, and those that I do have installed are not
where the Makefile expects them to be (eg zlib is at C:\zlib).
However, the build does at least compile all of the C source files, but
then all of the link's fail since it can't find zlib.lib.
[Note: I was a little surprised that it got that far, since I didn't
expect it to find the zlib header files. However, I have set the
INCLUDE environment variable which msvc is respecting! yeah, a bit old
fashioned! Having also set the LIB environment variable, I was then
a bit surprised that the linker didn't find the library; until I
noticed that my library is called libz.lib *not* zlib.lib!]
Note that the patch below includes some line-wrapping which you can
ignore if you like, it just makes the Makefile easier to read.
The only change that matters is inserting a space between -DWIN32 and
-D_CONSOLE.
Anyway, the point is *not* to get the msvc build to work for me; rather
it is to understand why the build *works* for you. ;-)
ATB,
Ramsay Jones
-- >8 --
From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Wed, 30 Sep 2009 20:08:41 +0100
Subject: [PATCH] Fix the MSVC build on cygwin
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
Makefile | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 12defd4..e6ec8ed 100644
--- a/Makefile
+++ b/Makefile
@@ -914,10 +914,17 @@ ifdef MSVC
CC = compat/vcbuild/scripts/clink.pl
AR = compat/vcbuild/scripts/lib.pl
CFLAGS =
- BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32-D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
+ BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild \
+ -Icompat/vcbuild/include -DWIN32 -D_CONSOLE \
+ -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS \
+ -D_CRT_NONSTDC_NO_DEPRECATE
COMPAT_OBJS = compat/msvc.o compat/fnmatch/fnmatch.o compat/winansi.o
- COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -DSTRIP_EXTENSION=\".exe\"
- BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
+ COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H \
+ -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch \
+ -Icompat/regex -Icompat/fnmatch \
+ -DSTRIP_EXTENSION=\".exe\"
+ BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE \
+ -NODEFAULTLIB:MSVCRT.lib
EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
lib =
ifndef DEBUG
--
1.6.4
^ permalink raw reply related
* Re: [PATCH] Fix some printf format warnings
From: Nicolas Pitre @ 2009-10-01 17:29 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Shawn O. Pearce, Junio C Hamano, GIT Mailing-list
In-Reply-To: <4AC3A834.6070208@ramsay1.demon.co.uk>
On Wed, 30 Sep 2009, Ramsay Jones wrote:
>
> commit 51ea551 ("make sure byte swapping is optimal for git"
> 2009-08-18) introduced a "sane definition for ntohl()/htonl()"
> for use on some GNU C platforms. Unfortunately, for some of
> these platforms, this results in the introduction of a problem
> which is essentially the reverse of a problem that commit 6e1c234
> ("Fix some warnings (on cygwin) to allow -Werror" 2008-07-3) was
> intended to fix.
>
> In particular, on platforms where the uint32_t type is defined
> to be unsigned long, the return type of the new ntohl()/htonl()
> is causing gcc to issue printf format warnings, such as:
>
> warning: long unsigned int format, unsigned int arg (arg 3)
>
> (nine such warnings, covering six different files). The earlier
> commit (6e1c234) needed to suppress these same warnings, except
> that the types were in the opposite direction; namely the format
> specifier ("%u") was 'unsigned int' and the argument type (ie the
> return type of ntohl()) was 'long unsigned int' (aka uint32_t).
>
> In order to suppress these warnings, the earlier commit used the
> (C99) PRIu32 format specifier, since the definition of this macro
> is suitable for use with the uint32_t type on that platform.
> This worked because the return type of the (original) platform
> ntohl()/htonl() functions was uint32_t.
>
> In order to suppress these warnings, we change the return type of
> the new byte swapping functions in the compat/bswap.h header file
> from 'unsigned int' to uint32_t.
>
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
> ---
> compat/bswap.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/compat/bswap.h b/compat/bswap.h
> index 7246a12..5cc4acb 100644
> --- a/compat/bswap.h
> +++ b/compat/bswap.h
> @@ -9,7 +9,7 @@
> * Default version that the compiler ought to optimize properly with
> * constant values.
> */
> -static inline unsigned int default_swab32(unsigned int val)
> +static inline uint32_t default_swab32(uint32_t val)
> {
> return (((val & 0xff000000) >> 24) |
> ((val & 0x00ff0000) >> 8) |
> @@ -20,7 +20,7 @@ static inline unsigned int default_swab32(unsigned int val)
> #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
>
> #define bswap32(x) ({ \
> - unsigned int __res; \
> + uint32_t __res; \
> if (__builtin_constant_p(x)) { \
> __res = default_swab32(x); \
> } else { \
> --
> 1.6.4
>
>
^ permalink raw reply
* [PATCH] Fix some printf format warnings
From: Ramsay Jones @ 2009-09-30 18:49 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: nico, Junio C Hamano, GIT Mailing-list
commit 51ea551 ("make sure byte swapping is optimal for git"
2009-08-18) introduced a "sane definition for ntohl()/htonl()"
for use on some GNU C platforms. Unfortunately, for some of
these platforms, this results in the introduction of a problem
which is essentially the reverse of a problem that commit 6e1c234
("Fix some warnings (on cygwin) to allow -Werror" 2008-07-3) was
intended to fix.
In particular, on platforms where the uint32_t type is defined
to be unsigned long, the return type of the new ntohl()/htonl()
is causing gcc to issue printf format warnings, such as:
warning: long unsigned int format, unsigned int arg (arg 3)
(nine such warnings, covering six different files). The earlier
commit (6e1c234) needed to suppress these same warnings, except
that the types were in the opposite direction; namely the format
specifier ("%u") was 'unsigned int' and the argument type (ie the
return type of ntohl()) was 'long unsigned int' (aka uint32_t).
In order to suppress these warnings, the earlier commit used the
(C99) PRIu32 format specifier, since the definition of this macro
is suitable for use with the uint32_t type on that platform.
This worked because the return type of the (original) platform
ntohl()/htonl() functions was uint32_t.
In order to suppress these warnings, we change the return type of
the new byte swapping functions in the compat/bswap.h header file
from 'unsigned int' to uint32_t.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
compat/bswap.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compat/bswap.h b/compat/bswap.h
index 7246a12..5cc4acb 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -9,7 +9,7 @@
* Default version that the compiler ought to optimize properly with
* constant values.
*/
-static inline unsigned int default_swab32(unsigned int val)
+static inline uint32_t default_swab32(uint32_t val)
{
return (((val & 0xff000000) >> 24) |
((val & 0x00ff0000) >> 8) |
@@ -20,7 +20,7 @@ static inline unsigned int default_swab32(unsigned int val)
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
#define bswap32(x) ({ \
- unsigned int __res; \
+ uint32_t __res; \
if (__builtin_constant_p(x)) { \
__res = default_swab32(x); \
} else { \
--
1.6.4
^ permalink raw reply related
* Re: Git push over git protocol for corporate environment
From: Shawn O. Pearce @ 2009-10-01 18:06 UTC (permalink / raw)
To: Marius Storm-Olsen; +Cc: Michael Poole, Eugene Sajine, git
In-Reply-To: <4AC44C55.6080807@gmail.com>
Marius Storm-Olsen <mstormo@gmail.com> wrote:
> Shawn O. Pearce said the following on 01.10.2009 02:06:
>> Michael Poole <mdpoole@troilus.org> wrote:
>>> (Others have mentioned Gerrit. I use that at work, and my only
>>> major wish is that it had per-branch rather than per-project
>>> access controls. It is a vast improvement over the Subversion
>>> system we had before.)
>>
>> You'll be happy to hear _everyone_ is demanding per-branch
>> controls, I have to do it before the end of the year, maybe even
>> before the end of the month...
>
> Ugh, any pointers on this one? Does this mean that you're planning to
> add this sort of control in git itself, or just some way to facilitate
> the setting of owner/group on individual ref files? What about packed
> refs?
I guess you don't know how Gerrit Code Review works, or missed that
I was talking about Gerrit and not git.
Gerrit behaves like Gitosis, it owns the repositories under its care,
and (in general) nobody else is allowed to read or write to them
except the Gerrit daemon process. That process is running JGit,
not git.git, which means I have full control over the entire code
that serves that repository.
We already have write level control to branches in that JGit has
per-ref hook support similar to what the update hook provides in git.
It doesn't actually use the update hook, its an interface API the
server implements and pushes down into the JGit library, and it has
more control over the response issued to the client, but we get the
same result. I'm just missing a UI that allows an administrator to
configure that implementation's decision making on a per-ref basis.
We don't yet have read level control to read branches, but this
is fairly trivial to implement. I just need an interface API
that can filter the refs before we advertise them to the client.
Given my expand refs protocal extension that I started working on
(but have not yet finished) I'd need something like that in JGit
anyway just to implement the expand refs behavior. Teaching it to
further filter refs by who can read what is then trivial.
--
Shawn.
^ permalink raw reply
* Re: [JGIT PATCH 0/5] jgit diff
From: Shawn O. Pearce @ 2009-10-01 18:47 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <cover.1251974493u.git.johannes.schindelin@gmx.de>
Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
> This patch series provides a rudimentary, working implementation of "jgit
> diff". It does not provide all modes of "git diff" -- by far! -- but it
> is robust, and should provide a good starting point for further work.
I have rebased this patch series on our new JGit history, and then
opened a bug at eclipse.org to get it through the IP review process:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=291083
--
Shawn.
^ permalink raw reply
* [PATCH 1/2] do not mangle short options which take arguments
From: Clemens Buchacher @ 2009-10-01 20:16 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20090925233226.GC14660@spearce.org>
Instead of
$ git commit -a -ammend
[work ce38944] mend
1 files changed, 2 insertions(+), 0 deletions(-)
we now get
$ git commit -a -ammend
error: switch `m' must not be mangled with other options
usage: git commit [options] [--] <filepattern>...
[...]
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
---
On Fri, Sep 25, 2009 at 04:32:26PM -0700, Shawn O. Pearce wrote:
> I wonder, should the -m flag on commit not allow cuddling its
> value against the switch when its combined in short form with
> other switches?
Here we go.
Clemens
parse-options.c | 16 ++++++++++++----
t/t0040-parse-options.sh | 12 ++++++++++++
t/t3701-add-interactive.sh | 2 +-
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index a64a4d6..4f16f37 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -5,6 +5,7 @@
#define OPT_SHORT 1
#define OPT_UNSET 2
+#define OPT_MANY 4
static int opterror(const struct option *opt, const char *reason, int flags)
{
@@ -43,9 +44,12 @@ static int get_value(struct parse_opt_ctx_t *p,
const struct option *opt, int flags)
{
const char *s, *arg;
+ const int many = flags & OPT_MANY;
const int unset = flags & OPT_UNSET;
int err;
+ if (many && !(opt->flags & PARSE_OPT_NOARG))
+ return opterror(opt, "must not be mangled with other options", flags);
if (unset && p->opt)
return opterror(opt, "takes no value", flags);
if (unset && (opt->flags & PARSE_OPT_NONEG))
@@ -149,14 +153,18 @@ static int get_value(struct parse_opt_ctx_t *p,
}
}
-static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option *options)
+static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option
+ *options, int many)
{
const struct option *numopt = NULL;
+ int flags = OPT_SHORT;
+ if (many)
+ flags |= OPT_MANY;
for (; options->type != OPTION_END; options++) {
if (options->short_name == *p->opt) {
p->opt = p->opt[1] ? p->opt + 1 : NULL;
- return get_value(p, options, OPT_SHORT);
+ return get_value(p, options, flags);
}
/*
@@ -374,7 +382,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
ctx->opt = arg + 1;
if (internal_help && *ctx->opt == 'h')
return parse_options_usage(usagestr, options);
- switch (parse_short_opt(ctx, options)) {
+ switch (parse_short_opt(ctx, options, 0)) {
case -1:
return parse_options_usage(usagestr, options);
case -2:
@@ -385,7 +393,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
while (ctx->opt) {
if (internal_help && *ctx->opt == 'h')
return parse_options_usage(usagestr, options);
- switch (parse_short_opt(ctx, options)) {
+ switch (parse_short_opt(ctx, options, 1)) {
case -1:
return parse_options_usage(usagestr, options);
case -2:
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index bbc821e..86eb350 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -315,4 +315,16 @@ test_expect_success 'OPT_NUMBER_CALLBACK() works' '
test_cmp expect output
'
+cat > mangle.err << EOF
+error: switch \`s' must not be mangled with other options
+EOF
+
+cat mangle.err expect.err > expect-mangle.err
+
+test_expect_success 'do not mangle options which require arguments' '
+ test_must_fail test-parse-options -bs123 > output 2> output.err &&
+ ! test -s output &&
+ test_cmp expect-mangle.err output.err
+'
+
test_done
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 62fd65e..208a134 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -207,7 +207,7 @@ index b6f2c08..61b9053 100755
EOF
# Test splitting the first patch, then adding both
test_expect_success 'add first line works' '
- git commit -am "clear local changes" &&
+ git commit -a -m "clear local changes" &&
git apply patch &&
(echo s; echo y; echo y) | git add -p file &&
git diff --cached > diff &&
--
1.6.5.rc1.214.g13c5a
^ permalink raw reply related
* [PATCH 2/2] allow mangling short options which take integer arguments
From: Clemens Buchacher @ 2009-10-01 20:23 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20091001201648.GA12175@localhost>
This patch allows you to do things like for example
$ git <cmd> -bn100
where -b is a boolean and -n is an integer option.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
---
parse-options.c | 2 +-
parse-options.h | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index 4f16f37..bfe01ee 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -48,7 +48,7 @@ static int get_value(struct parse_opt_ctx_t *p,
const int unset = flags & OPT_UNSET;
int err;
- if (many && !(opt->flags & PARSE_OPT_NOARG))
+ if (many && !(opt->flags & (PARSE_OPT_NOARG | PARSE_OPT_MANY)))
return opterror(opt, "must not be mangled with other options", flags);
if (unset && p->opt)
return opterror(opt, "takes no value", flags);
diff --git a/parse-options.h b/parse-options.h
index f295a2c..33ce529 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -37,6 +37,7 @@ enum parse_opt_option_flags {
PARSE_OPT_NODASH = 32,
PARSE_OPT_LITERAL_ARGHELP = 64,
PARSE_OPT_NEGHELP = 128,
+ PARSE_OPT_MANY = 256,
};
struct option;
@@ -84,6 +85,8 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
* PARSE_OPT_NEGHELP: says that the long option should always be shown with
* the --no prefix in the usage message. Sometimes
* useful for users of OPTION_NEGBIT.
+ * PARSE_OPT_MANY: the short option may be mangled, despite a possible
+ * argument.
*
* `callback`::
* pointer to the callback to use for OPTION_CALLBACK.
@@ -121,7 +124,7 @@ struct option {
(h), PARSE_OPT_NOARG, NULL, (i) }
#define OPT_SET_PTR(s, l, v, h, p) { OPTION_SET_PTR, (s), (l), (v), NULL, \
(h), PARSE_OPT_NOARG, NULL, (p) }
-#define OPT_INTEGER(s, l, v, h) { OPTION_INTEGER, (s), (l), (v), "n", (h) }
+#define OPT_INTEGER(s, l, v, h) { OPTION_INTEGER, (s), (l), (v), "n", (h), PARSE_OPT_MANY }
#define OPT_STRING(s, l, v, a, h) { OPTION_STRING, (s), (l), (v), (a), (h) }
#define OPT_DATE(s, l, v, h) \
{ OPTION_CALLBACK, (s), (l), (v), "time",(h), 0, \
--
1.6.5.rc1.214.g13c5a
^ permalink raw reply related
* [JGIT PATCH] mavenisation of the eclipse.org branch
From: Mark Struberg @ 2009-10-01 20:32 UTC (permalink / raw)
To: git, spearce, jonas.fonseca, robin.rosenberg.lists; +Cc: Mark Struberg
Hi!
I did all the work of the last weeks again on the eclipse.org branch.
This work is also available via git at
http://github.com/sonatype/JGit/commits/eclipse.org.mavenized
LieGrue,
strub
Mark Struberg (1):
mavenizing JGit Signed-off-by: Mark Struberg <struberg@yahoo.de>
.gitignore | 1 +
{org.eclipse.jgit => jgit-core}/.classpath | 0
{org.eclipse.jgit => jgit-core}/.fbprefs | 0
jgit-core/.gitignore | 2 +
{org.eclipse.jgit => jgit-core}/.project | 0
.../.settings/org.eclipse.core.resources.prefs | 0
.../.settings/org.eclipse.core.runtime.prefs | 0
.../.settings/org.eclipse.jdt.core.prefs | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
{org.eclipse.jgit => jgit-core}/build.properties | 0
.../findBugs/FindBugsExcludeFilter.xml | 0
...e.jgit.core--All-External-Tests (Java 6).launch | 0
...rg.eclipse.jgit.core--All-External-Tests.launch | 0
...rg.eclipse.jgit.core--All-Tests (Java 6).launch | 0
.../org.eclipse.jgit.core--All-Tests.launch | 0
{org.eclipse.jgit => jgit-core}/plugin.properties | 0
jgit-core/pom.xml | 141 +++++++++
.../org/eclipse/jgit/awtui/AWTPlotRenderer.java | 0
.../org/eclipse/jgit/awtui/AwtAuthenticator.java | 0
.../org/eclipse/jgit/awtui/CommitGraphPane.java | 0
.../org/eclipse/jgit/awtui/SwingCommitList.java | 0
.../java}/org/eclipse/jgit/diff/DiffFormatter.java | 0
.../src/main/java}/org/eclipse/jgit/diff/Edit.java | 0
.../main/java}/org/eclipse/jgit/diff/EditList.java | 0
.../main/java}/org/eclipse/jgit/diff/RawText.java | 0
.../main/java}/org/eclipse/jgit/diff/Sequence.java | 0
.../eclipse/jgit/dircache/BaseDirCacheEditor.java | 0
.../java}/org/eclipse/jgit/dircache/DirCache.java | 0
.../jgit/dircache/DirCacheBuildIterator.java | 0
.../org/eclipse/jgit/dircache/DirCacheBuilder.java | 0
.../org/eclipse/jgit/dircache/DirCacheEditor.java | 0
.../org/eclipse/jgit/dircache/DirCacheEntry.java | 0
.../eclipse/jgit/dircache/DirCacheIterator.java | 0
.../org/eclipse/jgit/dircache/DirCacheTree.java | 0
.../jgit/errors/CheckoutConflictException.java | 0
.../org/eclipse/jgit/errors/CompoundException.java | 0
.../jgit/errors/ConfigInvalidException.java | 0
.../jgit/errors/CorruptObjectException.java | 0
.../eclipse/jgit/errors/EntryExistsException.java | 0
.../jgit/errors/GitlinksNotSupportedException.java | 0
.../jgit/errors/IncorrectObjectTypeException.java | 0
.../jgit/errors/InvalidObjectIdException.java | 0
.../jgit/errors/InvalidPatternException.java | 0
.../errors/MissingBundlePrerequisiteException.java | 0
.../jgit/errors/MissingObjectException.java | 0
.../jgit/errors/NoClosingBracketException.java | 0
.../jgit/errors/NoRemoteRepositoryException.java | 0
.../eclipse/jgit/errors/NotSupportedException.java | 0
.../jgit/errors/ObjectWritingException.java | 0
.../eclipse/jgit/errors/PackInvalidException.java | 0
.../eclipse/jgit/errors/PackMismatchException.java | 0
.../eclipse/jgit/errors/PackProtocolException.java | 0
.../jgit/errors/RepositoryNotFoundException.java | 0
.../org/eclipse/jgit/errors/RevWalkException.java | 0
.../jgit/errors/RevisionSyntaxException.java | 0
.../org/eclipse/jgit/errors/StopWalkException.java | 0
.../jgit/errors/SymlinksNotSupportedException.java | 0
.../eclipse/jgit/errors/TransportException.java | 0
.../eclipse/jgit/errors/UnmergedPathException.java | 0
.../org/eclipse/jgit/fnmatch/AbstractHead.java | 0
.../org/eclipse/jgit/fnmatch/CharacterHead.java | 0
.../org/eclipse/jgit/fnmatch/FileNameMatcher.java | 0
.../java}/org/eclipse/jgit/fnmatch/GroupHead.java | 0
.../main/java}/org/eclipse/jgit/fnmatch/Head.java | 0
.../java}/org/eclipse/jgit/fnmatch/LastHead.java | 0
.../jgit/fnmatch/RestrictedWildCardHead.java | 0
.../org/eclipse/jgit/fnmatch/WildCardHead.java | 0
.../org/eclipse/jgit/lib/AbbreviatedObjectId.java | 0
.../eclipse/jgit/lib/AbstractIndexTreeVisitor.java | 0
.../jgit/lib/AlternateRepositoryDatabase.java | 0
.../java}/org/eclipse/jgit/lib/AnyObjectId.java | 0
.../java}/org/eclipse/jgit/lib/BinaryDelta.java | 0
.../org/eclipse/jgit/lib/BlobBasedConfig.java | 0
.../org/eclipse/jgit/lib/ByteArrayWindow.java | 0
.../org/eclipse/jgit/lib/ByteBufferWindow.java | 0
.../java}/org/eclipse/jgit/lib/ByteWindow.java | 0
.../main/java}/org/eclipse/jgit/lib/Commit.java | 0
.../main/java}/org/eclipse/jgit/lib/Config.java | 0
.../main/java}/org/eclipse/jgit/lib/Constants.java | 0
.../java}/org/eclipse/jgit/lib/CoreConfig.java | 0
.../jgit/lib/DeltaOfsPackedObjectLoader.java | 0
.../eclipse/jgit/lib/DeltaPackedObjectLoader.java | 0
.../jgit/lib/DeltaRefPackedObjectLoader.java | 0
.../org/eclipse/jgit/lib/FileBasedConfig.java | 0
.../main/java}/org/eclipse/jgit/lib/FileMode.java | 0
.../java}/org/eclipse/jgit/lib/FileTreeEntry.java | 0
.../java}/org/eclipse/jgit/lib/ForceModified.java | 0
.../main/java}/org/eclipse/jgit/lib/GitIndex.java | 0
.../org/eclipse/jgit/lib/GitlinkTreeEntry.java | 0
.../org/eclipse/jgit/lib/IndexChangedEvent.java | 0
.../main/java}/org/eclipse/jgit/lib/IndexDiff.java | 0
.../org/eclipse/jgit/lib/IndexTreeVisitor.java | 0
.../org/eclipse/jgit/lib/IndexTreeWalker.java | 0
.../java}/org/eclipse/jgit/lib/InflaterCache.java | 0
.../main/java}/org/eclipse/jgit/lib/LockFile.java | 0
.../org/eclipse/jgit/lib/MutableObjectId.java | 0
.../org/eclipse/jgit/lib/NullProgressMonitor.java | 0
.../java}/org/eclipse/jgit/lib/ObjectChecker.java | 0
.../java}/org/eclipse/jgit/lib/ObjectDatabase.java | 0
.../org/eclipse/jgit/lib/ObjectDirectory.java | 0
.../main/java}/org/eclipse/jgit/lib/ObjectId.java | 0
.../org/eclipse/jgit/lib/ObjectIdSubclassMap.java | 0
.../java}/org/eclipse/jgit/lib/ObjectLoader.java | 0
.../java}/org/eclipse/jgit/lib/ObjectWriter.java | 0
.../java}/org/eclipse/jgit/lib/OffsetCache.java | 0
.../main/java}/org/eclipse/jgit/lib/PackFile.java | 0
.../main/java}/org/eclipse/jgit/lib/PackIndex.java | 0
.../java}/org/eclipse/jgit/lib/PackIndexV1.java | 0
.../java}/org/eclipse/jgit/lib/PackIndexV2.java | 0
.../org/eclipse/jgit/lib/PackIndexWriter.java | 0
.../org/eclipse/jgit/lib/PackIndexWriterV1.java | 0
.../org/eclipse/jgit/lib/PackIndexWriterV2.java | 0
.../main/java}/org/eclipse/jgit/lib/PackLock.java | 0
.../org/eclipse/jgit/lib/PackOutputStream.java | 0
.../org/eclipse/jgit/lib/PackReverseIndex.java | 0
.../java}/org/eclipse/jgit/lib/PackWriter.java | 0
.../org/eclipse/jgit/lib/PackedObjectLoader.java | 0
.../java}/org/eclipse/jgit/lib/PersonIdent.java | 0
.../org/eclipse/jgit/lib/ProgressMonitor.java | 0
.../src/main/java}/org/eclipse/jgit/lib/Ref.java | 0
.../java}/org/eclipse/jgit/lib/RefComparator.java | 0
.../java}/org/eclipse/jgit/lib/RefDatabase.java | 0
.../java}/org/eclipse/jgit/lib/RefLogWriter.java | 0
.../main/java}/org/eclipse/jgit/lib/RefRename.java | 0
.../main/java}/org/eclipse/jgit/lib/RefUpdate.java | 0
.../main/java}/org/eclipse/jgit/lib/RefWriter.java | 0
.../java}/org/eclipse/jgit/lib/ReflogReader.java | 0
.../org/eclipse/jgit/lib/RefsChangedEvent.java | 0
.../java}/org/eclipse/jgit/lib/Repository.java | 0
.../org/eclipse/jgit/lib/RepositoryAdapter.java | 0
.../org/eclipse/jgit/lib/RepositoryCache.java | 0
.../eclipse/jgit/lib/RepositoryChangedEvent.java | 0
.../org/eclipse/jgit/lib/RepositoryConfig.java | 0
.../org/eclipse/jgit/lib/RepositoryListener.java | 0
.../org/eclipse/jgit/lib/RepositoryState.java | 0
.../org/eclipse/jgit/lib/SymlinkTreeEntry.java | 0
.../src/main/java}/org/eclipse/jgit/lib/Tag.java | 0
.../org/eclipse/jgit/lib/TextProgressMonitor.java | 0
.../java}/org/eclipse/jgit/lib/TransferConfig.java | 0
.../src/main/java}/org/eclipse/jgit/lib/Tree.java | 0
.../main/java}/org/eclipse/jgit/lib/TreeEntry.java | 0
.../java}/org/eclipse/jgit/lib/TreeIterator.java | 0
.../java}/org/eclipse/jgit/lib/TreeVisitor.java | 0
.../jgit/lib/TreeVisitorWithCurrentDirectory.java | 0
.../main/java}/org/eclipse/jgit/lib/Treeish.java | 0
.../org/eclipse/jgit/lib/UnpackedObjectCache.java | 0
.../org/eclipse/jgit/lib/UnpackedObjectLoader.java | 0
.../java}/org/eclipse/jgit/lib/UserConfig.java | 0
.../eclipse/jgit/lib/WholePackedObjectLoader.java | 0
.../java}/org/eclipse/jgit/lib/WindowCache.java | 0
.../org/eclipse/jgit/lib/WindowCacheConfig.java | 0
.../java}/org/eclipse/jgit/lib/WindowCursor.java | 0
.../org/eclipse/jgit/lib/WorkDirCheckout.java | 0
.../main/java}/org/eclipse/jgit/lib/WriteTree.java | 0
.../org/eclipse/jgit/merge/MergeStrategy.java | 0
.../main/java}/org/eclipse/jgit/merge/Merger.java | 0
.../org/eclipse/jgit/merge/StrategyOneSided.java | 0
.../jgit/merge/StrategySimpleTwoWayInCore.java | 0
.../eclipse/jgit/merge/ThreeWayMergeStrategy.java | 0
.../org/eclipse/jgit/merge/ThreeWayMerger.java | 0
.../java}/org/eclipse/jgit/patch/BinaryHunk.java | 0
.../org/eclipse/jgit/patch/CombinedFileHeader.java | 0
.../org/eclipse/jgit/patch/CombinedHunkHeader.java | 0
.../java}/org/eclipse/jgit/patch/FileHeader.java | 0
.../java}/org/eclipse/jgit/patch/FormatError.java | 0
.../java}/org/eclipse/jgit/patch/HunkHeader.java | 0
.../main/java}/org/eclipse/jgit/patch/Patch.java | 0
.../eclipse/jgit/revplot/AbstractPlotRenderer.java | 0
.../java}/org/eclipse/jgit/revplot/PlotCommit.java | 0
.../org/eclipse/jgit/revplot/PlotCommitList.java | 0
.../java}/org/eclipse/jgit/revplot/PlotLane.java | 0
.../java}/org/eclipse/jgit/revplot/PlotWalk.java | 0
.../org/eclipse/jgit/revwalk/AbstractRevQueue.java | 0
.../org/eclipse/jgit/revwalk/BlockObjQueue.java | 0
.../org/eclipse/jgit/revwalk/BlockRevQueue.java | 0
.../eclipse/jgit/revwalk/BoundaryGenerator.java | 0
.../org/eclipse/jgit/revwalk/DateRevQueue.java | 0
.../org/eclipse/jgit/revwalk/DelayRevQueue.java | 0
.../org/eclipse/jgit/revwalk/EndGenerator.java | 0
.../org/eclipse/jgit/revwalk/FIFORevQueue.java | 0
.../jgit/revwalk/FixUninterestingGenerator.java | 0
.../java}/org/eclipse/jgit/revwalk/FooterKey.java | 0
.../java}/org/eclipse/jgit/revwalk/FooterLine.java | 0
.../java}/org/eclipse/jgit/revwalk/Generator.java | 0
.../org/eclipse/jgit/revwalk/LIFORevQueue.java | 0
.../eclipse/jgit/revwalk/MergeBaseGenerator.java | 0
.../java}/org/eclipse/jgit/revwalk/ObjectWalk.java | 0
.../org/eclipse/jgit/revwalk/PendingGenerator.java | 0
.../java}/org/eclipse/jgit/revwalk/RevBlob.java | 0
.../java}/org/eclipse/jgit/revwalk/RevCommit.java | 0
.../org/eclipse/jgit/revwalk/RevCommitList.java | 0
.../java}/org/eclipse/jgit/revwalk/RevFlag.java | 0
.../java}/org/eclipse/jgit/revwalk/RevFlagSet.java | 0
.../java}/org/eclipse/jgit/revwalk/RevObject.java | 0
.../org/eclipse/jgit/revwalk/RevObjectList.java | 0
.../java}/org/eclipse/jgit/revwalk/RevSort.java | 0
.../java}/org/eclipse/jgit/revwalk/RevTag.java | 0
.../java}/org/eclipse/jgit/revwalk/RevTree.java | 0
.../java}/org/eclipse/jgit/revwalk/RevWalk.java | 0
.../org/eclipse/jgit/revwalk/RewriteGenerator.java | 0
.../eclipse/jgit/revwalk/RewriteTreeFilter.java | 0
.../org/eclipse/jgit/revwalk/StartGenerator.java | 0
.../eclipse/jgit/revwalk/TopoSortGenerator.java | 0
.../eclipse/jgit/revwalk/filter/AndRevFilter.java | 0
.../jgit/revwalk/filter/AuthorRevFilter.java | 0
.../jgit/revwalk/filter/CommitTimeRevFilter.java | 0
.../jgit/revwalk/filter/CommitterRevFilter.java | 0
.../jgit/revwalk/filter/MessageRevFilter.java | 0
.../eclipse/jgit/revwalk/filter/NotRevFilter.java | 0
.../eclipse/jgit/revwalk/filter/OrRevFilter.java | 0
.../jgit/revwalk/filter/PatternMatchRevFilter.java | 0
.../org/eclipse/jgit/revwalk/filter/RevFilter.java | 0
.../eclipse/jgit/revwalk/filter/RevFlagFilter.java | 0
.../jgit/revwalk/filter/SubStringRevFilter.java | 0
.../java}/org/eclipse/jgit/transport/AmazonS3.java | 0
.../org/eclipse/jgit/transport/BaseConnection.java | 0
.../jgit/transport/BaseFetchConnection.java | 0
.../eclipse/jgit/transport/BasePackConnection.java | 0
.../jgit/transport/BasePackFetchConnection.java | 0
.../jgit/transport/BasePackPushConnection.java | 0
.../jgit/transport/BundleFetchConnection.java | 0
.../org/eclipse/jgit/transport/BundleWriter.java | 0
.../org/eclipse/jgit/transport/Connection.java | 0
.../java}/org/eclipse/jgit/transport/Daemon.java | 0
.../org/eclipse/jgit/transport/DaemonClient.java | 0
.../org/eclipse/jgit/transport/DaemonService.java | 0
.../jgit/transport/DefaultSshSessionFactory.java | 0
.../eclipse/jgit/transport/FetchConnection.java | 0
.../eclipse/jgit/transport/FetchHeadRecord.java | 0
.../org/eclipse/jgit/transport/FetchProcess.java | 0
.../org/eclipse/jgit/transport/FetchResult.java | 0
.../org/eclipse/jgit/transport/HttpTransport.java | 0
.../org/eclipse/jgit/transport/IndexPack.java | 0
.../java}/org/eclipse/jgit/transport/LongMap.java | 0
.../org/eclipse/jgit/transport/OpenSshConfig.java | 0
.../eclipse/jgit/transport/OperationResult.java | 0
.../org/eclipse/jgit/transport/PackTransport.java | 0
.../eclipse/jgit/transport/PackedObjectInfo.java | 0
.../org/eclipse/jgit/transport/PacketLineIn.java | 0
.../org/eclipse/jgit/transport/PacketLineOut.java | 0
.../eclipse/jgit/transport/PostReceiveHook.java | 0
.../org/eclipse/jgit/transport/PreReceiveHook.java | 0
.../org/eclipse/jgit/transport/PushConnection.java | 0
.../org/eclipse/jgit/transport/PushProcess.java | 0
.../org/eclipse/jgit/transport/PushResult.java | 0
.../org/eclipse/jgit/transport/ReceiveCommand.java | 0
.../org/eclipse/jgit/transport/ReceivePack.java | 0
.../org/eclipse/jgit/transport/RefAdvertiser.java | 0
.../java}/org/eclipse/jgit/transport/RefSpec.java | 0
.../org/eclipse/jgit/transport/RemoteConfig.java | 0
.../eclipse/jgit/transport/RemoteRefUpdate.java | 0
.../jgit/transport/SideBandInputStream.java | 0
.../jgit/transport/SideBandOutputStream.java | 0
.../jgit/transport/SideBandProgressMonitor.java | 0
.../jgit/transport/SshConfigSessionFactory.java | 0
.../eclipse/jgit/transport/SshSessionFactory.java | 0
.../org/eclipse/jgit/transport/SshTransport.java | 0
.../java}/org/eclipse/jgit/transport/TagOpt.java | 0
.../org/eclipse/jgit/transport/TcpTransport.java | 0
.../eclipse/jgit/transport/TrackingRefUpdate.java | 0
.../org/eclipse/jgit/transport/Transport.java | 0
.../eclipse/jgit/transport/TransportAmazonS3.java | 0
.../eclipse/jgit/transport/TransportBundle.java | 0
.../jgit/transport/TransportBundleFile.java | 0
.../jgit/transport/TransportBundleStream.java | 0
.../eclipse/jgit/transport/TransportGitAnon.java | 0
.../eclipse/jgit/transport/TransportGitSsh.java | 0
.../org/eclipse/jgit/transport/TransportHttp.java | 0
.../org/eclipse/jgit/transport/TransportLocal.java | 0
.../org/eclipse/jgit/transport/TransportSftp.java | 0
.../java}/org/eclipse/jgit/transport/URIish.java | 0
.../org/eclipse/jgit/transport/UploadPack.java | 0
.../org/eclipse/jgit/transport/WalkEncryption.java | 0
.../jgit/transport/WalkFetchConnection.java | 0
.../eclipse/jgit/transport/WalkPushConnection.java | 0
.../jgit/transport/WalkRemoteObjectDatabase.java | 0
.../org/eclipse/jgit/transport/WalkTransport.java | 0
.../jgit/treewalk/AbstractTreeIterator.java | 0
.../eclipse/jgit/treewalk/CanonicalTreeParser.java | 0
.../eclipse/jgit/treewalk/EmptyTreeIterator.java | 0
.../eclipse/jgit/treewalk/FileTreeIterator.java | 0
.../jgit/treewalk/NameConflictTreeWalk.java | 0
.../java}/org/eclipse/jgit/treewalk/TreeWalk.java | 0
.../eclipse/jgit/treewalk/WorkingTreeIterator.java | 0
.../jgit/treewalk/filter/AndTreeFilter.java | 0
.../jgit/treewalk/filter/NotTreeFilter.java | 0
.../eclipse/jgit/treewalk/filter/OrTreeFilter.java | 0
.../eclipse/jgit/treewalk/filter/PathFilter.java | 0
.../jgit/treewalk/filter/PathFilterGroup.java | 0
.../jgit/treewalk/filter/PathSuffixFilter.java | 0
.../eclipse/jgit/treewalk/filter/TreeFilter.java | 0
.../main/java}/org/eclipse/jgit/util/Base64.java | 0
.../src/main/java}/org/eclipse/jgit/util/FS.java | 0
.../org/eclipse/jgit/util/FS_POSIX_Java5.java | 0
.../org/eclipse/jgit/util/FS_POSIX_Java6.java | 0
.../main/java}/org/eclipse/jgit/util/FS_Win32.java | 0
.../org/eclipse/jgit/util/FS_Win32_Cygwin.java | 0
.../java}/org/eclipse/jgit/util/HttpSupport.java | 0
.../main/java}/org/eclipse/jgit/util/IntList.java | 0
.../org/eclipse/jgit/util/MutableInteger.java | 0
.../src/main/java}/org/eclipse/jgit/util/NB.java | 0
.../java}/org/eclipse/jgit/util/QuotedString.java | 0
.../org/eclipse/jgit/util/RawCharSequence.java | 0
.../java}/org/eclipse/jgit/util/RawParseUtils.java | 0
.../org/eclipse/jgit/util/RawSubStringPattern.java | 0
.../java}/org/eclipse/jgit/util/StringUtils.java | 0
.../java}/org/eclipse/jgit/util/SystemReader.java | 0
.../org/eclipse/jgit/util/TemporaryBuffer.java | 0
.../org/eclipse/jgit/util/io/InterruptTimer.java | 0
.../eclipse/jgit/util/io/TimeoutInputStream.java | 0
.../eclipse/jgit/util/io/TimeoutOutputStream.java | 0
.../src/main/resources}/META-INF/MANIFEST.MF | 0
.../eclipse/jgit/diff/DiffFormatterReflowTest.java | 0
.../java}/org/eclipse/jgit/diff/EditListTest.java | 0
.../test/java}/org/eclipse/jgit/diff/EditTest.java | 0
.../java}/org/eclipse/jgit/diff/RawTextTest.java | 0
.../eclipse/jgit/dircache/DirCacheBasicTest.java | 0
.../jgit/dircache/DirCacheBuilderIteratorTest.java | 0
.../eclipse/jgit/dircache/DirCacheBuilderTest.java | 0
.../dircache/DirCacheCGitCompatabilityTest.java | 0
.../eclipse/jgit/dircache/DirCacheFindTest.java | 0
.../jgit/dircache/DirCacheIteratorTest.java | 0
.../jgit/dircache/DirCacheLargePathTest.java | 0
.../eclipse/jgit/dircache/DirCacheTreeTest.java | 0
.../eclipse/jgit/fnmatch/FileNameMatcherTest.java | 0
.../eclipse/jgit/lib/AbbreviatedObjectIdTest.java | 0
.../org/eclipse/jgit/lib/ConcurrentRepackTest.java | 0
.../eclipse/jgit/lib/ConstantsEncodingTest.java | 0
.../java}/org/eclipse/jgit/lib/IndexDiffTest.java | 0
.../org/eclipse/jgit/lib/IndexTreeWalkerTest.java | 0
.../org/eclipse/jgit/lib/MockSystemReader.java | 0
.../org/eclipse/jgit/lib/ObjectCheckerTest.java | 0
.../org/eclipse/jgit/lib/PackIndexTestCase.java | 0
.../org/eclipse/jgit/lib/PackIndexV1Test.java | 0
.../org/eclipse/jgit/lib/PackIndexV2Test.java | 0
.../org/eclipse/jgit/lib/PackReverseIndexTest.java | 0
.../java}/org/eclipse/jgit/lib/PackWriterTest.java | 0
.../java}/org/eclipse/jgit/lib/ReadTreeTest.java | 0
.../test/java}/org/eclipse/jgit/lib/RefTest.java | 0
.../java}/org/eclipse/jgit/lib/RefUpdateTest.java | 0
.../org/eclipse/jgit/lib/ReflogReaderTest.java | 0
.../org/eclipse/jgit/lib/RepositoryCacheTest.java | 0
.../org/eclipse/jgit/lib/RepositoryConfigTest.java | 0
.../org/eclipse/jgit/lib/RepositoryTestCase.java | 0
.../java}/org/eclipse/jgit/lib/SpeedTestBase.java | 0
.../java}/org/eclipse/jgit/lib/T0001_ObjectId.java | 0
.../org/eclipse/jgit/lib/T0001_PersonIdent.java | 0
.../java}/org/eclipse/jgit/lib/T0002_Tree.java | 0
.../java}/org/eclipse/jgit/lib/T0003_Basic.java | 0
.../org/eclipse/jgit/lib/T0004_PackReader.java | 0
.../jgit/lib/T0005_ShallowSpeedTckTest.java | 4 +-
.../eclipse/jgit/lib/T0006_DeepSpeedTckTest.java | 4 +-
.../java}/org/eclipse/jgit/lib/T0007_Index.java | 0
.../org/eclipse/jgit/lib/T0008_testparserev.java | 0
.../eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java | 0
.../jgit/lib/TreeIteratorPostOrderTest.java | 0
.../eclipse/jgit/lib/TreeIteratorPreOrderTest.java | 0
.../org/eclipse/jgit/lib/ValidRefNameTest.java | 0
.../org/eclipse/jgit/lib/WindowCacheGetTest.java | 0
.../jgit/lib/WindowCacheReconfigureTest.java | 0
.../org/eclipse/jgit/lib/WorkDirCheckoutTest.java | 0
.../java}/org/eclipse/jgit/lib/XInputStream.java | 0
.../java}/org/eclipse/jgit/lib/empty.gitindex.dat | Bin 32 -> 32 bytes
.../org/eclipse/jgit/lib/sorttest.gitindex.dat | Bin 288 -> 288 bytes
.../org/eclipse/jgit/merge/CherryPickTest.java | 0
.../org/eclipse/jgit/merge/SimpleMergeTest.java | 0
.../jgit/patch/EGitPatchHistoryTckTest.java | 2 +-
.../java}/org/eclipse/jgit/patch/EditListTest.java | 0
.../org/eclipse/jgit/patch/FileHeaderTest.java | 0
.../java}/org/eclipse/jgit/patch/GetTextTest.java | 0
.../org/eclipse/jgit/patch/PatchCcErrorTest.java | 0
.../java}/org/eclipse/jgit/patch/PatchCcTest.java | 0
.../org/eclipse/jgit/patch/PatchErrorTest.java | 0
.../java}/org/eclipse/jgit/patch/PatchTest.java | 0
.../jgit/revwalk/AlwaysEmptyRevQueueTest.java | 0
.../org/eclipse/jgit/revwalk/DateRevQueueTest.java | 0
.../org/eclipse/jgit/revwalk/FIFORevQueueTest.java | 0
.../org/eclipse/jgit/revwalk/FooterLineTest.java | 0
.../org/eclipse/jgit/revwalk/LIFORevQueueTest.java | 0
.../org/eclipse/jgit/revwalk/ObjectWalkTest.java | 0
.../eclipse/jgit/revwalk/RevCommitParseTest.java | 0
.../org/eclipse/jgit/revwalk/RevFlagSetTest.java | 0
.../org/eclipse/jgit/revwalk/RevObjectTest.java | 0
.../org/eclipse/jgit/revwalk/RevQueueTestCase.java | 0
.../org/eclipse/jgit/revwalk/RevTagParseTest.java | 0
.../org/eclipse/jgit/revwalk/RevWalkCullTest.java | 0
.../eclipse/jgit/revwalk/RevWalkFilterTest.java | 0
.../eclipse/jgit/revwalk/RevWalkMergeBaseTest.java | 0
.../jgit/revwalk/RevWalkPathFilter1Test.java | 0
.../jgit/revwalk/RevWalkPathFilter6012Test.java | 0
.../org/eclipse/jgit/revwalk/RevWalkSortTest.java | 0
.../org/eclipse/jgit/revwalk/RevWalkTestCase.java | 0
.../eclipse/jgit/transport/BundleWriterTest.java | 0
.../org/eclipse/jgit/transport/IndexPackTest.java | 0
.../org/eclipse/jgit/transport/LongMapTest.java | 0
.../eclipse/jgit/transport/OpenSshConfigTest.java | 0
.../eclipse/jgit/transport/PacketLineInTest.java | 0
.../eclipse/jgit/transport/PacketLineOutTest.java | 0
.../eclipse/jgit/transport/PushProcessTest.java | 0
.../org/eclipse/jgit/transport/RefSpecTest.java | 0
.../eclipse/jgit/transport/RemoteConfigTest.java | 0
.../jgit/transport/SideBandOutputStreamTest.java | 0
.../org/eclipse/jgit/transport/TransportTest.java | 0
.../org/eclipse/jgit/transport/URIishTest.java | 0
.../jgit/treewalk/AbstractTreeIteratorTest.java | 0
.../jgit/treewalk/CanonicalTreeParserTest.java | 0
.../jgit/treewalk/EmptyTreeIteratorTest.java | 0
.../jgit/treewalk/FileTreeIteratorTest.java | 0
.../jgit/treewalk/NameConflictTreeWalkTest.java | 0
.../jgit/treewalk/PostOrderTreeWalkTest.java | 0
.../jgit/treewalk/TreeWalkBasicDiffTest.java | 0
.../treewalk/filter/AlwaysCloneTreeFilter.java | 0
.../jgit/treewalk/filter/NotTreeFilterTest.java | 0
.../jgit/treewalk/filter/PathSuffixFilterTest.java | 2 +-
.../jgit/treewalk/filter/TreeFilterTest.java | 0
.../java}/org/eclipse/jgit/util/IntListTest.java | 0
.../java}/org/eclipse/jgit/util/JGitTestUtil.java | 0
.../test/java}/org/eclipse/jgit/util/NBTest.java | 0
.../jgit/util/QuotedStringBourneStyleTest.java | 0
.../util/QuotedStringBourneUserPathStyleTest.java | 0
.../jgit/util/QuotedStringGitPathStyleTest.java | 0
.../jgit/util/RawParseUtils_HexParseTest.java | 0
.../jgit/util/RawParseUtils_LineMapTest.java | 0
.../eclipse/jgit/util/RawParseUtils_MatchTest.java | 0
.../org/eclipse/jgit/util/StringUtilsTest.java | 0
.../org/eclipse/jgit/util/TemporaryBufferTest.java | 0
.../test/java}/org/eclipse/jgit/util/TestRng.java | 0
.../jgit/util/io/TimeoutInputStreamTest.java | 0
.../jgit/util/io/TimeoutOutputStreamTest.java | 0
.../test/resources}/org/eclipse/jgit/diff/E.patch | 0
.../resources}/org/eclipse/jgit/diff/E_PostImage | 0
.../resources}/org/eclipse/jgit/diff/E_PreImage | 0
.../test/resources}/org/eclipse/jgit/diff/X.patch | 0
.../resources}/org/eclipse/jgit/diff/X_PostImage | 0
.../resources}/org/eclipse/jgit/diff/X_PreImage | 0
.../test/resources}/org/eclipse/jgit/diff/Y.patch | 0
.../resources}/org/eclipse/jgit/diff/Y_PostImage | 0
.../resources}/org/eclipse/jgit/diff/Y_PreImage | 0
.../test/resources}/org/eclipse/jgit/diff/Z.patch | 0
.../resources}/org/eclipse/jgit/diff/Z_PostImage | 0
.../resources}/org/eclipse/jgit/diff/Z_PreImage | 0
.../org/eclipse/jgit/diff/testContext0.out | 0
.../org/eclipse/jgit/diff/testContext1.out | 0
.../org/eclipse/jgit/diff/testContext10.out | 0
.../org/eclipse/jgit/diff/testContext100.out | 0
.../org/eclipse/jgit/diff/testContext3.out | 0
.../org/eclipse/jgit/diff/testContext5.out | 0
.../org/eclipse/jgit/patch/.gitattributes | 0
.../eclipse/jgit/patch/testEditList_Types.patch | 0
.../eclipse/jgit/patch/testError_BodyTooLong.patch | 0
.../jgit/patch/testError_CcTruncatedOld.patch | 0
.../jgit/patch/testError_DisconnectedHunk.patch | 0
.../jgit/patch/testError_GarbageBetweenFiles.patch | 0
.../patch/testError_GitBinaryNoForwardHunk.patch | 0
.../jgit/patch/testError_TruncatedNew.patch | 0
.../jgit/patch/testError_TruncatedOld.patch | 0
.../jgit/patch/testGetText_BothISO88591.patch | 0
.../eclipse/jgit/patch/testGetText_Convert.patch | 0
.../eclipse/jgit/patch/testGetText_DiffCc.patch | 0
.../eclipse/jgit/patch/testGetText_NoBinary.patch | 0
.../jgit/patch/testParse_AddNoNewline.patch | 0
.../jgit/patch/testParse_CcDeleteFile.patch | 0
.../eclipse/jgit/patch/testParse_CcNewFile.patch | 0
.../patch/testParse_ConfigCaseInsensitive.patch | 0
.../jgit/patch/testParse_FixNoNewline.patch | 0
.../jgit/patch/testParse_GitBinaryDelta.patch | 0
.../jgit/patch/testParse_GitBinaryLiteral.patch | 0
.../eclipse/jgit/patch/testParse_NoBinary.patch | 0
.../eclipse/jgit/patch/testParse_OneFileCc.patch | 0
.../jgit/test/resources/all_packed_objects.txt | 0
.../eclipse/jgit/test/resources/create-second-pack | 0
.../org/eclipse/jgit/test/resources/gitgit.index | Bin 134799 -> 134799 bytes
.../org/eclipse/jgit/test/resources/gitgit.lsfiles | 0
.../org/eclipse/jgit/test/resources/gitgit.lstree | 0
...ck-3280af9c07ee18a87705ef50b0cc4cd20266cf12.idx | Bin 1296 -> 1296 bytes
...k-3280af9c07ee18a87705ef50b0cc4cd20266cf12.pack | Bin 562 -> 562 bytes
...ck-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idx | Bin 1256 -> 1256 bytes
...-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idxV2 | Bin 1296 -> 1296 bytes
...k-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.pack | Bin 7811 -> 7811 bytes
...ck-546ff360fe3488adb20860ce3436a2d6373d2796.idx | Bin 1324 -> 1324 bytes
...k-546ff360fe3488adb20860ce3436a2d6373d2796.pack | Bin 1265 -> 1265 bytes
...ck-9fb5b411fe6dfa89cc2e6b89d2bd8e5de02b5745.idx | Bin 1100 -> 1100 bytes
...k-9fb5b411fe6dfa89cc2e6b89d2bd8e5de02b5745.pack | Bin 164 -> 164 bytes
...ck-cbdeda40019ae0e6e789088ea0f51f164f489d14.idx | Bin 1240 -> 1240 bytes
...k-cbdeda40019ae0e6e789088ea0f51f164f489d14.pack | Bin 651 -> 651 bytes
...ck-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idx | Bin 2976 -> 2976 bytes
...-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idxV2 | Bin 2976 -> 2976 bytes
...k-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.pack | Bin 5901 -> 5901 bytes
...ck-e6d07037cbcf13376308a0a995d1fa48f8f76aaa.idx | Bin 1112 -> 1112 bytes
...k-e6d07037cbcf13376308a0a995d1fa48f8f76aaa.pack | Bin 1643 -> 1643 bytes
.../org/eclipse/jgit/test/resources/pack-huge.idx | Bin 2368 -> 2368 bytes
.../org/eclipse/jgit/test/resources/packed-refs | 0
jgit-maven/.gitignore | 1 -
jgit-maven/jgit/pom.xml | 216 -------------
{org.eclipse.jgit.pgm => jgit-pgm}/.classpath | 0
jgit-pgm/.gitignore | 2 +
{org.eclipse.jgit.pgm => jgit-pgm}/.project | 0
.../.settings/org.eclipse.core.resources.prefs | 0
.../.settings/org.eclipse.core.runtime.prefs | 0
.../.settings/org.eclipse.jdt.core.prefs | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
jgit.sh => jgit-pgm/jgit.sh | 11 +-
jgit-pgm/pom.xml | 126 ++++++++
.../org/eclipse/jgit/pgm/AbstractFetchCommand.java | 0
.../main/java}/org/eclipse/jgit/pgm/Branch.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Clone.java | 0
.../main/java}/org/eclipse/jgit/pgm/Command.java | 0
.../java}/org/eclipse/jgit/pgm/CommandCatalog.java | 0
.../java}/org/eclipse/jgit/pgm/CommandRef.java | 0
.../main/java}/org/eclipse/jgit/pgm/Daemon.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Die.java | 0
.../main/java}/org/eclipse/jgit/pgm/DiffTree.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Fetch.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Glog.java | 0
.../main/java}/org/eclipse/jgit/pgm/IndexPack.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Init.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Log.java | 0
.../main/java}/org/eclipse/jgit/pgm/LsRemote.java | 0
.../main/java}/org/eclipse/jgit/pgm/LsTree.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Main.java | 0
.../main/java}/org/eclipse/jgit/pgm/MergeBase.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Push.java | 0
.../java}/org/eclipse/jgit/pgm/ReceivePack.java | 0
.../main/java}/org/eclipse/jgit/pgm/RevList.java | 0
.../main/java}/org/eclipse/jgit/pgm/RevParse.java | 0
.../org/eclipse/jgit/pgm/RevWalkTextBuiltin.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Rm.java | 0
.../main/java}/org/eclipse/jgit/pgm/ShowRef.java | 0
.../src/main/java}/org/eclipse/jgit/pgm/Tag.java | 0
.../java}/org/eclipse/jgit/pgm/TextBuiltin.java | 0
.../java}/org/eclipse/jgit/pgm/UploadPack.java | 0
.../main/java}/org/eclipse/jgit/pgm/Version.java | 0
.../org/eclipse/jgit/pgm/build/JarLinkUtil.java | 0
.../org/eclipse/jgit/pgm/debug/MakeCacheTree.java | 0
.../org/eclipse/jgit/pgm/debug/ReadDirCache.java | 0
.../eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 0
.../org/eclipse/jgit/pgm/debug/ShowCacheTree.java | 0
.../org/eclipse/jgit/pgm/debug/ShowCommands.java | 0
.../org/eclipse/jgit/pgm/debug/ShowDirCache.java | 0
.../org/eclipse/jgit/pgm/debug/WriteDirCache.java | 0
.../jgit/pgm/opt/AbstractTreeIteratorHandler.java | 0
.../org/eclipse/jgit/pgm/opt/CmdLineParser.java | 0
.../org/eclipse/jgit/pgm/opt/ObjectIdHandler.java | 0
.../jgit/pgm/opt/PathTreeFilterHandler.java | 0
.../org/eclipse/jgit/pgm/opt/RefSpecHandler.java | 0
.../org/eclipse/jgit/pgm/opt/RevCommitHandler.java | 0
.../org/eclipse/jgit/pgm/opt/RevTreeHandler.java | 0
.../eclipse/jgit/pgm/opt/SubcommandHandler.java | 0
.../services/org.eclipse.jgit.pgm.TextBuiltin | 0
licenses/JSch.LICENSE.txt | 30 ++
licenses/args4j.LICENSE.txt | 32 ++
make_jgit.sh | 132 --------
org.eclipse.jgit.pgm/.gitignore | 1 -
org.eclipse.jgit.test/.classpath | 11 -
org.eclipse.jgit.test/.gitignore | 3 -
org.eclipse.jgit.test/.project | 17 -
.../.settings/org.eclipse.core.resources.prefs | 6 -
.../.settings/org.eclipse.core.runtime.prefs | 3 -
.../.settings/org.eclipse.jdt.core.prefs | 320 -------------------
.../.settings/org.eclipse.jdt.ui.prefs | 10 -
org.eclipse.jgit/.gitignore | 1 -
pom.xml | 331 ++++++++++++++++++++
562 files changed, 676 insertions(+), 733 deletions(-)
rename {org.eclipse.jgit => jgit-core}/.classpath (100%)
rename {org.eclipse.jgit => jgit-core}/.fbprefs (100%)
create mode 100644 jgit-core/.gitignore
rename {org.eclipse.jgit => jgit-core}/.project (100%)
rename {org.eclipse.jgit => jgit-core}/.settings/org.eclipse.core.resources.prefs (100%)
rename {org.eclipse.jgit => jgit-core}/.settings/org.eclipse.core.runtime.prefs (100%)
rename {org.eclipse.jgit => jgit-core}/.settings/org.eclipse.jdt.core.prefs (100%)
rename {org.eclipse.jgit.pgm => jgit-core}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename {org.eclipse.jgit => jgit-core}/build.properties (100%)
rename {org.eclipse.jgit => jgit-core}/findBugs/FindBugsExcludeFilter.xml (100%)
rename {org.eclipse.jgit.test => jgit-core}/org.eclipse.jgit.core--All-External-Tests (Java 6).launch (100%)
rename {org.eclipse.jgit.test => jgit-core}/org.eclipse.jgit.core--All-External-Tests.launch (100%)
rename {org.eclipse.jgit.test => jgit-core}/org.eclipse.jgit.core--All-Tests (Java 6).launch (100%)
rename {org.eclipse.jgit.test => jgit-core}/org.eclipse.jgit.core--All-Tests.launch (100%)
rename {org.eclipse.jgit => jgit-core}/plugin.properties (100%)
create mode 100644 jgit-core/pom.xml
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/awtui/AWTPlotRenderer.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/awtui/AwtAuthenticator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/awtui/CommitGraphPane.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/awtui/SwingCommitList.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/diff/DiffFormatter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/diff/Edit.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/diff/EditList.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/diff/RawText.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/diff/Sequence.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/dircache/BaseDirCacheEditor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/dircache/DirCache.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/dircache/DirCacheBuildIterator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/dircache/DirCacheBuilder.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/dircache/DirCacheEditor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/dircache/DirCacheEntry.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/dircache/DirCacheIterator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/dircache/DirCacheTree.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/CheckoutConflictException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/CompoundException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/ConfigInvalidException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/CorruptObjectException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/EntryExistsException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/GitlinksNotSupportedException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/IncorrectObjectTypeException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/InvalidObjectIdException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/InvalidPatternException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/MissingBundlePrerequisiteException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/MissingObjectException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/NoClosingBracketException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/NoRemoteRepositoryException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/NotSupportedException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/ObjectWritingException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/PackInvalidException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/PackMismatchException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/PackProtocolException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/RepositoryNotFoundException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/RevWalkException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/RevisionSyntaxException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/StopWalkException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/SymlinksNotSupportedException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/TransportException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/errors/UnmergedPathException.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/fnmatch/AbstractHead.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/fnmatch/CharacterHead.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/fnmatch/FileNameMatcher.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/fnmatch/GroupHead.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/fnmatch/Head.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/fnmatch/LastHead.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/fnmatch/RestrictedWildCardHead.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/fnmatch/WildCardHead.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/AbbreviatedObjectId.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/AbstractIndexTreeVisitor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/AlternateRepositoryDatabase.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/AnyObjectId.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/BinaryDelta.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/BlobBasedConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ByteArrayWindow.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ByteBufferWindow.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ByteWindow.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/Commit.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/Config.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/Constants.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/CoreConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/DeltaOfsPackedObjectLoader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/DeltaPackedObjectLoader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/DeltaRefPackedObjectLoader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/FileBasedConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/FileMode.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/FileTreeEntry.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ForceModified.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/GitIndex.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/GitlinkTreeEntry.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/IndexChangedEvent.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/IndexDiff.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/IndexTreeVisitor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/IndexTreeWalker.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/InflaterCache.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/LockFile.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/MutableObjectId.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/NullProgressMonitor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ObjectChecker.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ObjectDatabase.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ObjectDirectory.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ObjectId.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ObjectIdSubclassMap.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ObjectLoader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ObjectWriter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/OffsetCache.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackFile.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackIndex.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackIndexV1.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackIndexV2.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackIndexWriter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackIndexWriterV1.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackIndexWriterV2.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackLock.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackOutputStream.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackReverseIndex.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackWriter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PackedObjectLoader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/PersonIdent.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ProgressMonitor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/Ref.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RefComparator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RefDatabase.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RefLogWriter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RefRename.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RefUpdate.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RefWriter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/ReflogReader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RefsChangedEvent.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/Repository.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RepositoryAdapter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RepositoryCache.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RepositoryChangedEvent.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RepositoryConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RepositoryListener.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/RepositoryState.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/SymlinkTreeEntry.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/Tag.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/TextProgressMonitor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/TransferConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/Tree.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/TreeEntry.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/TreeIterator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/TreeVisitor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/TreeVisitorWithCurrentDirectory.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/Treeish.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/UnpackedObjectCache.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/UnpackedObjectLoader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/UserConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/WholePackedObjectLoader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/WindowCache.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/WindowCacheConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/WindowCursor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/WorkDirCheckout.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/lib/WriteTree.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/merge/MergeStrategy.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/merge/Merger.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/merge/StrategyOneSided.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/merge/ThreeWayMergeStrategy.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/merge/ThreeWayMerger.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/patch/BinaryHunk.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/patch/CombinedFileHeader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/patch/CombinedHunkHeader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/patch/FileHeader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/patch/FormatError.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/patch/HunkHeader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/patch/Patch.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revplot/AbstractPlotRenderer.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revplot/PlotCommit.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revplot/PlotCommitList.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revplot/PlotLane.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revplot/PlotWalk.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/AbstractRevQueue.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/BlockObjQueue.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/BlockRevQueue.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/BoundaryGenerator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/DateRevQueue.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/DelayRevQueue.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/EndGenerator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/FIFORevQueue.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/FixUninterestingGenerator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/FooterKey.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/FooterLine.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/Generator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/LIFORevQueue.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/MergeBaseGenerator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/ObjectWalk.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/PendingGenerator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevBlob.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevCommit.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevCommitList.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevFlag.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevFlagSet.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevObject.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevObjectList.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevSort.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevTag.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevTree.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RevWalk.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RewriteGenerator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/RewriteTreeFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/StartGenerator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/TopoSortGenerator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/AndRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/NotRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/OrRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/RevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/AmazonS3.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/BaseConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/BaseFetchConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/BasePackConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/BasePackFetchConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/BasePackPushConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/BundleFetchConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/BundleWriter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/Connection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/Daemon.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/DaemonClient.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/DaemonService.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/DefaultSshSessionFactory.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/FetchConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/FetchHeadRecord.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/FetchProcess.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/FetchResult.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/HttpTransport.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/IndexPack.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/LongMap.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/OpenSshConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/OperationResult.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PackTransport.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PackedObjectInfo.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PacketLineIn.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PacketLineOut.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PostReceiveHook.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PreReceiveHook.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PushConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PushProcess.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/PushResult.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/ReceiveCommand.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/ReceivePack.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/RefAdvertiser.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/RefSpec.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/RemoteConfig.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/RemoteRefUpdate.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/SideBandInputStream.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/SideBandOutputStream.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/SideBandProgressMonitor.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/SshConfigSessionFactory.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/SshSessionFactory.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/SshTransport.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TagOpt.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TcpTransport.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TrackingRefUpdate.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/Transport.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportAmazonS3.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportBundle.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportBundleFile.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportBundleStream.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportGitAnon.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportGitSsh.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportHttp.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportLocal.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/TransportSftp.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/URIish.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/UploadPack.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/WalkEncryption.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/WalkFetchConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/WalkPushConnection.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/transport/WalkTransport.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/AbstractTreeIterator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/CanonicalTreeParser.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/EmptyTreeIterator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/FileTreeIterator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/TreeWalk.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/WorkingTreeIterator.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/filter/NotTreeFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/filter/PathFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/treewalk/filter/TreeFilter.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/Base64.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/FS.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/FS_POSIX_Java5.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/FS_POSIX_Java6.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/FS_Win32.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/FS_Win32_Cygwin.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/HttpSupport.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/IntList.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/MutableInteger.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/NB.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/QuotedString.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/RawCharSequence.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/RawParseUtils.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/RawSubStringPattern.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/StringUtils.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/SystemReader.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/TemporaryBuffer.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/io/InterruptTimer.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/io/TimeoutInputStream.java (100%)
rename {org.eclipse.jgit/src => jgit-core/src/main/java}/org/eclipse/jgit/util/io/TimeoutOutputStream.java (100%)
rename {org.eclipse.jgit => jgit-core/src/main/resources}/META-INF/MANIFEST.MF (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/diff/DiffFormatterReflowTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/diff/EditListTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/diff/EditTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/diff/RawTextTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/dircache/DirCacheBasicTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/dircache/DirCacheBuilderIteratorTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/dircache/DirCacheBuilderTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/dircache/DirCacheCGitCompatabilityTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/dircache/DirCacheFindTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/dircache/DirCacheIteratorTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/dircache/DirCacheLargePathTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/dircache/DirCacheTreeTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/fnmatch/FileNameMatcherTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/AbbreviatedObjectIdTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/ConcurrentRepackTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/ConstantsEncodingTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/IndexDiffTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/IndexTreeWalkerTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/MockSystemReader.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/ObjectCheckerTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/PackIndexTestCase.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/PackIndexV1Test.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/PackIndexV2Test.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/PackReverseIndexTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/PackWriterTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/ReadTreeTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/RefTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/RefUpdateTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/ReflogReaderTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/RepositoryCacheTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/RepositoryConfigTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/RepositoryTestCase.java (100%)
rename {org.eclipse.jgit.test/exttst => jgit-core/src/test/java}/org/eclipse/jgit/lib/SpeedTestBase.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/T0001_ObjectId.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/T0001_PersonIdent.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/T0002_Tree.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/T0003_Basic.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/T0004_PackReader.java (100%)
rename org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0005_ShallowSpeedTest.java => jgit-core/src/test/java/org/eclipse/jgit/lib/T0005_ShallowSpeedTckTest.java (96%)
rename org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0006_DeepSpeedTest.java => jgit-core/src/test/java/org/eclipse/jgit/lib/T0006_DeepSpeedTckTest.java (96%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/T0007_Index.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/T0008_testparserev.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/ValidRefNameTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/WindowCacheGetTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/WindowCacheReconfigureTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/WorkDirCheckoutTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/XInputStream.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/empty.gitindex.dat (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/lib/sorttest.gitindex.dat (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/merge/CherryPickTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/merge/SimpleMergeTest.java (100%)
rename org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java => jgit-core/src/test/java/org/eclipse/jgit/patch/EGitPatchHistoryTckTest.java (99%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/patch/EditListTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/patch/FileHeaderTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/patch/GetTextTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/patch/PatchCcErrorTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/patch/PatchCcTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/patch/PatchErrorTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/patch/PatchTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/AlwaysEmptyRevQueueTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/DateRevQueueTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/FIFORevQueueTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/FooterLineTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/LIFORevQueueTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/ObjectWalkTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevCommitParseTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevFlagSetTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevObjectTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevQueueTestCase.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevTagParseTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevWalkCullTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevWalkFilterTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevWalkMergeBaseTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevWalkPathFilter1Test.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevWalkPathFilter6012Test.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevWalkSortTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/revwalk/RevWalkTestCase.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/BundleWriterTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/IndexPackTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/LongMapTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/OpenSshConfigTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/PacketLineInTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/PacketLineOutTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/PushProcessTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/RefSpecTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/RemoteConfigTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/SideBandOutputStreamTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/TransportTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/transport/URIishTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/AbstractTreeIteratorTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/CanonicalTreeParserTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/EmptyTreeIteratorTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/NameConflictTreeWalkTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/PostOrderTreeWalkTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/TreeWalkBasicDiffTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/filter/AlwaysCloneTreeFilter.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/filter/NotTreeFilterTest.java (100%)
rename org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTestCase.java => jgit-core/src/test/java/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java (98%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/treewalk/filter/TreeFilterTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/IntListTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/JGitTestUtil.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/NBTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/QuotedStringBourneStyleTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/QuotedStringBourneUserPathStyleTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/QuotedStringGitPathStyleTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/RawParseUtils_HexParseTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/RawParseUtils_MatchTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/StringUtilsTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/TemporaryBufferTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/TestRng.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/io/TimeoutInputStreamTest.java (100%)
rename {org.eclipse.jgit.test/tst => jgit-core/src/test/java}/org/eclipse/jgit/util/io/TimeoutOutputStreamTest.java (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/E.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/E_PostImage (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/E_PreImage (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/X.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/X_PostImage (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/X_PreImage (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/Y.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/Y_PostImage (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/Y_PreImage (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/Z.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/Z_PostImage (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/Z_PreImage (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/testContext0.out (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/testContext1.out (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/testContext10.out (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/testContext100.out (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/testContext3.out (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/diff/testContext5.out (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/.gitattributes (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testEditList_Types.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testError_BodyTooLong.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testError_CcTruncatedOld.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testError_DisconnectedHunk.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testError_GarbageBetweenFiles.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testError_GitBinaryNoForwardHunk.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testError_TruncatedNew.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testError_TruncatedOld.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testGetText_BothISO88591.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testGetText_Convert.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testGetText_DiffCc.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testGetText_NoBinary.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_AddNoNewline.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_CcDeleteFile.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_CcNewFile.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_ConfigCaseInsensitive.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_FixNoNewline.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_GitBinaryDelta.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_GitBinaryLiteral.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_NoBinary.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/patch/testParse_OneFileCc.patch (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/all_packed_objects.txt (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/create-second-pack (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/gitgit.index (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/gitgit.lsfiles (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/gitgit.lstree (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-3280af9c07ee18a87705ef50b0cc4cd20266cf12.idx (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-3280af9c07ee18a87705ef50b0cc4cd20266cf12.pack (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idx (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idxV2 (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.pack (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-546ff360fe3488adb20860ce3436a2d6373d2796.idx (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-546ff360fe3488adb20860ce3436a2d6373d2796.pack (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-9fb5b411fe6dfa89cc2e6b89d2bd8e5de02b5745.idx (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-9fb5b411fe6dfa89cc2e6b89d2bd8e5de02b5745.pack (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-cbdeda40019ae0e6e789088ea0f51f164f489d14.idx (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-cbdeda40019ae0e6e789088ea0f51f164f489d14.pack (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idx (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idxV2 (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.pack (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-e6d07037cbcf13376308a0a995d1fa48f8f76aaa.idx (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-e6d07037cbcf13376308a0a995d1fa48f8f76aaa.pack (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/pack-huge.idx (100%)
rename {org.eclipse.jgit.test/tst-rsrc => jgit-core/src/test/resources}/org/eclipse/jgit/test/resources/packed-refs (100%)
delete mode 100644 jgit-maven/.gitignore
delete mode 100644 jgit-maven/jgit/pom.xml
rename {org.eclipse.jgit.pgm => jgit-pgm}/.classpath (100%)
create mode 100644 jgit-pgm/.gitignore
rename {org.eclipse.jgit.pgm => jgit-pgm}/.project (100%)
rename {org.eclipse.jgit.pgm => jgit-pgm}/.settings/org.eclipse.core.resources.prefs (100%)
rename {org.eclipse.jgit.pgm => jgit-pgm}/.settings/org.eclipse.core.runtime.prefs (100%)
rename {org.eclipse.jgit.pgm => jgit-pgm}/.settings/org.eclipse.jdt.core.prefs (100%)
rename {org.eclipse.jgit => jgit-pgm}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename jgit.sh => jgit-pgm/jgit.sh (71%)
create mode 100644 jgit-pgm/pom.xml
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/AbstractFetchCommand.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Branch.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Clone.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Command.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/CommandCatalog.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/CommandRef.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Daemon.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Die.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/DiffTree.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Fetch.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Glog.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/IndexPack.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Init.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Log.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/LsRemote.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/LsTree.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Main.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/MergeBase.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Push.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/ReceivePack.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/RevList.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/RevParse.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Rm.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/ShowRef.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Tag.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/TextBuiltin.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/UploadPack.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/Version.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/build/JarLinkUtil.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/debug/MakeCacheTree.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/debug/ReadDirCache.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/debug/ShowCacheTree.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/debug/ShowCommands.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/debug/ShowDirCache.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/debug/WriteDirCache.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/opt/CmdLineParser.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/opt/RefSpecHandler.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/opt/RevCommitHandler.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/opt/RevTreeHandler.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/java}/org/eclipse/jgit/pgm/opt/SubcommandHandler.java (100%)
rename {org.eclipse.jgit.pgm/src => jgit-pgm/src/main/resources}/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin (100%)
create mode 100644 licenses/JSch.LICENSE.txt
create mode 100644 licenses/args4j.LICENSE.txt
delete mode 100755 make_jgit.sh
delete mode 100644 org.eclipse.jgit.pgm/.gitignore
delete mode 100644 org.eclipse.jgit.test/.classpath
delete mode 100644 org.eclipse.jgit.test/.gitignore
delete mode 100644 org.eclipse.jgit.test/.project
delete mode 100644 org.eclipse.jgit.test/.settings/org.eclipse.core.resources.prefs
delete mode 100644 org.eclipse.jgit.test/.settings/org.eclipse.core.runtime.prefs
delete mode 100644 org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 org.eclipse.jgit.test/.settings/org.eclipse.jdt.ui.prefs
delete mode 100644 org.eclipse.jgit/.gitignore
create mode 100644 pom.xml
^ permalink raw reply
* Re: Trying to split repository
From: Josef Wolf @ 2009-10-01 21:13 UTC (permalink / raw)
To: git
In-Reply-To: <c376da900910010949p197aa311l9c91ef711beffdf7@mail.gmail.com>
On Thu, Oct 01, 2009 at 12:49:03PM -0400, Adam Brewster wrote:
> >
> > Any hints how to get rid of those log entries?
>
> git-filter-branch accepts a --prune-empty option that does what I
> think you're looking for.
Thanks for your answer, Adam!
Is this a new option? 1.6.0.2 don't seem to have it?
^ permalink raw reply
* Re: [JGIT PATCH 0/5] jgit diff
From: Johannes Schindelin @ 2009-10-01 21:47 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20091001184721.GR14660@spearce.org>
Hi,
On Thu, 1 Oct 2009, Shawn O. Pearce wrote:
> Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
> > This patch series provides a rudimentary, working implementation of "jgit
> > diff". It does not provide all modes of "git diff" -- by far! -- but it
> > is robust, and should provide a good starting point for further work.
>
> I have rebased this patch series on our new JGit history, and then
> opened a bug at eclipse.org to get it through the IP review process:
>
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=291083
Great, thanks!
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH 1/2] do not mangle short options which take arguments
From: Johannes Schindelin @ 2009-10-01 21:53 UTC (permalink / raw)
To: Clemens Buchacher; +Cc: Shawn O. Pearce, git
In-Reply-To: <20091001201648.GA12175@localhost>
Hi,
On Thu, 1 Oct 2009, Clemens Buchacher wrote:
> Instead of
>
> $ git commit -a -ammend
> [work ce38944] mend
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> we now get
>
> $ git commit -a -ammend
> error: switch `m' must not be mangled with other options
> usage: git commit [options] [--] <filepattern>...
> [...]
>
> Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Sweet! And the patch looks good to me!
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH 2/2] allow mangling short options which take integer arguments
From: Johannes Schindelin @ 2009-10-01 21:55 UTC (permalink / raw)
To: Clemens Buchacher; +Cc: Shawn O. Pearce, git
In-Reply-To: <20091001202301.GB12175@localhost>
Hi,
On Thu, 1 Oct 2009, Clemens Buchacher wrote:
> This patch allows you to do things like for example
>
> $ git <cmd> -bn100
>
> where -b is a boolean and -n is an integer option.
>
> Signed-off-by: Clemens Buchacher <drizzd@aon.at>
And this patch looks even more straight-forward than 1/2, _but_... what
about cases where there are short options that are digits?
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] Documentation - pt-BR.
From: Thiago Farina @ 2009-10-01 22:35 UTC (permalink / raw)
To: Jeff King; +Cc: Carlos R. Mafra, Shawn O. Pearce, git
In-Reply-To: <20091001122252.GA31919@sigill.intra.peff.net>
Hi,
Thanks Jeff to care about my patch and for the review :)
Thanks Carlos for the review too.
-Thiago
^ permalink raw reply
* stgit, rebasing with 100 patches
From: Jon Smirl @ 2009-10-01 23:04 UTC (permalink / raw)
To: Git Mailing List
I have 100 patches loaded into in stgit. My tree is at 2.6.30. Now I
want to rebase to 2.6.31-rc1. About 30 of these hundred patches got
committed in this interval.
If I rebase directly to 2.6.31-rc1 I end up with a bunch of merge
conflicts as the patches are applied. That's because patches 'a,b,c'
got applied in the merge window. When I push 'a' back down it sees the
combination of 'a,b,c' not just 'a'. It is unable to figure out that
'a' was applied and then 'b' and 'c' applied on top of it.
Is there a better way to locate the patches the got applied?
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox