1. 21 6月, 2005 1 次提交
  2. 18 6月, 2005 1 次提交
  3. 14 6月, 2005 1 次提交
  4. 13 6月, 2005 2 次提交
    • L
      git-apply: fix error handling for nonexistent files · 84fb9a4d
      Linus Torvalds 提交于
      Missing argument for error() function. We should really use the
      gcc printf format checking capabilities.
      84fb9a4d
    • L
      git-apply: ignore empty git headers · 206de27e
      Linus Torvalds 提交于
      A meaningful (ie non-empty) git patch always has more information in the
      header than just the "diff --git" line itself: it needs to have either a
      patch associated with it (which implies "---" and "+++" lines in the
      header) or it needs to have rename/copy/delete/create information in it.
      
      Just ignore git patches which have no change information. Otherwise we'll
      end up with a patch that doesn't have filenames etc filled in, and we'll
      be unhappy.
      206de27e
  5. 08 6月, 2005 1 次提交
  6. 06 6月, 2005 7 次提交
    • L
      diff 'rename' format change. · dc938417
      Linus Torvalds 提交于
      Clearly even Junio felt git "rename" header lines should say "from/to"
      instead of "old/new", since he wrote the documentation that way.
      
      This way it also matches "copy".
      
      git-apply will accept both versions, at least for a while.
      dc938417
    • L
      git-apply: consider it an error to apply no changes · f7b79707
      Linus Torvalds 提交于
      A "--stat" or a "--check" will just be quiet, but if
      you try to apply something with no changes, that's an
      error.
      f7b79707
    • L
      git-apply: fix rename header parsing · 33f4d087
      Linus Torvalds 提交于
      It's not "rename from" and "rename to", it's "rename old" and "rename new".
      
      Which is illogical and doesn't match the "copy from/to" case, but that's
      life. Maybe Junio will fix it up one of these days.
      33f4d087
    • L
      git-apply: actually apply patches and update the index · 5aa7d94c
      Linus Torvalds 提交于
      We update the index only if the "--index" flag is given,
      so you can actually use this as a strange kind of "patch"
      program even for non-git usage. Not that you'd likely
      want to, but it comes in handy for testing.
      
      This _should_ more or less get everythign right, but as
      usual I leave the testing to the usrs..
      5aa7d94c
    • L
      git-apply: fix apply of a new file · 30996652
      Linus Torvalds 提交于
      (And fix name handling for when we have an implied
      create or delete event from a traditional diff).
      30996652
    • L
      git-apply: find offset fragments, and really apply them · 6e7c92a9
      Linus Torvalds 提交于
      This applies the fragments in memory, but doesn't actually
      write the results out to the files yet. But we now do all the
      difficult parts, the rest is just basically writing the
      results out and updating the index.
      6e7c92a9
    • L
      git-apply: first cut at actually checking fragment data · 3cca928d
      Linus Torvalds 提交于
      Right now it requires that the fragment offsets be exact,
      and it doesn't actually apply the fragment yet, but it
      does find where it goes and verify the data.
      
      Next step: actually applying the fragment changes.
      3cca928d
  7. 01 6月, 2005 2 次提交
  8. 31 5月, 2005 1 次提交
    • J
      [PATCH] Show dissimilarity index for D and N case. · 70aadac0
      Junio C Hamano 提交于
      The way broken deletes and creates are shown in the -p
      (diff-patch) output format has become consistent with how
      rename/copy edits are shown.  They will show "dissimilarity
      index" value, immediately following the "deleted file mode" and
      "new file mode" lines.
      
      The git-apply is taught to grok such an extended header.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      70aadac0
  9. 27 5月, 2005 6 次提交
  10. 25 5月, 2005 1 次提交
  11. 24 5月, 2005 8 次提交