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.
70 lines
2.8 KiB
70 lines
2.8 KiB
13 years ago
|
/*
|
||
|
|
* Copyright (C) 2012, 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 org.eclipse.jgit.lib.CLIRepositoryTestCase;
|
||
|
|
import org.junit.Test;
|
||
|
|
|
||
|
|
public class CommitAndLogTest extends CLIRepositoryTestCase {
|
||
|
|
@Test
|
||
|
|
public void testCommitAmend() throws Exception {
|
||
|
|
assertArrayEquals(new String[] { // commit
|
||
|
|
"[master 101cffba0364877df1942891eba7f465f628a3d2] first comit", //
|
||
|
|
"", // amend
|
||
|
|
"[master d2169869dadf16549be20dcf8c207349d2ed6c62] first commit", //
|
||
|
|
"", // log
|
||
|
|
"commit d2169869dadf16549be20dcf8c207349d2ed6c62", //
|
||
|
|
"Author: GIT_COMMITTER_NAME <GIT_COMMITTER_EMAIL>", //
|
||
|
|
"Date: Sat Aug 15 20:12:58 2009 -0330", //
|
||
|
|
"", //
|
||
|
|
" first commit", //
|
||
|
|
"", //
|
||
|
|
"" //
|
||
|
|
}, execute("git commit -m 'first comit'", //
|
||
|
|
"git commit --amend -m 'first commit'", //
|
||
|
|
"git log"));
|
||
|
|
}
|
||
|
|
}
|