Commits on Jul 17, 2006
  1. Merge branch 'sp/reflog'

    * sp/reflog:
      Record rebase changes as 'rebase' in the reflog.
      Log ref changes made by resolve.
      Log ref changes made by quiltimport.
      Log ref changes made by git-merge and git-pull.
    Junio C Hamano committed Jul 17, 2006
Commits on Jul 16, 2006
  1. git-svn: don't check for migrations/upgrades on commit-diff

    Unlike other git-svn commands, commit-diff is intended to
    operate without needing any additional metadata inside .git
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Jul 15, 2006
  2. show-branch: fix performance problem.

    The core function used in show-branch, join_revs(), was supposed
    to be exactly the same algorithm as merge_bases(), except that
    it was a version enhanced for use with more than two heads.
    However, it needed to mark and keep a list of all the commits it
    has seen, because it needed them for its semi-graphical output.
    The function to implement this list, mark_seen(), stupidly used
    insert_by_date(), when it did not need to keep the list sorted
    during its processing.  This made "show-branch --merge-base"
    more than 20x slower compared to "merge-base --all" in some
    cases (e.g. between b5032a5 and 48ce8b0 in the Linux 2.6 kernel
    archive).  The performance of "show-branch --independent"
    suffered from the same reason.
    
    This patch sorts the resulting list after the list traversal
    just once to fix these problems.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 16, 2006
Commits on Jul 14, 2006
  1. @jonas

    Documentation/urls.txt: Use substitution to escape square brackets

    This changes "[user@]" to use {startsb} and {endsb} to insert [ and ],
    similar to how {caret} is used in git-rev-parse.txt.
    
    [jc: Removed a well-intentioned comment that broke the final
     formatting from the original patch.  While we are at it,
     updated the paragraph that claims to be equivalent to the
     section that was updated earlier without making matching
     changes.]
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas committed with Junio C Hamano Jul 14, 2006
  2. Documentation/Makefile: product depends on asciidoc.conf

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 14, 2006
  3. Merge branch 'lt/unitype'

    * lt/unitype:
      builtin-prune.c: forgot TYPE => OBJ changes.
      Remove TYPE_* constant macros and use object_type enums consistently.
    Junio C Hamano committed Jul 14, 2006
  4. Merge branch 'sp/lazy-mkdir'

    * sp/lazy-mkdir:
      Make lazy mkdir more robust.
    Junio C Hamano committed Jul 14, 2006
  5. @sigprof

    Fix "git-fetch --tags" exit status when nothing has been changed

    After commit 55b7835 git-fetch --tags
    exits with status 1 when no tags have been changed, which breaks calling
    git-fetch from scripts.
    
    Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    sigprof committed with Junio C Hamano Jul 14, 2006
  6. @matled

    argv created by handle_alias should be NULL terminated

    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jul 14, 2006
  7. documentation (urls.txt) typofix

    Alp Toker committed with Junio C Hamano Jul 14, 2006
  8. builtin-prune.c: forgot TYPE => OBJ changes.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 13, 2006
  9. @spearce

    Record rebase changes as 'rebase' in the reflog.

    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Jul 14, 2006
  10. @ltuikov

    gitweb.css: Use monospace fonts for commits and tree-diff.

    Use monospace fonts for the commit header, commit message,
    and tree-diff.  This helps viewing commit logs with ASCII art.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ltuikov committed with Junio C Hamano Jul 13, 2006
  11. @raalkml

    Do not use perl in git-commit.sh

    git-commit.sh has the only one place where perl is used
    and there it can quite trivially be done in sh.
    
    git-ls-files without "-z" produces quoted output, even if
    is different from that produced by perl code it is good
    enough.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    raalkml committed with Junio C Hamano Jul 13, 2006
  12. @tihirvon

    diff: Support 256 colors

    Add support for more than 8 colors.  Colors can be specified as numbers
    -1..255.  -1 is same as "normal".
    
    Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    tihirvon committed with Junio C Hamano Jul 13, 2006
  13. @tihirvon

    diff: Support both attributes and colors

    Make it possible to set both colors and a attribute for diff colors.
    Background colors are supported too.
    
    Syntax is now:
    
    	[attr] [fg [bg]]
    	[fg [bg]] [attr]
    
    Empty value is same as "normal normal", ie use default colors.  The new
    syntax is backwards compatible.
    
    Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    tihirvon committed with Junio C Hamano Jul 13, 2006
  14. @matled

    Documentation about exclude/ignore files

    Use .git/info/exclude in the example in git-ls-files.txt,
    instead of .git/ignore, and update the list of commands looking
    at .git/info/exclude in repository-layout.txt.
    
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jul 12, 2006
  15. @matled

    daemon: new option --detach to run git-daemon in background

    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jul 13, 2006
  16. @matled

    daemon: new option --pid-file=<path> to store the pid

    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jul 13, 2006
  17. @matled

    upload-pack: ignore write errors to stderr

    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jul 13, 2006
  18. @matled

    daemon: if one of the standard fds is missing open it to /dev/null

    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jul 13, 2006
  19. @matled

    daemon: use a custom die routine with syslog

    Removed the git-daemon prefix from die() because no other call to die
    does this.
    
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jul 13, 2006
  20. Documentation: Fix ssh://[user@]host.xz URL

    Earlier commit c3f1706 broke asciidoc markup.
    
    Noticed by Alp Toker with a fix, but fixed up in a way with smaller
    formatting impact.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 13, 2006
  21. Adjust t4013 tests to corrected format-patch.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 13, 2006
  22. format-patch: Generate a newline between the subject header and the m…

    …essage body
    
    format-patch previously didn't generate a newline after a subject. This
    caused the diffstat to not be displayed in messages with only one line
    for the commit message.
    This patch fixes this by adding a newline after the headers if a body
    hasn't been added.
    Signed-off-by: Robert Shearman <rob@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Robert Shearman committed with Junio C Hamano Jul 13, 2006
  23. t4013 diff format tests update

    This changes one test commit in the sequence to have more than
    one lines of commit log.  A few output formats (--pretty=email
    aka format-patch and --pretty=oneline) need to behave
    differently on single and multi-line log, and this change will
    help catching breakages.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 13, 2006
  24. @jnareb

    Display help for Git mode after pressing `h' or `?' in *git-status*

    Add bindings for "h" and "?" in git-status-mode to display help about the mode,
    including keymap via (describe-function 'git-status-mode), like in PCL-CVS.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jnareb committed with Junio C Hamano Jul 13, 2006
  25. @jnareb

    Wrap long lines in docstrings in contrib/emacs/git.el

    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jnareb committed with Junio C Hamano Jul 13, 2006
Commits on Jul 13, 2006
  1. Remove TYPE_* constant macros and use object_type enums consistently.

    This updates the type-enumeration constants introduced to reduce
    the memory footprint of "struct object" to match the type bits
    already used in the packfile format, by removing the former
    (i.e. TYPE_* constant macros) and using the latter (i.e. enum
    object_type) throughout the code for consistency.
    
    Eventually we can stop passing around the "type strings"
    entirely, and this will help - no confusion about two different
    integer enumeration.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Jul 11, 2006
  2. @spearce

    Make lazy mkdir more robust.

    Linus Torvalds <torvalds@osdl.org> wrote:
    
      It's entirely possible that we should just make that whole
    
    	  if (ret == ENOENT)
    
      go away. Yes, it's the right error code if a subdirectory is missing, and
      yes, POSIX requires it, and yes, WXP is probably just a horrible piece of
      sh*t, but on the other hand, I don't think git really has any serious
      reason to even care.
    spearce committed with Junio C Hamano Jul 12, 2006
  3. Merge branch 'ml/trace'

    * ml/trace:
      test-lib: unset GIT_TRACE
      GIT_TRACE: fix a mixed declarations and code warning
      GIT_TRACE: show which built-in/external commands are executed
    Junio C Hamano committed Jul 12, 2006
  4. test-lib: unset GIT_TRACE

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 12, 2006
  5. git-repack: avoid redirecting stderr into git-pack-objects

    We are trying to catch error condition of git-rev-list and cause
    the downstream pack-objects to barf, but if you run rev-list
    with anything that mucks with its stderr (such as GIT_TRACE),
    any stderr output would cause the pipeline to fail.
    
    [jc: originally from Matthias Lederhofer, with a reworded error message.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 12, 2006
  6. Fix grammatical error in git-revert

    We always talk about "commit xyz".
    
    We never talk about "xyz commit", except when we end up talking
    about a commit as a branch head (notably, I would say "the HEAD
    commit", or possibly "the top-of-master commit", but here
    $commit is a SHA1 name, not anything else).
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 12, 2006
  7. Merge branch 'js/merge-base'

    * js/merge-base:
      Additional merge-base tests (revised)
      merge-base: update the clean-up postprocessing
    Junio C Hamano committed Jul 12, 2006