Skip to content
Commits on Jun 22, 2006
  1. Merge branch 'master' into next

    Junio C Hamano committed
    * master:
      git-svn: fix commit --edit flag when using SVN:: libraries
      Makefile: do not force unneeded recompilation upon GIT_VERSION changes
      Check and document the options to prevent mistakes.
      Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
  2. Merge branch 'js/lsfix'

    Junio C Hamano committed
    * js/lsfix:
      Initialize lock_file struct to all zero.
      Make git-update-ref a builtin
      Make git-update-index a builtin
      Make git-stripspace a builtin
      Make git-mailinfo a builtin
      Make git-mailsplit a builtin
      Make git-write-tree a builtin
  3. Merge branch 'ew/rebase'

    Junio C Hamano committed
    * ew/rebase:
      rebase --merge: fix for rebasing more than 7 commits.
      rebase: error out for NO_PYTHON if they use recursive merge
      Add renaming-rebase test.
      rebase: Allow merge strategies to be used when rebasing
  4. Merge branch 'jn/web'

    Junio C Hamano committed
    * jn/web:
      gitweb: whitespace cleanup around '='
      gitweb: Use $hash_base as $search_hash if possible
      gitweb: Make use of $PATH_INFO for project parameter
      Move $gitbin earlier in gitweb.cgi
      Add git version to gitweb output
      gitweb: whitespace cleanup
      gitweb: style done with stylesheet
      gitweb: A couple of page title tweaking
      Fix: Support for the standard mime.types map in gitweb
      gitweb: add type="text/css" to stylesheet link
      Make CSS file gitweb/gitweb.css more readable
      Fix gitweb stylesheet
      Support for the standard mime.types map in gitweb
      gitweb: text files for 'blob_plain' action without charset by default
      gitweb: safely output binary files for 'blob_plain' action
      Move gitweb style to gitweb.css
  5. Merge early parts of branch 'js/diff'

    Junio C Hamano committed
  6. Merge branch 'jc/upload-corrupt'

    Junio C Hamano committed
    * jc/upload-corrupt:
      daemon: send stderr to /dev/null instead of closing.
      upload-pack/fetch-pack: support side-band communication
      Retire git-clone-pack
      upload-pack: prepare for sideband message support.
      upload-pack: avoid sending an incomplete pack upon failure
  7. Merge branch 'ew/rebase' into next

    Junio C Hamano committed
    * ew/rebase:
      rebase --merge: fix for rebasing more than 7 commits.
  8. Merge branch 'jn/web' into next

    Junio C Hamano committed
    * jn/web:
      gitweb: whitespace cleanup around '='
      gitweb: Use $hash_base as $search_hash if possible
  9. @jnareb

    gitweb: whitespace cleanup around '='

    jnareb committed with Junio C Hamano
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. @tihirvon

    gitweb: Use $hash_base as $search_hash if possible

    tihirvon committed with Junio C Hamano
    $hash (h parameter) does not always point to a commit. Use $hash_base as
    $search_hash when it is defined.
    
    Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Merge branch 'jc/waitpid'

    Junio C Hamano committed
    * jc/waitpid:
      Restore SIGCHLD to SIG_DFL where we care about waitpid().
  12. Merge branch 'ff/c99'

    Junio C Hamano committed
    * ff/c99:
      Remove all void-pointer arithmetic.
      Change types used in bitfields to be `int's.
      Don't use empty structure initializers.
      Cast pointers to `void *' when used in a format.
      Don't instantiate structures with FAMs.
      Initialize FAMs using `FLEX_ARRAY'.
      Remove ranges from switch statements.
  13. Merge branch 'pb/config'

    Junio C Hamano committed
    * pb/config:
      git_config: access() returns 0 on success, not > 0
      repo-config: Fix late-night bug
      Read configuration also from $HOME/.gitconfig
      Fix setting config variables with an alternative GIT_CONFIG
      Support for extracting configuration from different files
  14. Merge branch 'lt/objlist'

    Junio C Hamano committed
    * lt/objlist:
      Add "named object array" concept
  15. git-svn: fix commit --edit flag when using SVN:: libraries

    Eric Wong committed with Junio C Hamano
    Trying to open an interactive editor in the console while stdout is
    being piped to the parent process doesn't work out very well.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. Makefile: do not force unneeded recompilation upon GIT_VERSION changes

    Junio C Hamano committed
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  17. rebase --merge: fix for rebasing more than 7 commits.

    Junio C Hamano committed
    Instead of using 4-digit numbers to name commits being rebased,
    just use "cmt.$msgnum" string, with $msgnum as a decimal number
    without leading zero padding.  This makes it possible to rebase
    more than 9999 commits, but of more practical importance is that
    the earlier code used "printf" to format already formatted
    $msgnum and barfed when it counted up to 0008.  In other words,
    the old code was incapable of rebasing more than 7 commits, and
    this fixes that problem.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  18. @ebiederm

    Check and document the options to prevent mistakes.

    ebiederm committed with Junio C Hamano
    When multiple recipients are given to git-send-email on the same
    --cc line the code does not properly handle it.
    
    Full and proper parsing of the email addresses so I can detect
    which commas mean a new email address is more than I care to implement.
    
    In particular this email address: "bibo,mao" <bibo.mao@intel.com>
    must not be treated as two email addresses.
    
    So this patch simply treats all commas in recipient lists as
    an error and fails if one is given.
    
    At the same time it documents that git-send-email wants multiple
    instances of --cc specified on the command line if you want to
    cc multiple recipients.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  19. Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.

    Yakov Lerner committed with Junio C Hamano
    Before this patch, -DDEFAULT_GIT_TEMPLATE_DIR was passed on compilation
    command line to all and every .c file compiled. In fact the macro
    is used by only one .c file, and unused by all other .c files.
    Remove -DDEFAULT_GIT_TEMPLATE_DIR where unused. Follow the example of
    exec_cmd.o. Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
    
    Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  20. Merge branch 'master' into next

    Junio C Hamano committed
    * master:
      Fix grow_refs_hash()
Commits on Jun 21, 2006
  1. Merge branch 'jc/upload-corrupt' into next

    Junio C Hamano committed
    * jc/upload-corrupt:
      daemon: send stderr to /dev/null instead of closing.
  2. Merge branch 'jn/web' into next

    Junio C Hamano committed
    * jn/web:
      gitweb: Make use of $PATH_INFO for project parameter
  3. daemon: send stderr to /dev/null instead of closing.

    Junio C Hamano committed
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. @jnareb

    gitweb: Make use of $PATH_INFO for project parameter

    jnareb committed with Junio C Hamano
    Allow to have project name in the path part of URL, just after the name of
    script. For example instead of gitweb.cgi?p=git.git you can write
    gitweb.cgi/git.git or gitweb.cgi/git.git/
    
    Not used in URLs inside gitweb; it means that the above alternate syntax
    must be generated by hand, at least for now.
    
    Side effect: project name parameter is now stripped of leading and
    trailing slash before validation.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Fix grow_refs_hash()

    Linus Torvalds committed with Junio C Hamano
    Earlier commit 3e4339e had a
    thinko that did not check for collisions while repopulating the
    objects in the new hash table.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Merge branch 'ew/rebase' into next

    Junio C Hamano committed
    * ew/rebase:
      rebase: error out for NO_PYTHON if they use recursive merge
      Add renaming-rebase test.
      rebase: Allow merge strategies to be used when rebasing
      object-refs: avoid division by zero
  7. rebase: error out for NO_PYTHON if they use recursive merge

    Eric Wong committed with Junio C Hamano
    recursive merge relies on Python, and we can't perform
    rename-aware merges without the recursive merge.  So bail out
    before trying it.
    
    The test won't work w/o recursive merge, either, so skip that,
    too.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Add renaming-rebase test.

    Junio C Hamano committed
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. rebase: Allow merge strategies to be used when rebasing

    Eric Wong committed with Junio C Hamano
    This solves the problem of rebasing local commits against an
    upstream that has renamed files.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. object-refs: avoid division by zero

    Andre Noll committed with Junio C Hamano
    Currently, we don't check refs_hash_size size and happily call
    lookup_object_refs() even if refs_hash_size is zero which leads to
    a division by zero in hash_obj().
    
    Signed-off-by: Andre Noll <maan@systemlinux.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Merge branch 'ff/c99' into next

    Junio C Hamano committed
    * ff/c99:
      Remove all void-pointer arithmetic.
  12. Merge branch 'jc/upload-corrupt' into next

    Junio C Hamano committed
    * jc/upload-corrupt:
      upload-pack/fetch-pack: support side-band communication
      Retire git-clone-pack
      upload-pack: prepare for sideband message support.
      upload-pack: avoid sending an incomplete pack upon failure
      Fix possible out-of-bounds array access
  13. upload-pack/fetch-pack: support side-band communication

    Junio C Hamano committed
    This implements a protocol extension between fetch-pack and
    upload-pack to allow stderr stream from upload-pack (primarily
    used for the progress bar display) to be passed back.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. Retire git-clone-pack

    Junio C Hamano committed
    The program is not used by git-clone since git-fetch-pack was extended
    to allow its caller do what git-clone-pack alone did, and git-clone was
    updated to use it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. upload-pack: prepare for sideband message support.

    Junio C Hamano committed
    This does not implement sideband for propagating the status to
    the downloader yet, but add code to capture the standard error
    output from the pack-objects process in preparation for sending
    it off to the client when the protocol extension allows us to do
    so.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.