Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Oct 16, 2012
  1. Add MIT license notice

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Mar 14, 2012
  1. Fix error in copy from working tree

    authored
    Commit eacde87 introduced a bug that caused files from the working
    tree to be copied to the incorrect location in the tmp directory. This
    affected any file that was not located at the root of the working tree.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  2. Fix implementation of the cleanup trap for Windows

    authored
    Prior to this commit, the cleanup trap that removes the tmp dir
    created by the script would fail on Windows. The error was silently
    ignored by the script.
    
    On Windows, a directory cannot be removed while it is the working
    directory of the process (thanks to Johannes Sixt on the Git list
    for this info [1]).
    
    This commit eliminates the 'cd' into the tmp directory that was
    causing the cleanup error.
    
    [1]: http://article.gmane.org/gmane.comp.version-control.git/193086
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Mar 13, 2012
  1. Refactor while loop used to populate tmp/right_dir

    authored
    There were 3 instances of a 'while read; do' that used identical logic.
    This commit group them into a single loop.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  2. Teach diffall to handle working copy changes without using tar

    authored
    The 'tar' utility is not available on all platforms (some only support
    'gnutar').  An earlier commit created a work-around for this problem,
    but a better solution is to eliminate the use of 'tar' completely.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  3. Teach diffall to create tmp dirs without using mktemp

    authored
    mktemp is not available on all platforms.  Instead of littering the code
    with a work-around, this commit replaces mktemp with a one-line Perl
    script.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  4. Change comment to reflect actual reason for 'cdup'

    authored
    The comment from an earlier commit did not reflect the actual reason this
    operation is needed.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Feb 27, 2012
  1. Documented that '--' is mandatory if a pathspec is given

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Feb 24, 2012
  1. Remove bashism in '--extcmd=<command>' comparison

    authored
    'test $# == 1` is a bashism
    'test $# = 1' should be used instead
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  2. Changed test for '--extcmd=<command>' to use $#

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  3. Documented '--extcmd' in the README

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  4. Changed 'path_sep' to 'dashdash_seen'

    authored
    A reviewer commented that the name 'path_sep' "makes one wonder 'are we
    somehow talking about the difference between / vs \ here?'  In other
    parts of the system, this is typically called 'dashdash_seen'".
    
    The name was changed to match local conventions.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  5. Corrected location of hard-coded tmp directory

    authored
    In commit 1959a18, the leading '/tmp' was mistakenly dropped
    from the hard-coded tmp dir location.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Feb 23, 2012
  1. Files with spaces in their names are now properly supported

    authored
    In earlier versions, if a file name had spaces it would silently fail
    due to improper quoting in 'git ls-tree' commands.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  2. Removed spaces after redirection operator

    authored
    Change made based on feedback from patch review on git developers list.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  3. Verify that user supplied a command for --extcmd

    authored
    If the user executed "git diffall --extcmd", it would result in a shift
    error with no useful message to the user.
    
    The script now verifies that a command was specified after --extcmd if
    it is the last option on the command-line.  If it fails, an error
    message and usage instructions are displayed.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  4. Cleaned up README

    authored
    Changed "The script is compatible with all forms" to "most common forms"
    used to specify a commit range for diff.
    
    Added line breaks for long lines.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  5. Renamed "common_ancestor" to "merge_base"

    authored
    During patch review on the git list, it was pointed out that diffing
    <commit>...<commit> is not just a common ancestor, but but a merge base.
    
    A merge base is "a common ancestor none of whose children is a common
    ancestor".
    
    The variable was renamed to try and make this more clear.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  6. Improved robustness of tmp dir creation

    authored
    During a review of this script on the git developers list, it was pointed
    out that using a fixed tmp dir name could result in name crashes.
    
    Adding '$$' to the dir name will provide some protection.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Feb 22, 2012
  1. Fixed more indentation errors

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  2. Cleaned up trap function so it actually runs on abnormal exit

    authored
    In earlier versions, trap was not set until the last line of the script.
    This prevented it from executing on any abnormal exits.  It must be set
    up *before* it is needed.  This version also moves the '--copy-back'
    feature to the end of normal execution rather than making it part of the
    exit trap.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  3. Eliminated use of 'which' statements

    authored
    Developers on the git list pointed out that:
    
      "['which'] output is not machine parseable, and exit code is not
       reliable, across platforms.  It is only meant for consumption
       by human who can read English (or natural language in the
       current locale)."
    
    So rather than use which to determine if a command is available, the
    script now simply checks for errors when calling the potentially
    missing commands.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  4. Cleaned up a final poorly quoted string

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  5. Changed back to #!/bin/sh

    authored
    This matches the style used in the other shell scripts bundled with git.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  6. Simplified path concatenation logic per recommendations from the git …

    authored
    …list
    
    Suggestion for improvement from Junio Hamano.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  7. Cleaned up quoting of variables

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  8. Improved readability of while loop

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  9. Corrected indentation error

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  10. Removed blank line at end of file

    authored
    This is a considered a whitespace error in git coding guidelines
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Feb 20, 2012
  1. Stop echoing value of $diff_tool on --extcmd

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  2. Cleaned up opening comments

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  3. Use tabs for indentation rather than spaces

    authored
    The git CodingGuidelines state that tabs are preferred.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
  4. Replaced `` with $() for command substitution

    authored
    The git CodingGuidelines state that:
    
      "We prefer $( ... ) for command substitution; unlike ``, it
       properly nests.  It should have been the way Bourne spelled
       it from day one, but unfortunately isn't"
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Feb 19, 2012
  1. Updated code style to meet git standards

    authored
    Based on recent discussions on the git-dev list [1], the preferred style
    for shell scripts has changed.  Changes include:
      - 'test' is preferred over '['
      - 'then' statements should be on a separate line
    
    [1]: http://thread.gmane.org/gmane.comp.version-control.git/190836/focus=190884
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Commits on Jan 5, 2012
  1. Updated copyright statement for 2012

    authored
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Something went wrong with that request. Please try again.