From e23b09ad6efc35f6574cfefd4467ad20e5212ff2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 13 Mar 2018 02:20:29 +0100 Subject: Implement --force option in FetchCommand and CLI fetch command Change-Id: I42cdb57b8fb54ce466d1958391f12f911045327f Signed-off-by: Matthias Sohn --- .../tst/org/eclipse/jgit/pgm/FetchTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'org.eclipse.jgit.pgm.test/tst/org') diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/FetchTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/FetchTest.java index 9685d4517a..dde1a332db 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/FetchTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/FetchTest.java @@ -91,6 +91,19 @@ public class FetchTest extends CLIRepositoryTestCase { assertEquals(" * [new tag] tag -> tag", result[2]); } + @Test + public void testFetchForceUpdate() throws Exception { + String[] result = execute( + "git fetch test refs/heads/master:refs/remotes/origin/master"); + assertEquals(" * [new branch] master -> origin/master", + result[1]); + assertEquals(" * [new tag] tag -> tag", result[2]); + remoteGit.commit().setAmend(true).setMessage("amended").call(); + result = execute( + "git fetch -f test refs/heads/master:refs/remotes/origin/master"); + assertEquals("", result[0]); + } + @Test public void testFetchNoTags() throws Exception { String[] result = execute("git fetch --no-tags test refs/heads/master:refs/remotes/origin/master"); -- cgit v1.2.3