This project is mirrored from https://github.com/git/git. Updated .
  1. 25 Jun, 2012 1 commit
  2. 12 Jun, 2012 1 commit
    • Vincent van Ravesteijn's avatar
      t: Replace 'perl' by $PERL_PATH · a3428205
      Vincent van Ravesteijn authored
      GIT-BUILD-OPTIONS defines PERL_PATH to be used in the test suite. Only a
      few tests already actually use this variable when perl is needed. The
      other test just call 'perl' and it might happen that the wrong perl
      interpreter is used.
      
      This becomes problematic on Windows, when the perl interpreter that is
      compiled and installed on the Windows system is used, because this perl
      interpreter might introduce some unexpected LF->CRLF conversions.
      
      This patch makes sure that $PERL_PATH is used everywhere in the test suite
      and that the correct perl interpreter is used.
      Signed-off-by: default avatarVincent van Ravesteijn <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      a3428205
  3. 13 Mar, 2012 1 commit
  4. 22 Feb, 2011 1 commit
    • Jeff King's avatar
      diff: handle diffstat of rewritten binary files · ded0abc7
      Jeff King authored
      The logic in builtin_diffstat assumes that a
      complete_rewrite pair should have its lines counted. This is
      nonsensical for binary files and leads to confusing things
      like:
      
        $ git diff --stat --summary HEAD^ HEAD
         foo.rand |  Bin 4096 -> 4096 bytes
         1 files changed, 0 insertions(+), 0 deletions(-)
      
        $ git diff --stat --summary -B HEAD^ HEAD
         foo.rand |   34 +++++++++++++++-------------------
         1 files changed, 15 insertions(+), 19 deletions(-)
         rewrite foo.rand (100%)
      
      So let's reorder the function to handle binary files first
      (which from diffstat's perspective look like complete
      rewrites anyway), then rewrites, then actual diffstats.
      
      There are two bonus prizes to this reorder:
      
        1. It gets rid of a now-superfluous goto.
      
        2. The binary case is at the top, which means we can
           further optimize it in the next patch.
      Signed-off-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      ded0abc7
  5. 06 Jan, 2010 2 commits
    • Johannes Sixt's avatar
      t4030, t4031: work around bogus MSYS bash path conversion · 63962583
      Johannes Sixt authored
      Recall that MSYS bash converts POSIX style absolute paths to Windows style
      absolute paths. Unfortunately, it converts a program argument that begins
      with a double-quote and otherwise looks like an absolute POSIX path, but
      in doing so, it strips everything past the second double-quote[*]. This
      case is triggered in the two test scripts. The work-around is to place the
      Windows style path returned by $(pwd) between the quotes to avoid the path
      conversion.
      
      [*] It is already bogus that a conversion is even considered when a program
      argument begins with a double-quote because it cannot be an absolute POSIX
      path.
      Signed-off-by: default avatarJohannes Sixt <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      63962583
    • Jeff King's avatar
      textconv: use shell to run helper · 41a457e4
      Jeff King authored
      Currently textconv helpers are run directly. Running through
      the shell is useful because the user can provide a program
      with command line arguments, like "antiword -f".
      
      It also makes textconv more consistent with other parts of
      git, most of which run their helpers using the shell.
      
      The downside is that textconv helpers with shell
      metacharacters (like space) in the filename will be broken.
      Signed-off-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      41a457e4
  6. 10 Dec, 2008 3 commits
    • Junio C Hamano's avatar
      Fix t4031 · de749a97
      Junio C Hamano authored
      When I tweaked the patch to use $SHELL_PATH instead of a hard-coded
      "#!/bin/sh" to produce 3aa1f7ca (diff: respect textconv in rewrite diffs,
      2008-12-09), I screwed up.  This should fix it.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      de749a97
    • Jeff King's avatar
      diff: respect textconv in rewrite diffs · 3aa1f7ca
      Jeff King authored
      Currently we just skip rewrite diffs for binary files; this
      patch makes an exception for files which will be textconv'd,
      and actually performs the textconv before generating the
      diff.
      
      Conceptually, rewrite diffs should be in the exact same
      format as the a non-rewrite diff, except that we refuse to
      share any context. Thus it makes very little sense for "git
      diff" to show a textconv'd diff, but for "git diff -B" to
      show "Binary files differ".
      Signed-off-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      3aa1f7ca
    • Jeff King's avatar
      diff: fix handling of binary rewrite diffs · 0c01857d
      Jeff King authored
      The current emit_rewrite_diff code always writes a text patch without
      checking whether the content is binary. This means that if you end up with
      a rewrite diff for a binary file, you get lots of raw binary goo in your
      patch.
      
      Instead, if we have binary files, then let's just skip emit_rewrite_diff
      altogether. We will already have shown the "dissimilarity index" line, so
      it is really about the diff contents. If binary diffs are turned off, the
      "Binary files a/file and b/file differ" message should be the same in
      either case. If we do have binary patches turned on, there isn't much
      point in making a less-efficient binary patch that does a total rewrite;
      no human is going to read it, and since binary patches don't apply with
      any fuzz anyway, the result of application should be the same.
      Signed-off-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      0c01857d