Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: thenigan/git-diffall
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: thenigan/git-diffall
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: perl-implementation
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 6 files changed
  • 1 contributor

Commits on Mar 22, 2012

  1. Change core features from shell script to Perl

    This rewrite implements changes suggested on the Git developer's list [1].
    
    The main reasons for changing the implementation include:
      - Using a combination of 'git diff --raw -z' with 'git update-index /
        checkout-index' improves support for file names with special
        characters.
      - All diff arguments are now passed on to the underlying 'git diff'.
      - File add/deletes are handled more robustly.
      - The script no longer relies on 'mktemp' or 'tar'.
    
    Because the script still relies on 'git-mergetool--lib' to actually launch
    the diff tool, a small helper shell script is needed to interface with it.
    
    [1]: http://thread.gmane.org/gmane.comp.version-control.git/191297/focus=191343
    
    Signed-off-by: Tim Henigan <[email protected]>
    thenigan committed Mar 22, 2012
    Configuration menu
    Copy the full SHA
    5e9b9b1 View commit details
    Browse the repository at this point in the history
  2. diffall: added install and uninstall scripts

    Signed-off-by: Tim Henigan <[email protected]>
    thenigan committed Mar 22, 2012
    Configuration menu
    Copy the full SHA
    762871a View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2012

  1. fix handling of submodules that live in subdirectories

    If the diff includes a submodule that lives in a subdirectory of
    the project, the script fails with "No such file or directory".
    
    For example, if a submodule is located at '<repo root>/lib/sub',
    the script fails when it tries to write the submodule SHA1 to
    '/tmp/.../lib/sub' because the 'lib' directory does not exist.
    
    This commit teaches diffall to create the subdirectory path in the
    tmp location prior to writing the submodule file.
    
    This closes #21 on GitHub
    
    Signed-off-by: Tim Henigan <[email protected]>
    thenigan committed Apr 3, 2012
    Configuration menu
    Copy the full SHA
    1969dfe View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2012

  1. append "dirty" to submodule SHA1 when needed

    If a submodule is dirty (i.e. has uncommitted changes) then
    
      'git diff' reports "<SHA1 of parent>-dirty"
    
    while
    
      'git diff --raw' reports "<SHA1 of parent>"
    
    diffall uses the '--raw' diff format, so the "dirty" flag is lost.
    
    To make the output more closely match that of 'git diff', teach
    diffall to append "-dirty" to the submodule SHA1 when needed.
    
    This closes #22 on GitHub.
    
    Signed-off-by: Tim Henigan <[email protected]>
    thenigan committed Apr 4, 2012
    Configuration menu
    Copy the full SHA
    3a9cb3a View commit details
    Browse the repository at this point in the history
Loading