After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 699400 - display automatically generated log message after 'git revert'
display automatically generated log message after 'git revert'
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: version
git master
Other Linux
: Low normal
: ---
Assigned To: meld-maint
meld-maint
Depends on:
Blocks:
 
 
Reported: 2013-05-01 16:51 UTC by Adam Dingle
Modified: 2013-05-03 22:44 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Adam Dingle 2013-05-01 16:51:39 UTC 
After I run 'git revert' to revert a previous commit, when I run 'git commit' from the command line I see a helpful automatically generated log message (which I can edit if I like):

===
Revert "window: restore size after hide/show properly"

This reverts commit 38b62e4660a470cdda94480d3ab6da467125998e.

Conflicts:
        gtk/gtkwindow.c
===

But if I commit from within Meld I don't see this log message.  I should.
Comment 1 Kai Willadsen 2013-05-01 19:56:25 UTC 
If I understand correctly, the situation is that you've run git revert -n <commit-ish> from the command line, and have then gone to Meld to commit? I agree it would be nice if we handled this, but this is basically about much more extensive index support, and we don't have a lot of that.

Anyway, I guess we'd just get the contents of os.path.join(vc.root, ".git", "COMMIT_EDITMSG") and put them in the dialog.
Comment 2 Adam Dingle 2013-05-01 20:07:15 UTC 
(In reply to comment #1)
> If I understand correctly, the situation is that you've run git revert -n
> <commit-ish> from the command line, and have then gone to Meld to commit?

Yes, exactly.

> I agree it would be nice if we handled this, but this is basically about much
> more extensive index support, and we don't have a lot of that.

To be clear, I wasn't asking to be able to perform a 'git revert' itself from within Meld - I agree that's way beyond the scope of Meld's git support today.
 
> Anyway, I guess we'd just get the contents of os.path.join(vc.root, ".git",
> "COMMIT_EDITMSG") and put them in the dialog.

Right - that's all I'm asking for.
Comment 3 Kai Willadsen 2013-05-03 21:45:40 UTC 
Turns out that this was MERGE_MSG. COMMIT_EDITMSG is the temp location for things being edited. Anyway, this is fixed in head. Thanks.
Comment 4 Adam Dingle 2013-05-03 22:44:20 UTC 
fantastic!