1. 25 9月, 2005 6 次提交
  2. 24 9月, 2005 12 次提交
  3. 23 9月, 2005 14 次提交
  4. 22 9月, 2005 8 次提交
    • J
      Retire diff-helper. · 5cfcd07c
      Junio C Hamano 提交于
      The textual diff generation with built-in '-p' in diff-* brothers has
      proven to be useful enough that git-diff-helper outlived its usefulness.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      5cfcd07c
    • J
      Retire rev-tree. · 9dcc829f
      Junio C Hamano 提交于
      Some old scripts might still use git-rev-tree, but it really is
      clearly inferior in every way to git-rev-list that such scripts should
      be fixed anyway. Fixing them should be pretty easy.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      9dcc829f
    • J
      Retire git-export. · 0fe51391
      Junio C Hamano 提交于
      git-export was done as a concept example on how easy it is to export
      the git data to something else. It's much less powerful than any
      number of trivial one-liner scripts now, and real exporters would not
      ever use git-export.
      
      It's obviously much less powerful than "git-whatchanged", or just
      about any combination of git-rev-list + git-diff-tree.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      0fe51391
    • L
      [PATCH] Fix strange timezone handling · 01c6ad29
      Linus Torvalds 提交于
      We generate the ASCII representation of our internal date representation
      ("seconds since 1970, UTC + timezone information") in two different
      places.
      
      One of them uses the stupid and obvious way to make sure that it gets the
      sexagecimal representation right for negative timezones even if they might
      not be exact hours, and the other one depends on the modulus operator
      always matching the sign of argument.
      
      Hey, the clever one works. And C90 even specifies that behaviour. But I
      had to think about it for a while when I was re-visiting this area, and
      even if I didn't have to, it's kind of strange to have two different ways
      to print out the same data format.
      
      So use a common helper for this. And select the stupid and straighforward
      way.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      01c6ad29
    • J
      Revert "Use git-merge instead of git-resolve in git-pull." · acfadcfb
      Junio C Hamano 提交于
      This reverts f887564a commit.
      acfadcfb
    • J
      Revert "Make Octopus merge message a bit nicer." · b91fb518
      Junio C Hamano 提交于
      This reverts 63f1aa6c commit.
      b91fb518
    • S
      [PATCH] fetch.c: Remove call to parse_object() from process() · 4041483e
      Sergey Vlasov 提交于
      The call to parse_object() in process() is not actually needed - if
      the object type is unknown, parse_object() will be called by loop();
      if the type is known, the object will be parsed by the appropriate
      process_*() function.
      
      After this change blobs which exist locally are no longer parsed,
      which gives about 2x CPU usage improvement; the downside is that there
      will be no warnings for existing corrupted blobs, but detecting such
      corruption is the job of git-fsck-objects, not the fetch programs.
      Newly fetched objects are still checked for corruption in http-fetch.c
      and ssh-fetch.c (local-fetch.c does not seem to do it, but the removed
      parse_object() call would not be reached for new objects anyway).
      Signed-off-by: NSergey Vlasov <vsu@altlinux.ru>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      4041483e
    • S
      [PATCH] fetch.c: Clean up object flag definitions · 478dbeec
      Sergey Vlasov 提交于
      Remove holes left after deleting flags, and use shifts to emphasize
      that flags are single bits.
      Signed-off-by: NSergey Vlasov <vsu@altlinux.ru>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      478dbeec