Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NBug] CombinedDiff artificial commit cannot be explicitly compare... #7087

Closed
simontom opened this issue Sep 2, 2019 · 5 comments · Fixed by #7091

Comments

@simontom
Copy link

commented Sep 2, 2019

⚠️ The sections below must be filled in and this text must be removed or the issue will be closed.

Current behaviour

Expected behaviour

Steps to reproduce

Error Details

System.ArgumentOutOfRangeException: CombinedDiff artificial commit cannot be explicitly compared: 3333333333333333333333333333333333333333, a7d7f51ed7a57322d4ebb8805d7bd4a0c9d011de
Parameter name: firstRevision
Actual value was 3333333333333333333333333333333333333333.
   at GitCommands.Git.RevisionDiffProvider.GetInternal(String firstRevision, String secondRevision, String fileName, String oldFileName, Boolean isTracked)
   at GitCommands.GitModule.OpenWithDifftool(String filename, String oldFileName, String firstRevision, String secondRevision, String extraDiffArguments, Boolean isTracked)
   at GitUI.CommandsDialogs.RevisionDiffControl.openWithDifftoolToolStripMenuItem_Click(Object sender, EventArgs e)
   at System.Windows.Forms.ToolStripItem.RaiseEvent(Object key, EventArgs e)
   at System.Windows.Forms.ToolStripMenuItem.OnClick(EventArgs e)
   at System.Windows.Forms.ToolStripItem.HandleClick(EventArgs e)
   at System.Windows.Forms.ToolStripItem.PerformClick()
   at GitUI.CommandsDialogs.RevisionDiffControl.ExecuteCommand(Int32 cmd)
   at ResourceManager.GitExtensionsControl.ProcessCmdKey(Message& msg, Keys keyData)
   at System.Windows.Forms.Control.ProcessCmdKey(Message& msg, Keys keyData)
   at System.Windows.Forms.ContainerControl.ProcessCmdKey(Message& msg, Keys keyData)
   at System.Windows.Forms.Control.ProcessCmdKey(Message& msg, Keys keyData)
   at System.Windows.Forms.Control.ProcessCmdKey(Message& msg, Keys keyData)
   at System.Windows.Forms.ContainerControl.ProcessCmdKey(Message& msg, Keys keyData)
   at ResourceManager.GitExtensionsControl.ProcessCmdKey(Message& msg, Keys keyData)
   at System.Windows.Forms.Control.ProcessCmdKey(Message& msg, Keys keyData)
   at System.Windows.Forms.Control.PreProcessMessage(Message& msg)
   at System.Windows.Forms.Control.PreProcessControlMessageInternal(Control target, Message& msg)
   at System.Windows.Forms.Application.ThreadContext.PreTranslateMessage(MSG& msg)

Environment

  • Git Extensions 3.1.1.6049
  • Build 2f87210
  • Git 2.23.0.windows.1
  • Microsoft Windows NT 10.0.16299.0
  • .NET Framework 4.8.3928.0
  • DPI 96dpi (no scaling)
@archivarius-bot

This comment has been minimized.

Copy link

commented Sep 2, 2019

Thank you for the bug report 👍

Sadly, it appears some important information is still missing, which you may have overlooked while submitting the bug.
Without this information we may not be able to assist you in resolving the issue.

Please review your submission, fill the missing information in and post a new comment to ping us back to re-open the issue.
Thanks again

@archivarius-bot archivarius-bot bot closed this Sep 2, 2019
@gerhardol gerhardol added this to the 3.3 milestone Sep 2, 2019
@gerhardol

This comment has been minimized.

Copy link
Member

commented Sep 2, 2019

The context menu is correctly disabling diff with combined diff, but shortcut can make the same diff. So difftool (using F3 etc) must be handled too.

@gerhardol gerhardol reopened this Sep 2, 2019
@simontom

This comment has been minimized.

Copy link
Author

commented Sep 2, 2019

Yessss, exactly!
It was in a merge commit, using F3 shortcut.
Sorry, I was just leaving the office & was in kinda hurry.

@RussKie

This comment has been minimized.

Copy link
Member

commented Sep 2, 2019

Can you please share some screenshots, I don't seem to understand the issue.

@gerhardol

This comment has been minimized.

Copy link
Member

commented Sep 2, 2019

Can you please share some screenshots, I don't seem to understand the issue.

See the PR for reproduce information

The combinedDiff only exists in RevisionDiff what I can realize.
It should be enough to just ignore CombinedDiff also if normal diff are selected (even if menu is disabled if at least one combineddiff is selected).

@RussKie RussKie modified the milestones: 3.3, 3.2.0 Sep 2, 2019
@RussKie RussKie closed this in #7091 Sep 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.