123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235 |
- /*
- * Copyright (C) 2012, 2014 IBM Corporation and others.
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- package org.eclipse.jgit.pgm;
-
- import static org.junit.Assert.assertArrayEquals;
- import static org.junit.Assert.assertEquals;
-
- import java.util.Iterator;
-
- import org.eclipse.jgit.api.Git;
- import org.eclipse.jgit.lib.CLIRepositoryTestCase;
- import org.eclipse.jgit.merge.MergeStrategy;
- import org.eclipse.jgit.revwalk.RevCommit;
- import org.junit.Before;
- import org.junit.Test;
-
- public class MergeTest extends CLIRepositoryTestCase {
-
- private Git git;
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- git = new Git(db);
- git.commit().setMessage("initial commit").call();
- }
-
- @Test
- public void testMergeSelf() throws Exception {
- assertEquals("Already up-to-date.", execute("git merge master")[0]);
- }
-
- @Test
- public void testSquashSelf() throws Exception {
- assertEquals(" (nothing to squash)Already up-to-date.",
- execute("git merge master --squash")[0]);
- }
-
- @Test
- public void testFastForward() throws Exception {
- git.branchCreate().setName("side").call();
- writeTrashFile("file", "master");
- git.add().addFilepattern("file").call();
- git.commit().setMessage("commit").call();
- git.checkout().setName("side").call();
-
- assertArrayEquals(new String[] { "Updating 6fd41be..26a81a1",
- "Fast-forward", "" }, execute("git merge master"));
- }
-
- @Test
- public void testMerge() throws Exception {
- git.branchCreate().setName("side").call();
- writeTrashFile("master", "content");
- git.add().addFilepattern("master").call();
- git.commit().setMessage("master commit").call();
- git.checkout().setName("side").call();
- writeTrashFile("side", "content");
- git.add().addFilepattern("side").call();
- git.commit().setMessage("side commit").call();
-
- assertEquals("Merge made by the '" + MergeStrategy.RECURSIVE.getName()
- + "' strategy.", execute("git merge master")[0]);
- }
-
- @Test
- public void testMergeNoCommit() throws Exception {
- git.branchCreate().setName("side").call();
- writeTrashFile("master", "content");
- git.add().addFilepattern("master").call();
- git.commit().setMessage("master commit").call();
- git.checkout().setName("side").call();
- writeTrashFile("side", "content");
- git.add().addFilepattern("side").call();
- git.commit().setMessage("side commit").call();
-
- assertEquals(
- "Automatic merge went well; stopped before committing as requested",
- execute("git merge --no-commit master")[0]);
- }
-
- @Test
- public void testMergeNoCommitSquash() throws Exception {
- git.branchCreate().setName("side").call();
- writeTrashFile("master", "content");
- git.add().addFilepattern("master").call();
- git.commit().setMessage("master commit").call();
- git.checkout().setName("side").call();
- writeTrashFile("side", "content");
- git.add().addFilepattern("side").call();
- git.commit().setMessage("side commit").call();
-
- assertArrayEquals(
- new String[] {
- "Squash commit -- not updating HEAD",
- "Automatic merge went well; stopped before committing as requested",
- "" }, execute("git merge --no-commit --squash master"));
- }
-
- @Test
- public void testSquash() throws Exception {
- git.branchCreate().setName("side").call();
- writeTrashFile("file1", "content1");
- git.add().addFilepattern("file1").call();
- git.commit().setMessage("file1 commit").call();
- writeTrashFile("file2", "content2");
- git.add().addFilepattern("file2").call();
- git.commit().setMessage("file2 commit").call();
- git.checkout().setName("side").call();
- writeTrashFile("side", "content");
- git.add().addFilepattern("side").call();
- git.commit().setMessage("side commit").call();
-
- assertArrayEquals(
- new String[] { "Squash commit -- not updating HEAD",
- "Automatic merge went well; stopped before committing as requested",
- "" },
- execute("git merge master --squash"));
- }
-
- @Test
- public void testNoFastForward() throws Exception {
- git.branchCreate().setName("side").call();
- writeTrashFile("file", "master");
- git.add().addFilepattern("file").call();
- git.commit().setMessage("commit").call();
- git.checkout().setName("side").call();
-
- assertEquals("Merge made by the 'recursive' strategy.",
- execute("git merge master --no-ff")[0]);
- assertArrayEquals(new String[] {
- "commit 6db23724012376e8407fc24b5da4277a9601be81", //
- "Author: GIT_COMMITTER_NAME <GIT_COMMITTER_EMAIL>", //
- "Date: Sat Aug 15 20:12:58 2009 -0330", //
- "", //
- " Merge branch 'master' into side", //
- "", //
- "commit 6fd41be26b7ee41584dd997f665deb92b6c4c004", //
- "Author: GIT_COMMITTER_NAME <GIT_COMMITTER_EMAIL>", //
- "Date: Sat Aug 15 20:12:58 2009 -0330", //
- "", //
- " initial commit", //
- "", //
- "commit 26a81a1c6a105551ba703a8b6afc23994cacbae1", //
- "Author: GIT_COMMITTER_NAME <GIT_COMMITTER_EMAIL>", //
- "Date: Sat Aug 15 20:12:58 2009 -0330", //
- "", //
- " commit", //
- "", //
- ""
- }, execute("git log"));
- }
-
- @Test
- public void testNoFastForwardAndSquash() throws Exception {
- assertEquals("fatal: You cannot combine --squash with --no-ff.",
- execute("git merge master --no-ff --squash")[0]);
- }
-
- @Test
- public void testFastForwardOnly() throws Exception {
- git.branchCreate().setName("side").call();
- writeTrashFile("file", "master");
- git.add().addFilepattern("file").call();
- git.commit().setMessage("commit#1").call();
- git.checkout().setName("side").call();
- writeTrashFile("file", "side");
- git.add().addFilepattern("file").call();
- git.commit().setMessage("commit#2").call();
-
- assertEquals("fatal: Not possible to fast-forward, aborting.",
- execute("git merge master --ff-only")[0]);
- }
-
- @Test
- public void testMergeWithUserMessage() throws Exception {
- git.branchCreate().setName("side").call();
- writeTrashFile("master", "content");
- git.add().addFilepattern("master").call();
- git.commit().setMessage("master commit").call();
- git.checkout().setName("side").call();
- writeTrashFile("side", "content");
- git.add().addFilepattern("side").call();
- git.commit().setMessage("side commit").call();
-
- assertEquals("Merge made by the '" + MergeStrategy.RECURSIVE.getName()
- + "' strategy.",
- execute("git merge master -m \"user message\"")[0]);
-
- Iterator<RevCommit> it = git.log().call().iterator();
- RevCommit newHead = it.next();
- assertEquals("user message", newHead.getFullMessage());
- }
- }
|