1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309 |
- /*
- * Copyright (C) 2010, Stefan Lay <stefan.lay@sap.com>
- * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.com>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- package org.eclipse.jgit.api;
-
- import static java.nio.charset.StandardCharsets.UTF_8;
- import static org.eclipse.jgit.util.FileUtils.RECURSIVE;
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertTrue;
- import static org.junit.Assert.fail;
-
- import java.io.File;
- import java.io.FileInputStream;
- import java.io.IOException;
- import java.io.PrintWriter;
- import java.util.Set;
-
- import org.eclipse.jgit.api.errors.FilterFailedException;
- import org.eclipse.jgit.api.errors.GitAPIException;
- import org.eclipse.jgit.api.errors.NoFilepatternException;
- import org.eclipse.jgit.attributes.FilterCommandRegistry;
- import org.eclipse.jgit.dircache.DirCache;
- import org.eclipse.jgit.dircache.DirCacheBuilder;
- import org.eclipse.jgit.dircache.DirCacheEntry;
- import org.eclipse.jgit.junit.JGitTestUtil;
- import org.eclipse.jgit.junit.RepositoryTestCase;
- import org.eclipse.jgit.lfs.BuiltinLFS;
- import org.eclipse.jgit.lib.ConfigConstants;
- import org.eclipse.jgit.lib.Constants;
- import org.eclipse.jgit.lib.FileMode;
- import org.eclipse.jgit.lib.ObjectId;
- import org.eclipse.jgit.lib.ObjectInserter;
- import org.eclipse.jgit.lib.Repository;
- import org.eclipse.jgit.lib.StoredConfig;
- import org.eclipse.jgit.revwalk.RevCommit;
- import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
- import org.eclipse.jgit.treewalk.TreeWalk;
- import org.eclipse.jgit.treewalk.WorkingTreeOptions;
- import org.eclipse.jgit.util.FS;
- import org.eclipse.jgit.util.FileUtils;
- import org.junit.Test;
- import org.junit.experimental.theories.DataPoints;
- import org.junit.experimental.theories.Theories;
- import org.junit.experimental.theories.Theory;
- import org.junit.runner.RunWith;
-
- @RunWith(Theories.class)
- public class AddCommandTest extends RepositoryTestCase {
- @DataPoints
- public static boolean[] sleepBeforeAddOptions = { true, false };
-
-
- @Override
- public void setUp() throws Exception {
- BuiltinLFS.register();
- super.setUp();
- }
-
- @Test
- public void testAddNothing() throws GitAPIException {
- try (Git git = new Git(db)) {
- git.add().call();
- fail("Expected IllegalArgumentException");
- } catch (NoFilepatternException e) {
- // expected
- }
-
- }
-
- @Test
- public void testAddNonExistingSingleFile() throws GitAPIException {
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
- assertEquals(0, dc.getEntryCount());
- }
- }
-
- @Test
- public void testAddExistingSingleFile() throws IOException, GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testCleanFilter() throws IOException, GitAPIException {
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
- writeTrashFile("src/a.tmp", "foo");
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- writeTrashFile("src/a.txt", "foo\n");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()));
- config.save();
-
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .call();
-
- assertEquals(
- "[src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:fee\n]",
- indexState(CONTENT));
- }
- }
-
- @Theory
- public void testBuiltinFilters(boolean sleepBeforeAdd)
- throws IOException,
- GitAPIException, InterruptedException {
- writeTrashFile(".gitattributes", "*.txt filter=lfs");
- writeTrashFile("src/a.tmp", "foo");
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- File script = writeTempFile("sed s/o/e/g");
- File f = writeTrashFile("src/a.txt", "foo\n");
-
- try (Git git = new Git(db)) {
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern(".gitattributes").call();
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "lfs", "clean",
- "sh " + slashify(script.getPath()));
- config.setString("filter", "lfs", "smudge",
- "sh " + slashify(script.getPath()));
- config.setBoolean("filter", "lfs", "useJGitBuiltin", true);
- config.save();
-
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .addFilepattern(".gitattributes").call();
-
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n]",
- indexState(CONTENT));
-
- RevCommit c1 = git.commit().setMessage("c1").call();
- assertTrue(git.status().call().isClean());
- f = writeTrashFile("src/a.txt", "foobar\n");
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern("src/a.txt").call();
- git.commit().setMessage("c2").call();
- assertTrue(git.status().call().isClean());
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:aec070645fe53ee3b3763059376134f058cc337247c978add178b6ccdfb0019f\nsize 7\n]",
- indexState(CONTENT));
- assertEquals("foobar\n", read("src/a.txt"));
- git.checkout().setName(c1.getName()).call();
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n]",
- indexState(CONTENT));
- assertEquals(
- "foo\n", read("src/a.txt"));
- }
- }
-
- @Theory
- public void testBuiltinCleanFilter(boolean sleepBeforeAdd)
- throws IOException, GitAPIException, InterruptedException {
- writeTrashFile(".gitattributes", "*.txt filter=lfs");
- writeTrashFile("src/a.tmp", "foo");
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- File script = writeTempFile("sed s/o/e/g");
- File f = writeTrashFile("src/a.txt", "foo\n");
-
- // unregister the smudge filter. Only clean filter should be builtin
- FilterCommandRegistry.unregister(
- org.eclipse.jgit.lib.Constants.BUILTIN_FILTER_PREFIX
- + "lfs/smudge");
-
- try (Git git = new Git(db)) {
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern(".gitattributes").call();
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "lfs", "clean",
- "sh " + slashify(script.getPath()));
- config.setString("filter", "lfs", "smudge",
- "sh " + slashify(script.getPath()));
- config.setBoolean("filter", "lfs", "useJGitBuiltin", true);
- config.save();
-
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .addFilepattern(".gitattributes").call();
-
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n]",
- indexState(CONTENT));
-
- RevCommit c1 = git.commit().setMessage("c1").call();
- assertTrue(git.status().call().isClean());
- f = writeTrashFile("src/a.txt", "foobar\n");
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern("src/a.txt").call();
- git.commit().setMessage("c2").call();
- assertTrue(git.status().call().isClean());
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:aec070645fe53ee3b3763059376134f058cc337247c978add178b6ccdfb0019f\nsize 7\n]",
- indexState(CONTENT));
- assertEquals("foobar\n", read("src/a.txt"));
- git.checkout().setName(c1.getName()).call();
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n]",
- indexState(CONTENT));
- // due to lfs clean filter but dummy smudge filter we expect strange
- // content. The smudge filter converts from real content to pointer
- // file content (starting with "version ") but the smudge filter
- // replaces 'o' by 'e' which results in a text starting with
- // "versien "
- assertEquals(
- "versien https://git-lfs.github.cem/spec/v1\neid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n",
- read("src/a.txt"));
- }
- }
-
- @Test
- public void testAttributesWithTreeWalkFilter()
- throws IOException, GitAPIException {
- writeTrashFile(".gitattributes", "*.txt filter=lfs");
- writeTrashFile("src/a.tmp", "foo");
- writeTrashFile("src/a.txt", "foo\n");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "lfs", "clean",
- "sh " + slashify(script.getPath()));
- config.save();
-
- git.add().addFilepattern(".gitattributes").call();
- git.commit().setMessage("attr").call();
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .addFilepattern(".gitattributes").call();
- git.commit().setMessage("c1").call();
- assertTrue(git.status().call().isClean());
- }
- }
-
- @Test
- public void testAttributesConflictingMatch() throws Exception {
- writeTrashFile(".gitattributes", "foo/** crlf=input\n*.jar binary");
- writeTrashFile("foo/bar.jar", "\r\n");
- // We end up with attributes [binary -diff -merge -text crlf=input].
- // crlf should have no effect when -text is present.
- try (Git git = new Git(db)) {
- git.add().addFilepattern(".").call();
- assertEquals(
- "[.gitattributes, mode:100644, content:foo/** crlf=input\n*.jar binary]"
- + "[foo/bar.jar, mode:100644, content:\r\n]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testCleanFilterEnvironment()
- throws IOException, GitAPIException {
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
- writeTrashFile("src/a.txt", "foo");
- File script = writeTempFile("echo $GIT_DIR; echo 1 >xyz");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()));
- config.save();
- git.add().addFilepattern("src/a.txt").call();
-
- String gitDir = db.getDirectory().getAbsolutePath();
- assertEquals("[src/a.txt, mode:100644, content:" + gitDir
- + "\n]", indexState(CONTENT));
- assertTrue(new File(db.getWorkTree(), "xyz").exists());
- }
- }
-
- @Test
- public void testMultipleCleanFilter() throws IOException, GitAPIException {
- writeTrashFile(".gitattributes",
- "*.txt filter=tstFilter\n*.tmp filter=tstFilter2");
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- writeTrashFile("src/a.tmp", "foo\n");
- writeTrashFile("src/a.txt", "foo\n");
- File script = writeTempFile("sed s/o/e/g");
- File script2 = writeTempFile("sed s/f/x/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()));
- config.setString("filter", "tstFilter2", "clean",
- "sh " + slashify(script2.getPath()));
- config.save();
-
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .call();
-
- assertEquals(
- "[src/a.tmp, mode:100644, content:xoo\n][src/a.txt, mode:100644, content:fee\n]",
- indexState(CONTENT));
-
- // TODO: multiple clean filters for one file???
- }
- }
-
- /**
- * The path of an added file name contains ';' and afterwards malicious
- * commands. Make sure when calling filter commands to properly escape the
- * filenames
- *
- * @throws IOException
- * @throws GitAPIException
- */
- @Test
- public void testCommandInjection() throws IOException, GitAPIException {
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- writeTrashFile("; echo virus", "foo\n");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()) + " %f");
- writeTrashFile(".gitattributes", "* filter=tstFilter");
-
- git.add().addFilepattern("; echo virus").call();
- // Without proper escaping the content would be "feovirus". The sed
- // command and the "echo virus" would contribute to the content
- assertEquals("[; echo virus, mode:100644, content:fee\n]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testBadCleanFilter() throws IOException, GitAPIException {
- writeTrashFile("a.txt", "foo");
- File script = writeTempFile("sedfoo s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + script.getPath());
- config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
-
- try {
- git.add().addFilepattern("a.txt").call();
- fail("Didn't received the expected exception");
- } catch (FilterFailedException e) {
- assertEquals(127, e.getReturnCode());
- }
- }
- }
-
- @Test
- public void testBadCleanFilter2() throws IOException, GitAPIException {
- writeTrashFile("a.txt", "foo");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "shfoo " + script.getPath());
- config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
-
- try {
- git.add().addFilepattern("a.txt").call();
- fail("Didn't received the expected exception");
- } catch (FilterFailedException e) {
- assertEquals(127, e.getReturnCode());
- }
- }
- }
-
- @Test
- public void testCleanFilterReturning12() throws IOException,
- GitAPIException {
- writeTrashFile("a.txt", "foo");
- File script = writeTempFile("exit 12");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()));
- config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
-
- try {
- git.add().addFilepattern("a.txt").call();
- fail("Didn't received the expected exception");
- } catch (FilterFailedException e) {
- assertEquals(12, e.getReturnCode());
- }
- }
- }
-
- @Test
- public void testNotApplicableFilter() throws IOException, GitAPIException {
- writeTrashFile("a.txt", "foo");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "something",
- "sh " + script.getPath());
- config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
-
- git.add().addFilepattern("a.txt").call();
-
- assertEquals("[a.txt, mode:100644, content:foo]",
- indexState(CONTENT));
- }
- }
-
- private File writeTempFile(String body) throws IOException {
- File f = File.createTempFile("AddCommandTest_", "");
- JGitTestUtil.write(f, body);
- return f;
- }
-
- @Test
- public void testAddExistingSingleSmallFileWithNewLine() throws IOException,
- GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("row1\r\nrow2");
- }
-
- try (Git git = new Git(db)) {
- db.getConfig().setString("core", null, "autocrlf", "false");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\r\nrow2]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "true");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\nrow2]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "input");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\nrow2]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleMediumSizeFileWithNewLine()
- throws IOException, GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- StringBuilder data = new StringBuilder();
- for (int i = 0; i < 1000; ++i) {
- data.append("row1\r\nrow2");
- }
- String crData = data.toString();
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print(crData);
- }
- String lfData = data.toString().replaceAll("\r", "");
- try (Git git = new Git(db)) {
- db.getConfig().setString("core", null, "autocrlf", "false");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:" + data + "]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "true");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:" + lfData + "]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "input");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:" + lfData + "]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleBinaryFile() throws IOException,
- GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("row1\r\nrow2\u0000");
- }
-
- try (Git git = new Git(db)) {
- db.getConfig().setString("core", null, "autocrlf", "false");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\r\nrow2\u0000]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "true");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\r\nrow2\u0000]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "input");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\r\nrow2\u0000]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleFileInSubDir() throws IOException,
- GitAPIException {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub/a.txt").call();
-
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleFileTwice() throws IOException,
- GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
-
- dc.getEntry(0).getObjectId();
-
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("other content");
- }
-
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:other content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleFileTwiceWithCommit() throws Exception {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
-
- dc.getEntry(0).getObjectId();
-
- git.commit().setMessage("commit a.txt").call();
-
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("other content");
- }
-
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:other content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddRemovedFile() throws Exception {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
-
- dc.getEntry(0).getObjectId();
- FileUtils.delete(file);
-
- // is supposed to do nothing
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddRemovedCommittedFile() throws Exception {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
-
- git.commit().setMessage("commit a.txt").call();
-
- dc.getEntry(0).getObjectId();
- FileUtils.delete(file);
-
- // is supposed to do nothing
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddWithConflicts() throws Exception {
- // prepare conflict
-
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- File file2 = new File(db.getWorkTree(), "b.txt");
- FileUtils.createNewFile(file2);
- try (PrintWriter writer = new PrintWriter(file2, UTF_8.name())) {
- writer.print("content b");
- }
-
- ObjectInserter newObjectInserter = db.newObjectInserter();
- DirCache dc = db.lockDirCache();
- DirCacheBuilder builder = dc.builder();
-
- addEntryToBuilder("b.txt", file2, newObjectInserter, builder, 0);
- addEntryToBuilder("a.txt", file, newObjectInserter, builder, 1);
-
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("other content");
- }
- addEntryToBuilder("a.txt", file, newObjectInserter, builder, 3);
-
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("our content");
- }
- addEntryToBuilder("a.txt", file, newObjectInserter, builder, 2)
- .getObjectId();
-
- builder.commit();
-
- assertEquals(
- "[a.txt, mode:100644, stage:1, content:content]" +
- "[a.txt, mode:100644, stage:2, content:our content]" +
- "[a.txt, mode:100644, stage:3, content:other content]" +
- "[b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
-
- // now the test begins
-
- try (Git git = new Git(db)) {
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:our content]" +
- "[b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddTwoFiles() throws Exception {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- File file2 = new File(db.getWorkTree(), "b.txt");
- FileUtils.createNewFile(file2);
- try (PrintWriter writer = new PrintWriter(file2, UTF_8.name())) {
- writer.print("content b");
- }
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("a.txt").addFilepattern("b.txt").call();
- assertEquals(
- "[a.txt, mode:100644, content:content]" +
- "[b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddFolder() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- try (PrintWriter writer = new PrintWriter(file2, UTF_8.name())) {
- writer.print("content b");
- }
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub").call();
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]" +
- "[sub/b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddIgnoredFile() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- File ignoreFile = new File(db.getWorkTree(), ".gitignore");
- FileUtils.createNewFile(ignoreFile);
- try (PrintWriter writer = new PrintWriter(ignoreFile, UTF_8.name())) {
- writer.print("sub/b.txt");
- }
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- try (PrintWriter writer = new PrintWriter(file2, UTF_8.name())) {
- writer.print("content b");
- }
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub").call();
-
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddWholeRepo() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- try (PrintWriter writer = new PrintWriter(file2, UTF_8.name())) {
- writer.print("content b");
- }
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern(".").call();
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]" +
- "[sub/b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
- }
- }
-
- // the same three cases as in testAddWithParameterUpdate
- // file a exists in workdir and in index -> added
- // file b exists not in workdir but in index -> unchanged
- // file c exists in workdir but not in index -> added
- @Test
- public void testAddWithoutParameterUpdate() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- try (PrintWriter writer = new PrintWriter(file2, UTF_8.name())) {
- writer.print("content b");
- }
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub").call();
-
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]" +
- "[sub/b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
-
- git.commit().setMessage("commit").call();
-
- // new unstaged file sub/c.txt
- File file3 = new File(db.getWorkTree(), "sub/c.txt");
- FileUtils.createNewFile(file3);
- try (PrintWriter writer = new PrintWriter(file3, UTF_8.name())) {
- writer.print("content c");
- }
-
- // file sub/a.txt is modified
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("modified content");
- }
-
- // file sub/b.txt is deleted
- FileUtils.delete(file2);
-
- git.add().addFilepattern("sub").call();
- // change in sub/a.txt is staged
- // deletion of sub/b.txt is not staged
- // sub/c.txt is staged
- assertEquals(
- "[sub/a.txt, mode:100644, content:modified content]" +
- "[sub/b.txt, mode:100644, content:content b]" +
- "[sub/c.txt, mode:100644, content:content c]",
- indexState(CONTENT));
- }
- }
-
- // file a exists in workdir and in index -> added
- // file b exists not in workdir but in index -> deleted
- // file c exists in workdir but not in index -> unchanged
- @Test
- public void testAddWithParameterUpdate() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("content");
- }
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- try (PrintWriter writer = new PrintWriter(file2, UTF_8.name())) {
- writer.print("content b");
- }
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub").call();
-
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]" +
- "[sub/b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
-
- git.commit().setMessage("commit").call();
-
- // new unstaged file sub/c.txt
- File file3 = new File(db.getWorkTree(), "sub/c.txt");
- FileUtils.createNewFile(file3);
- try (PrintWriter writer = new PrintWriter(file3, UTF_8.name())) {
- writer.print("content c");
- }
-
- // file sub/a.txt is modified
- try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) {
- writer.print("modified content");
- }
-
- FileUtils.delete(file2);
-
- // change in sub/a.txt is staged
- // deletion of sub/b.txt is staged
- // sub/c.txt is not staged
- git.add().addFilepattern("sub").setUpdate(true).call();
- // change in sub/a.txt is staged
- assertEquals(
- "[sub/a.txt, mode:100644, content:modified content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAssumeUnchanged() throws Exception {
- try (Git git = new Git(db)) {
- String path = "a.txt";
- writeTrashFile(path, "content");
- git.add().addFilepattern(path).call();
- String path2 = "b.txt";
- writeTrashFile(path2, "content");
- git.add().addFilepattern(path2).call();
- git.commit().setMessage("commit").call();
- assertEquals("[a.txt, mode:100644, content:"
- + "content, assume-unchanged:false]"
- + "[b.txt, mode:100644, content:content, "
- + "assume-unchanged:false]", indexState(CONTENT
- | ASSUME_UNCHANGED));
- assumeUnchanged(path2);
- assertEquals("[a.txt, mode:100644, content:content, "
- + "assume-unchanged:false][b.txt, mode:100644, "
- + "content:content, assume-unchanged:true]", indexState(CONTENT
- | ASSUME_UNCHANGED));
- writeTrashFile(path, "more content");
- writeTrashFile(path2, "more content");
-
- git.add().addFilepattern(".").call();
-
- assertEquals("[a.txt, mode:100644, content:more content,"
- + " assume-unchanged:false][b.txt, mode:100644,"
- + " content:content, assume-unchanged:true]",
- indexState(CONTENT
- | ASSUME_UNCHANGED));
- }
- }
-
- @Test
- public void testReplaceFileWithDirectory()
- throws IOException, NoFilepatternException, GitAPIException {
- try (Git git = new Git(db)) {
- writeTrashFile("df", "before replacement");
- git.add().addFilepattern("df").call();
- assertEquals("[df, mode:100644, content:before replacement]",
- indexState(CONTENT));
- FileUtils.delete(new File(db.getWorkTree(), "df"));
- writeTrashFile("df/f", "after replacement");
- git.add().addFilepattern("df").call();
- assertEquals("[df/f, mode:100644, content:after replacement]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testReplaceDirectoryWithFile()
- throws IOException, NoFilepatternException, GitAPIException {
- try (Git git = new Git(db)) {
- writeTrashFile("df/f", "before replacement");
- git.add().addFilepattern("df").call();
- assertEquals("[df/f, mode:100644, content:before replacement]",
- indexState(CONTENT));
- FileUtils.delete(new File(db.getWorkTree(), "df"), RECURSIVE);
- writeTrashFile("df", "after replacement");
- git.add().addFilepattern("df").call();
- assertEquals("[df, mode:100644, content:after replacement]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testReplaceFileByPartOfDirectory()
- throws IOException, NoFilepatternException, GitAPIException {
- try (Git git = new Git(db)) {
- writeTrashFile("src/main", "df", "before replacement");
- writeTrashFile("src/main", "z", "z");
- writeTrashFile("z", "z2");
- git.add().addFilepattern("src/main/df")
- .addFilepattern("src/main/z")
- .addFilepattern("z")
- .call();
- assertEquals(
- "[src/main/df, mode:100644, content:before replacement]" +
- "[src/main/z, mode:100644, content:z]" +
- "[z, mode:100644, content:z2]",
- indexState(CONTENT));
- FileUtils.delete(new File(db.getWorkTree(), "src/main/df"));
- writeTrashFile("src/main/df", "a", "after replacement");
- writeTrashFile("src/main/df", "b", "unrelated file");
- git.add().addFilepattern("src/main/df/a").call();
- assertEquals(
- "[src/main/df/a, mode:100644, content:after replacement]" +
- "[src/main/z, mode:100644, content:z]" +
- "[z, mode:100644, content:z2]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testReplaceDirectoryConflictsWithFile()
- throws IOException, NoFilepatternException, GitAPIException {
- DirCache dc = db.lockDirCache();
- try (ObjectInserter oi = db.newObjectInserter()) {
- DirCacheBuilder builder = dc.builder();
- File f = writeTrashFile("a", "df", "content");
- addEntryToBuilder("a", f, oi, builder, 1);
-
- f = writeTrashFile("a", "df", "other content");
- addEntryToBuilder("a/df", f, oi, builder, 3);
-
- f = writeTrashFile("a", "df", "our content");
- addEntryToBuilder("a/df", f, oi, builder, 2);
-
- f = writeTrashFile("z", "z");
- addEntryToBuilder("z", f, oi, builder, 0);
- builder.commit();
- }
- assertEquals(
- "[a, mode:100644, stage:1, content:content]" +
- "[a/df, mode:100644, stage:2, content:our content]" +
- "[a/df, mode:100644, stage:3, content:other content]" +
- "[z, mode:100644, content:z]",
- indexState(CONTENT));
-
- try (Git git = new Git(db)) {
- FileUtils.delete(new File(db.getWorkTree(), "a"), RECURSIVE);
- writeTrashFile("a", "merged");
- git.add().addFilepattern("a").call();
- assertEquals("[a, mode:100644, content:merged]" +
- "[z, mode:100644, content:z]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testExecutableRetention() throws Exception {
- StoredConfig config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_FILEMODE, true);
- config.save();
-
- FS executableFs = new FS() {
-
- @Override
- public boolean supportsExecute() {
- return true;
- }
-
- @Override
- public boolean setExecute(File f, boolean canExec) {
- return true;
- }
-
- @Override
- public ProcessBuilder runInShell(String cmd, String[] args) {
- return null;
- }
-
- @Override
- public boolean retryFailedLockFileCommit() {
- return false;
- }
-
- @Override
- public FS newInstance() {
- return this;
- }
-
- @Override
- protected File discoverGitExe() {
- return null;
- }
-
- @Override
- public boolean canExecute(File f) {
- try {
- return read(f).startsWith("binary:");
- } catch (IOException e) {
- return false;
- }
- }
-
- @Override
- public boolean isCaseSensitive() {
- return false;
- }
- };
-
- Git git = Git.open(db.getDirectory(), executableFs);
- String path = "a.txt";
- String path2 = "a.sh";
- writeTrashFile(path, "content");
- writeTrashFile(path2, "binary: content");
- git.add().addFilepattern(path).addFilepattern(path2).call();
- RevCommit commit1 = git.commit().setMessage("commit").call();
- try (TreeWalk walk = new TreeWalk(db)) {
- walk.addTree(commit1.getTree());
- walk.next();
- assertEquals(path2, walk.getPathString());
- assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
- walk.next();
- assertEquals(path, walk.getPathString());
- assertEquals(FileMode.REGULAR_FILE, walk.getFileMode(0));
- }
-
- config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_FILEMODE, false);
- config.save();
-
- Git git2 = Git.open(db.getDirectory(), executableFs);
- writeTrashFile(path2, "content2");
- writeTrashFile(path, "binary: content2");
- git2.add().addFilepattern(path).addFilepattern(path2).call();
- RevCommit commit2 = git2.commit().setMessage("commit2").call();
- try (TreeWalk walk = new TreeWalk(db)) {
- walk.addTree(commit2.getTree());
- walk.next();
- assertEquals(path2, walk.getPathString());
- assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
- walk.next();
- assertEquals(path, walk.getPathString());
- assertEquals(FileMode.REGULAR_FILE, walk.getFileMode(0));
- }
- }
-
- @Test
- public void testAddGitlink() throws Exception {
- createNestedRepo("git-link-dir");
- try (Git git = new Git(db)) {
- git.add().addFilepattern("git-link-dir").call();
-
- assertEquals(
- "[git-link-dir, mode:160000]",
- indexState(0));
- Set<String> untrackedFiles = git.status().call().getUntracked();
- assert (untrackedFiles.isEmpty());
- }
-
- }
-
- @Test
- public void testAddSubrepoWithDirNoGitlinks() throws Exception {
- createNestedRepo("nested-repo");
-
- // Set DIR_NO_GITLINKS
- StoredConfig config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, true);
- config.save();
-
- assert (db.getConfig().get(WorkingTreeOptions.KEY).isDirNoGitLinks());
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("nested-repo").call();
-
- assertEquals(
- "[nested-repo/README1.md, mode:100644]" +
- "[nested-repo/README2.md, mode:100644]",
- indexState(0));
- }
-
- // Turn off DIR_NO_GITLINKS, ensure nested-repo is still treated as
- // a normal directory
- // Set DIR_NO_GITLINKS
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, false);
- config.save();
-
- writeTrashFile("nested-repo", "README3.md", "content");
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("nested-repo").call();
-
- assertEquals(
- "[nested-repo/README1.md, mode:100644]" +
- "[nested-repo/README2.md, mode:100644]" +
- "[nested-repo/README3.md, mode:100644]",
- indexState(0));
- }
- }
-
- @Test
- public void testAddGitlinkDoesNotChange() throws Exception {
- createNestedRepo("nested-repo");
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("nested-repo").call();
-
- assertEquals(
- "[nested-repo, mode:160000]",
- indexState(0));
- }
-
- // Set DIR_NO_GITLINKS
- StoredConfig config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, true);
- config.save();
-
- assertTrue(
- db.getConfig().get(WorkingTreeOptions.KEY).isDirNoGitLinks());
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("nested-repo").call();
- // with gitlinks ignored, we treat this as a normal directory
- assertEquals(
- "[nested-repo/README1.md, mode:100644][nested-repo/README2.md, mode:100644]",
- indexState(0));
- }
- }
-
- private static DirCacheEntry addEntryToBuilder(String path, File file,
- ObjectInserter newObjectInserter, DirCacheBuilder builder, int stage)
- throws IOException {
- ObjectId id;
- try (FileInputStream inputStream = new FileInputStream(file)) {
- id = newObjectInserter.insert(
- Constants.OBJ_BLOB, file.length(), inputStream);
- }
- DirCacheEntry entry = new DirCacheEntry(path, stage);
- entry.setObjectId(id);
- entry.setFileMode(FileMode.REGULAR_FILE);
- entry.setLastModified(FS.DETECTED.lastModifiedInstant(file));
- entry.setLength((int) file.length());
-
- builder.add(entry);
- return entry;
- }
-
- private void assumeUnchanged(String path) throws IOException {
- final DirCache dirc = db.lockDirCache();
- final DirCacheEntry ent = dirc.getEntry(path);
- if (ent != null)
- ent.setAssumeValid(true);
- dirc.write();
- if (!dirc.commit())
- throw new IOException("could not commit");
- }
-
- private void createNestedRepo(String path) throws IOException {
- File gitLinkDir = new File(db.getWorkTree(), path);
- FileUtils.mkdir(gitLinkDir);
-
- FileRepositoryBuilder nestedBuilder = new FileRepositoryBuilder();
- nestedBuilder.setWorkTree(gitLinkDir);
-
- Repository nestedRepo = nestedBuilder.build();
- nestedRepo.create();
-
- writeTrashFile(path, "README1.md", "content");
- writeTrashFile(path, "README2.md", "content");
-
- // Commit these changes in the subrepo
- try (Git git = new Git(nestedRepo)) {
- git.add().addFilepattern(".").call();
- git.commit().setMessage("subrepo commit").call();
- } catch (GitAPIException e) {
- throw new RuntimeException(e);
- }
- }
- }
|