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

gitk: added external diff file rename detection #1774

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Commits on Sep 6, 2024

  1. gitk: added external diff file rename detection

    * If a file was renamed between commits and an external diff is started
      through gitk on the THE ORIGINAL FILE NAME (not the renamed one),
      gitk was unable to open the renamed file in the external diff editor.
      It failed to fetch the renamed file from git, because it fetched it
      with the original path in contrast to using the renamed path
    * gitk now detects the rename and opens the external diff with the
      original and the RENAMED file instead of no file (it is able to
      fetch the renamed file now from git with the renamed path/filename)
    * Since git doesn't destinguish between move or rename this also works
      for moved files
    * External diff detection and usage is optional and has to be enabled in
      gitk settings
    * External rename detection ist marked EXPERIMENTAL in the settings
      and disabled by default
    * Showing the renamed file doesn't work when THE RENAMED FILE is selected
      in gitk and an external diff ist started on that file, because the
      selected file is not renamed in that commit. It already IS the renamed
      file.
    
    Signed-off-by: Tobias Boeesch <[email protected]>
    ToBoMi committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    6209080 View commit details
    Browse the repository at this point in the history