1. 28 Jun, 2016 2 commits
  2. 29 Jan, 2015 1 commit
    • Junio C Hamano's avatar
      diff-format doc: a score can follow M for rewrite · ac1c2d9a
      Junio C Hamano authored
      b6d8f309 (diff-raw format update take #2., 2005-05-23) started
      documenting the diff format, and it said
      
       ...
       (8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
       (9) status, followed by similarlity index number only for C and R.
       (10) a tab or a NUL when '-z' option is used.
       ...
      
      because C and R _were_ the only ones that came with a number back
      then.  This was corrected by ddafa7e9 (diff-helper: Fix R/C score
      parsing under -z flag., 2005-05-29) and we started saying "score"
      instead of "similarlity index" (because we can have other kind of
      score there), and stopped saying "only for C and R" (because Git is
      an ever evolving system).  Later f345b0a0 (Add -B flag to diff-*
      brothers., 2005-05-30) introduced a new concept, "dissimilarity"
      score; it did not have to fix any documentation.
      
      The current text that says only C and R can have scores came
      independently from a5a323f3 (Add reference for status letters in
      documentation., 2008-11-02) and it was wrong from the day one.
      
      Noticed-by: Mike Hommey
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      ac1c2d9a
  3. 31 Jan, 2010 1 commit
  4. 28 Jul, 2009 1 commit
  5. 20 Dec, 2008 1 commit
  6. 02 Nov, 2008 1 commit
  7. 12 Dec, 2007 1 commit
    • Junio C Hamano's avatar
      git-diff --numstat -z: make it machine readable · f604652e
      Junio C Hamano authored
      The "-z" format is all about machine parsability, but showing renamed
      paths as "common/{a => b}/suffix" makes it impossible.  The scripts would
      never have successfully parsed "--numstat -z -M" in the old format.
      
      This fixes the output format in a (hopefully minimally) backward
      incompatible way.
      
       * The output without -z is not changed.  This has given a good way for
         humans to view added and deleted lines separately, and showing the
         path in combined, shorter way would preserve readability.
      
       * The output with -z is unchanged for paths that do not involve renames.
         Existing scripts that do not pass -M/-C are not affected at all.
      
       * The output with -z for a renamed path is shown in a format that can
         easily be distinguished from an unrenamed path.
      
      This is based on Jakub Narebski's patch.  Bugs and documentation typos
      are mine.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      f604652e
  8. 05 Dec, 2007 1 commit
  9. 02 Nov, 2007 1 commit
  10. 25 Jun, 2007 1 commit
  11. 07 Jun, 2007 1 commit
    • Junio C Hamano's avatar
      War on whitespace · a6080a0a
      Junio C Hamano authored
      This uses "git-apply --whitespace=strip" to fix whitespace errors that have
      crept in to our source files over time.  There are a few files that need
      to have trailing whitespaces (most notably, test vectors).  The results
      still passes the test, and build result in Documentation/ area is unchanged.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      a6080a0a
  12. 04 May, 2007 1 commit
  13. 04 Feb, 2007 1 commit
  14. 27 Nov, 2006 1 commit
  15. 27 Oct, 2006 1 commit
  16. 26 Oct, 2006 2 commits
    • Junio C Hamano's avatar
      combine-diff: a few more finishing touches. · d5f6a01a
      Junio C Hamano authored
      "new file" and "deleted file" were already reported in the
      original code, but the logic was not as transparent as it could
      have.  This uses a few variables and more comments to clarify
      the flow.  The rule is: (1) if a path exists in the merge result
      when no parent had it, we report "new" (otherwise it came from
      the parents, as opposed to have added by the evil merge). (2) if
      the path does not exist in the merge result, it is "deleted".
      
      Since we can say "new" and "deleted", there is no reason not to
      follow the /dev/null convention.  This fixes it.
      
      Appending function name after @@@ ... @@@ is trivial, so
      implement it.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      d5f6a01a
    • Jakub Narębski's avatar
      diff-format.txt: Combined diff format documentation supplement · 0074aba1
      Jakub Narębski authored
      Update example combined diff format to the current version
      $ git diff-tree -p -c fec9ebf1
      and provide complete first chunk in example.
      
      Document combined diff format headers: how "diff header" look like,
      which of "extended diff headers" are used with combined diff and how
      they look like, differences in two-line from-file/to-file header from
      non-combined diff format, chunk header format.
      
      It should be noted that combined diff format was designed for quick
      _content_ inspection and renames would work correctly to pick which
      blobs from each tree to compare but otherwise not reflected in the
      output (the pathnames are not shown).
      
      [jc: with minimum copyediting]
      Signed-off-by: Jakub Narębski's avatarJakub Narebski <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      0074aba1
  17. 28 Jan, 2006 1 commit
  18. 29 Dec, 2005 1 commit
  19. 17 Nov, 2005 1 commit
  20. 15 Nov, 2005 1 commit
  21. 11 Nov, 2005 1 commit
  22. 18 Oct, 2005 1 commit
  23. 10 Oct, 2005 1 commit
  24. 05 Oct, 2005 1 commit
  25. 22 Sep, 2005 1 commit
  26. 08 Sep, 2005 1 commit
    • Junio C Hamano's avatar
      Big tool rename. · 215a7ad1
      Junio C Hamano authored
      As promised, this is the "big tool rename" patch.  The primary differences
      since 0.99.6 are:
      
        (1) git-*-script are no more.  The commands installed do not
            have any such suffix so users do not have to remember if
            something is implemented as a shell script or not.
      
        (2) Many command names with 'cache' in them are renamed with
            'index' if that is what they mean.
      
      There are backward compatibility symblic links so that you and
      Porcelains can keep using the old names, but the backward
      compatibility support  is expected to be removed in the near
      future.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      215a7ad1
  27. 30 Aug, 2005 1 commit
  28. 06 Aug, 2005 1 commit
  29. 08 Jun, 2005 1 commit
  30. 05 Jun, 2005 1 commit
  31. 30 May, 2005 1 commit
    • Junio C Hamano's avatar
      [PATCH] diff-helper: Fix R/C score parsing under -z flag. · ddafa7e9
      Junio C Hamano authored
      The score number that follow R/C status were parsed but the
      parse pointer was not updated, causing the entire line to become
      unrecognized.  This patch fixes this problem.
      
      There was a test missing to catch this breakage, which this
      commit adds as t4009-diff-rename-4.sh.  The diff-raw tests used
      in related t4005-diff-rename-2.sh (the same test without -z) and
      t4007-rename-3.sh were stricter than necessarily, despite that
      the comment for the tests said otherwise.  This patch also
      corrects them.
      
      The documentation is updated to say that the status can
      optionally be followed by a number called "score"; it does not
      have to stay similarity index forever and there is no reason to
      limit it only to C and R.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
      ddafa7e9
  32. 23 May, 2005 1 commit
  33. 22 May, 2005 1 commit
    • Junio C Hamano's avatar
      [PATCH] The diff-raw format updates. · 81e50eab
      Junio C Hamano authored
      Update the diff-raw format as Linus and I discussed, except that
      it does not use sequence of underscore '_' letters to express
      nonexistence.  All '0' mode is used for that purpose instead.
      
      The new diff-raw format can express rename/copy, and the earlier
      restriction that -M and -C _must_ be used with the patch format
      output is no longer necessary.  The patch makes -M and -C flags
      independent of -p flag, so you need to say git-whatchanged -M -p
      to get the diff/patch format.
      
      Updated are both documentations and tests.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
      81e50eab
  34. 15 May, 2005 1 commit
  35. 10 May, 2005 1 commit
  36. 08 May, 2005 1 commit