You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

ResetTest.java 5.5KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165
  1. /*
  2. * Copyright (C) 2015, Kaloyan Raev <kaloyan.r@zend.com>
  3. * and other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available
  6. * under the terms of the Eclipse Distribution License v1.0 which
  7. * accompanies this distribution, is reproduced below, and is
  8. * available at http://www.eclipse.org/org/documents/edl-v10.php
  9. *
  10. * All rights reserved.
  11. *
  12. * Redistribution and use in source and binary forms, with or
  13. * without modification, are permitted provided that the following
  14. * conditions are met:
  15. *
  16. * - Redistributions of source code must retain the above copyright
  17. * notice, this list of conditions and the following disclaimer.
  18. *
  19. * - Redistributions in binary form must reproduce the above
  20. * copyright notice, this list of conditions and the following
  21. * disclaimer in the documentation and/or other materials provided
  22. * with the distribution.
  23. *
  24. * - Neither the name of the Eclipse Foundation, Inc. nor the
  25. * names of its contributors may be used to endorse or promote
  26. * products derived from this software without specific prior
  27. * written permission.
  28. *
  29. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  30. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  31. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  32. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  33. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  34. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  35. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  36. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  37. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  38. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  40. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  41. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  42. */
  43. package org.eclipse.jgit.pgm;
  44. import static org.junit.Assert.assertArrayEquals;
  45. import static org.junit.Assert.assertEquals;
  46. import static org.junit.Assert.assertFalse;
  47. import static org.junit.Assert.assertTrue;
  48. import org.eclipse.jgit.api.Git;
  49. import org.eclipse.jgit.lib.CLIRepositoryTestCase;
  50. import org.eclipse.jgit.revwalk.RevCommit;
  51. import org.junit.Before;
  52. import org.junit.Ignore;
  53. import org.junit.Test;
  54. public class ResetTest extends CLIRepositoryTestCase {
  55. private Git git;
  56. @Override
  57. @Before
  58. public void setUp() throws Exception {
  59. super.setUp();
  60. git = new Git(db);
  61. }
  62. @Test
  63. public void testPathOptionHelp() throws Exception {
  64. String[] result = execute("git reset -h");
  65. assertTrue("Unexpected argument: " + result[1],
  66. result[1].endsWith("[-- path ... ...]"));
  67. }
  68. @Test
  69. public void testZombieArgument_Bug484951() throws Exception {
  70. String[] result = execute("git reset -h");
  71. assertFalse("Unexpected argument: " + result[0],
  72. result[0].contains("[VAL ...]"));
  73. }
  74. @Test
  75. public void testResetSelf() throws Exception {
  76. RevCommit commit = git.commit().setMessage("initial commit").call();
  77. assertStringArrayEquals("",
  78. execute("git reset --hard " + commit.getId().name()));
  79. assertEquals(commit.getId(),
  80. git.getRepository().exactRef("HEAD").getObjectId());
  81. }
  82. @Test
  83. public void testResetPrevious() throws Exception {
  84. RevCommit commit = git.commit().setMessage("initial commit").call();
  85. git.commit().setMessage("second commit").call();
  86. assertStringArrayEquals("",
  87. execute("git reset --hard " + commit.getId().name()));
  88. assertEquals(commit.getId(),
  89. git.getRepository().exactRef("HEAD").getObjectId());
  90. }
  91. @Test
  92. public void testResetEmptyPath() throws Exception {
  93. RevCommit commit = git.commit().setMessage("initial commit").call();
  94. assertStringArrayEquals("",
  95. execute("git reset --hard " + commit.getId().name() + " --"));
  96. assertEquals(commit.getId(),
  97. git.getRepository().exactRef("HEAD").getObjectId());
  98. }
  99. @Test
  100. public void testResetPathDoubleDash() throws Exception {
  101. resetPath(true, true);
  102. }
  103. @Test
  104. public void testResetPathNoDoubleDash() throws Exception {
  105. resetPath(false, true);
  106. }
  107. @Test
  108. public void testResetPathDoubleDashNoRef() throws Exception {
  109. resetPath(true, false);
  110. }
  111. @Ignore("Currently we cannote recognize if a name is a commit-ish or a path, "
  112. + "so 'git reset a' will not work if 'a' is not a branch name but a file path")
  113. @Test
  114. public void testResetPathNoDoubleDashNoRef() throws Exception {
  115. resetPath(false, false);
  116. }
  117. private void resetPath(boolean useDoubleDash, boolean supplyCommit)
  118. throws Exception {
  119. // create files a and b
  120. writeTrashFile("a", "Hello world a");
  121. writeTrashFile("b", "Hello world b");
  122. // stage the files
  123. git.add().addFilepattern(".").call();
  124. // commit the files
  125. RevCommit commit = git.commit().setMessage("files a & b").call();
  126. // change both files a and b
  127. writeTrashFile("a", "New Hello world a");
  128. writeTrashFile("b", "New Hello world b");
  129. // stage the files
  130. git.add().addFilepattern(".").call();
  131. // reset only file a
  132. String cmd = String.format("git reset %s%s a",
  133. supplyCommit ? commit.getId().name() : "",
  134. useDoubleDash ? " --" : "");
  135. assertStringArrayEquals("", execute(cmd));
  136. assertEquals(commit.getId(),
  137. git.getRepository().exactRef("HEAD").getObjectId());
  138. org.eclipse.jgit.api.Status status = git.status().call();
  139. // assert that file a is unstaged
  140. assertArrayEquals(new String[] { "a" },
  141. status.getModified().toArray());
  142. // assert that file b is still staged
  143. assertArrayEquals(new String[] { "b" },
  144. status.getChanged().toArray());
  145. }
  146. }