Permalink
Commits on Jun 8, 2006
  1. Documentation: add another example to git-ls-files

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 8, 2006
  2. Documentation: git aliases

    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Jun 8, 2006
Commits on Jun 7, 2006
  1. git-cvsserver asciidoc formatting tweaks

    No content change here.
    
    html output improved. man output changed.
    
    Signed-off-by: Francis Daly <francis@daoine.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Francis Daly committed with Junio C Hamano Jun 7, 2006
  2. config.txt grammar, typo, and asciidoc fixes

    Nothing major.
    
    Signed-off-by: Francis Daly <francis@daoine.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Francis Daly committed with Junio C Hamano Jun 7, 2006
  3. Documentation: git-ls-tree (typofix)

    spotted by jdl.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 7, 2006
  4. Document git-ls-tree --fullname

    Additionally, reformat synopsis and remove stub notice.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas committed with Junio C Hamano Jun 7, 2006
  5. Document git aliases support

    This patch ports and modifies appropriately the git aliases documentation
    from my patch, shall it rest in peace.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Jun 7, 2006
  6. make clean: remove dist-doc targets.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 7, 2006
  7. Misc doc improvements

    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas committed with Junio C Hamano Jun 7, 2006
  8. Documentation: add missing docs make check-docs found.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 7, 2006
  9. Some doc typo fixes

    All should be clear enough, except perhaps committish / commitish.
    I just kept the more-used one within the current docs.
    
    [jc: with rephrasing of check-ref-format description later discussed
     on the list]
    
    Signed-off-by: Francis Daly <francis@daoine.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Francis Daly committed with Junio C Hamano Jun 7, 2006
  10. Off-by-one error in get_path_prefix(), found by Valgrind

    [jc: original fix was done by Pavel and this contains improvements
     by Rene.]
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Acked-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Jun 7, 2006
  11. Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Re-read the descendent/ancestor tag & head info on update
      gitk: Show branch name(s) as well, if "show nearby tags" is enabled
      gitk: Show nearby tags
      gitk: Add a goto next/previous highlighted commit function
      gitk: Provide ability to highlight based on relationship to selected commit
      gitk: Fix bug in highlight stuff when no line is selected
      gitk: Move "pickaxe" find function to highlight facility
      gitk: Improve the text window search function
      gitk: First cut at a search function in the patch/file display window
      gitk: Highlight paths of interest in tree view as well
      gitk: Highlight entries in the file list as well
      gitk: Make a row of controls for controlling highlighting
    Junio C Hamano committed Jun 7, 2006
  12. http-fetch: fix possible segfault

    Initialize an object request's slot to a safe value.  A non-NULL value
    can cause a segfault if the request is aborted before it starts.
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nick Hengeveld committed with Junio C Hamano Jun 7, 2006
  13. Refactor git_tcp_connect() functions a little.

    Add client side sending of "\0host=%s\0" extended
    arg for git native protocol, backwards compatibly.
    
    Signed-off-by: Jon Loeliger <jdl@jdl.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Jon Loeliger committed with Junio C Hamano Jun 7, 2006
Commits on Jun 6, 2006
  1. Merge branch 'jc/lockfile'

    * jc/lockfile:
      ref-log: style fixes.
      refs.c: convert it to use lockfile interface.
      Make index file locking code reusable to others.
    Junio C Hamano committed Jun 6, 2006
  2. Merge branch 'js/alias'

    * js/alias:
      git alias: try alias last.
      If you have a config containing something like this:
    Junio C Hamano committed Jun 6, 2006
  3. Merge branch 'vb/sendemail'

    * vb/sendemail:
      send-email: a bit more careful domain regexp.
      send-email: be more lenient and just catch obvious mistakes.
      Cleanup git-send-email.perl:extract_valid_email
    Junio C Hamano committed Jun 6, 2006
  4. builtin-grep: pass ignore case option to external grep

    Don't just read the --ignore-case/-i option, pass the flag on to the
    external grep program.
    
    Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robfitz273k committed with Junio C Hamano Jun 6, 2006
  5. gitk: Re-read the descendent/ancestor tag & head info on update

    Signed-off-by: Paul Mackerras <paulus@samba.org>
    paulusmack committed Jun 6, 2006
  6. ref-log: style fixes.

    A few style fixes to get the code in line with the rest.
    
     - asterisk to make a type a pointer to something goes in front
       of the variable, not at the end of the base type.
       E.g. a pointer to an integer is "int *ip", not "int* ip".
    
     - open parenthesis for function parameter list, unlike
       syntactic constructs, comes immediately after the function
       name.  E.g. "if (foo) bar();" not "if(foo) bar ();".
    
     - "else" does not come on the same line as the closing brace of
       corresponding "if".
    
    The style is mostly a matter of personal taste, and people may
    disagree, but consistency is important.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  7. refs.c: convert it to use lockfile interface.

    This updates the ref locking code to use creat-rename locking
    code we use for the index file, so that it can borrow the code
    to clean things up upon signals and program termination.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  8. Make index file locking code reusable to others.

    The framework to create lockfiles that are removed at exit is
    first used to reliably write the index file, but it is
    applicable to other things, so stop calling it "cache_file".
    
    This also rewords a few remaining error message that called the
    index file "cache file".
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  9. HTTP cleanup

    This ifdef's out more functions that are not used while !USE_MULTI
    in http code.  Also the dependency of http related objects on http.h
    header file was missing in the Makefile.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  10. HTTP cleanup

    Fix broken build when USE_CURL_MULTI is not defined, as noted by Becky Bruce.
    
    During cleanup, free header slist that was created during init, as noted
    by Junio.
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nick Hengeveld committed with Junio C Hamano Jun 6, 2006
  11. git-format-patch: add --output-directory long option again

    Additionally notices and complains to an -o option without
    directory or a duplicated -o option, -o and --stdout given
    together.  Also delays the creation of directory until all
    arguments are parsed, so that the command does not leave an
    empty directory behind when it exits after seeing an unrelated
    invalid option.
    
    [jc: originally from Dennis Stosberg but with minor fixes, and
     documentation updates from Dennis.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  12. send-email: a bit more careful domain regexp.

    This tightens the regexp a bit to make sure there is no double dots.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  13. send-email: be more lenient and just catch obvious mistakes.

    This cleans up the pattern matching subroutine by introducing
    two variables to hold regexp to approximately match local-part
    and domain in the e-mail address.  It is meant to catch obvious
    mistakes with a cheap check.
    
    The patch also moves "scalar" to force Email::Valid->address()
    to work in !wantarray environment to extract_valid_address;
    earlier it was in the caller of the subroutine, which was way
    too error prone.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  14. rev-parse: tighten constness properly.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  15. A Perforce importer for git.

    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    loops committed with Junio C Hamano May 24, 2006
  16. git alias: try alias last.

    This disables alias "foo" from being used for git-foo, and when
    we do use alias we check the built-in and then existing command
    names first and then alias as the fallback.  This avoids the
    problem of common commands used in scripts getting clobbered by
    user specific aliases.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jun 6, 2006
  17. If you have a config containing something like this:

    	[alias]
    		l = "log --stat -M ORIG_HEAD.."
    
    you can call
    
    	git l
    
    and it will do the same as
    
    	git log --stat -M ORIG_HEAD..
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Jun 5, 2006
  18. builtin-push: don't pass --thin to HTTP transport

    git-http-push does not currently use packs to transfer objects.
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nick Hengeveld committed with Junio C Hamano Jun 5, 2006
  19. pack-objects: improve path grouping heuristics.

    This trivial patch not only simplifies the name hashing, it actually
    improves packing for both git and the kernel.
    
    The git archive pack shrinks from 6824090->6622627 bytes (a 3%
    improvement), and the kernel pack shrinks from 108756213 to 108219021 (a
    mere 0.5% improvement, but still, it's an improvement from making the
    hashing much simpler!)
    
    We just create a 32-bit hash, where we "age" previous characters by two
    bits, so the last characters in a filename count most. So when we then
    compare the hashes in the sort routine, filenames that end the same way
    sort the same way.
    
    It takes the subdirectory into account (unless the filename is > 16
    characters), but files with the same name within the same subdirectory
    will obviously sort closer than files in different subdirectories.
    
    And, incidentally (which is why I tried the hash change in the first
    place, of course) builtin-rev-list.c will sort fairly close to rev-list.c.
    
    And no, it's not a "good hash" in the sense of being secure or unique, but
    that's not what we're looking for. The whole "hash" thing is misnamed
    here. It's not so much a hash as a "sorting number".
    
    [jc: rolled in simplification for computing the sorting number
     computation for thin pack base objects]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Jun 5, 2006
Commits on Jun 5, 2006
  1. rev-list: fix process_tree() conversion.

    The tree-walking conversion of the "process_tree()" function
    broke packing by using an unrelated variable from outer scope.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Jun 5, 2006