diff options
| author | Thomas Wolf <twolf@apache.org> | 2024-12-05 20:19:17 +0100 |
|---|---|---|
| committer | Thomas Wolf <twolf@apache.org> | 2024-12-11 22:23:41 +0100 |
| commit | e9094fffdb9d5d498cf75584267d1fd7e3690374 (patch) | |
| tree | 0970704ccbb3cda0b0d0fe64259f1efcd7bf6438 /org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java | |
| parent | df7810957c00f3d857c006ff62ea7dd0e5b6fb76 (diff) | |
| download | jgit-e9094fffdb9d5d498cf75584267d1fd7e3690374.tar.gz jgit-e9094fffdb9d5d498cf75584267d1fd7e3690374.zip | |
RevertCommand: use only first line in revert commit message
C git uses only the first line of the title paragraph of the reverted
commit to build the title of the revert commit. Align the JGit behavior
with that.
Since git 2.43.0, a revert of a revert uses a title "Reapply "xxx""
instead of "Revert "Revert "xxx""".[1] This is _not_ implemented in
this change.
[1] https://github.com/git/git/commit/883cb1b8f86d
Bug: jgit-117
Change-Id: I030092c6b9447bb738e6d761af5ce50df58cc6d3
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java index 855c3b1cf3..6643c83662 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.com> and others + * Copyright (C) 2010, 2024 Christian Halstrick <christian.halstrick@sap.com> and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -143,8 +143,8 @@ public class RevertCommand extends GitCommand<RevCommit> { merger.setCommitNames(new String[] { "BASE", ourName, revertName }); //$NON-NLS-1$ - String shortMessage = "Revert \"" + srcCommit.getShortMessage() //$NON-NLS-1$ - + "\""; //$NON-NLS-1$ + String shortMessage = "Revert \"" //$NON-NLS-1$ + + srcCommit.getFirstMessageLine() + '"'; String newMessage = shortMessage + "\n\n" //$NON-NLS-1$ + "This reverts commit " + srcCommit.getId().getName() //$NON-NLS-1$ + ".\n"; //$NON-NLS-1$ |