Commits on Nov 8, 2006
  1. GIT 1.4.3-rc1

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 7, 2006
  2. Merge branch 'maint'

    * maint:
      remove an unneeded test
    Junio C Hamano committed Nov 7, 2006
  3. Merge branch 'jc/pickaxe'

    Junio C Hamano committed Nov 7, 2006
  4. git-pickaxe: allow "-L <something>,+N"

    With this,
    
    	git pickaxe -L '/--progress/,+20' v1.4.0 -- pack-objects.c
    
    gives you 20 lines starting from the first occurrence of
    '--progress' in pack-objects, digging from v1.4.0 version.
    
    You can also say
    
    	git pickaxe -L '/--progress/,-5' v1.4.0 -- pack-objects.c
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 7, 2006
  5. git-pack-objects progress flag documentation and cleanup

    This adds documentation for --progress and --all-progress, remove a
    duplicate --progress handling and make usage string more readable.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nicolas Pitre committed with Junio C Hamano Nov 7, 2006
Commits on Nov 7, 2006
  1. remove an unneeded test

    In wt-status.c there is a test which does nothing.
    This patch removes it.
    
    Signed-off-by: Tero Roponen <teanropo@jyu.fi>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Tero Roponen committed with Junio C Hamano Nov 7, 2006
  2. Merge branch 'jc/read-tree'

    * jc/read-tree:
      t6022: ignoring untracked files by merge-recursive when they do not matter
      merge-recursive: adjust to loosened "working file clobbered" check
      merge-recursive: make a few functions static.
      merge-recursive: use abbreviated commit object name.
      merge: loosen overcautious "working file will be lost" check.
    Junio C Hamano committed Nov 7, 2006
  3. Merge branch 'np/index-pack'

    * np/index-pack:
      remove .keep pack lock files when done with refs update
      have index-pack create .keep file more carefully
      improve fetch-pack's handling of kept packs
      git-fetch can use both --thin and --keep with fetch-pack now
      Teach receive-pack how to keep pack files based on object count.
      Allow pack header preprocessing before unpack-objects/index-pack.
      Remove unused variable in receive-pack.
      Revert "send-pack --keep: do not explode into loose objects on the receiving end."
      missing small substitution
      Teach git-index-pack how to keep a pack file.
      Only repack active packs by skipping over kept packs.
      Allow short pack names to git-pack-objects --unpacked=.
      send-pack --keep: do not explode into loose objects on the receiving end.
      index-pack: minor fixes to comment and function name
      enhance clone and fetch -k experience
      mimic unpack-objects when --stdin is used with index-pack
      add progress status to index-pack
      make index-pack able to complete thin packs.
      enable index-pack streaming capability
    Junio C Hamano committed Nov 7, 2006
  4. Merge branch 'maint'

    * maint:
      Documentation: Transplanting branch with git-rebase --onto
      merge-recursive implicitely depends on trust_executable_bit
      adjust_shared_perm: chmod() only when needed.
      Fix git-runstatus for repositories containing a file named HEAD
    Junio C Hamano committed Nov 6, 2006
  5. git-pickaxe: -L /regexp/,/regexp/

    With this change, you can specify the beginning and the ending
    line of the range you wish to inspect with pattern matching.
    
    For example, these are equivalent with the git.git sources:
    
        git pickaxe -L 7,21                       v1.4.0 -- commit.c
        git pickaxe -L '/^struct sort_node/,/^}/' v1.4.0 -- commit.c
        git pickaxe -L '7,/^}/'                   v1.4.0 -- commit.c
        git pickaxe -L '/^struct sort_node/,21'   v1.4.0 -- commit.c
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 6, 2006
Commits on Nov 6, 2006
  1. @jnareb

    Documentation: Transplanting branch with git-rebase --onto

    Added example of transplantig feature branch from one development
    branch (for example "next") into the other development branch (for
    example "master").
    
    [jc: talking Carl's advice this contains both examples sent to
     the list by Jakub in his original message.]
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jnareb committed with Junio C Hamano Nov 6, 2006
  2. Document git-pack-refs and link it to git(7).

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 6, 2006
  3. @raalkml

    merge-recursive implicitely depends on trust_executable_bit

    Read the configuration in to get core.filemode value for this
    particular repository.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    raalkml committed with Junio C Hamano Nov 6, 2006
  4. adjust_shared_perm: chmod() only when needed.

    When widening permission for files and directories in a 'shared'
    repository for a user with inappropriate umask() setting for
    shared work, make sure we call chmod() only when we actually
    need to.
    
    The primary idea owes credit to Johannes.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 4, 2006
  5. @peff

    Fix git-runstatus for repositories containing a file named HEAD

    The wt_status_print_updated() and wt_status_print_untracked() routines
    call setup_revisions() with 'HEAD' being the reference to the tip of the
    current branch. However, setup_revisions() gets confused if the branch
    also contains a file named 'HEAD' resulting in a fatal error.
    
    Instead, don't pass an argv to setup_revisions() at all; simply give it no
    arguments, and make 'HEAD' the default revision.
    
    Bug noticed by Rocco Rutte <pdmef@gmx.net>.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    peff committed with Junio C Hamano Nov 5, 2006
Commits on Nov 5, 2006
  1. @spearce

    Remove more sed invocations from within bash completion.

    This change removes between 1 and 4 sed invocations per completion
    entered by the user.  In the case of cat-file the 4 invocations per
    completion can take a while on Cygwin; running these replacements
    directly within bash saves some time for the end user.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  2. @spearce

    Support bash completion on symmetric difference operator.

    Now that log, whatchanged, rev-list, etc. support the symmetric
    difference operator '...' we should provide bash completion for it
    just like we do for '..'.
    
    While we are at it we can remove two sed invocations during the
    interactive prompt and replace them with internal bash operations.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  3. @spearce

    Take --git-dir into consideration during bash completion.

    If the user has setup a command line of "git --git-dir=baz" then
    anything we complete must be performed within the scope of "baz"
    and not the current working directory.
    
    This is useful with commands such as "git --git-dir=git.git log m"
    to complete out "master" and view the log for the master branch of
    the git.git repository.  As a nice side effect this also works for
    aliases within the target repository, just as git would honor them.
    
    Unfortunately because we still examine arguments by absolute position
    in most of the more complex commands (e.g. git push) using --git-dir
    with those commands will probably still cause completion to fail.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  4. @spearce

    Bash completion support for remotes in .git/config.

    Now that Git natively supports remote specifications within the
    config file such as:
    
    	[remote "origin"]
    		url = ...
    
    we should provide bash completion support "out of the box" for
    these remotes, just like we do for the .git/remotes directory.
    
    Also cleaned up the __git_aliases expansion to use the same form
    of querying and filtering repo-config as this saves two fork/execs
    in the middle of a user prompted completion.  Finally also forced
    the variable 'word' to be local within __git_aliased_command.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  5. @spearce

    Only load .exe suffix'd completions on Cygwin.

    The only platform which actually needs to define .exe suffixes as
    part of its completion set is Cygwin.  So don't define them on any
    other platform.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  6. @spearce

    Added missing completions for show-branch and merge-base.

    The show-branch and merge-base commands were partially supported
    when it came to bash completions as they were only specified in
    one form another.  Now we specify them in both forms.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  7. git-pickaxe: optimize by avoiding repeated read_sha1_file().

    It turns out that pickaxe reads the same blob repeatedly while
    blame can reuse the blob already read for the parent when
    handling a child commit when it's parent's turn to pass its
    blame to the grandparent.  Have a cache in the origin structure
    to keep the blob there, which will be garbage collected when the
    origin loses the last reference to it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 5, 2006
  8. git-blame: add internal statistics to count read blobs.

    Junio C Hamano committed Nov 5, 2006
  9. cherry is built-in, do not ship git-cherry.sh

    Noticed by Rene; Makefile now has another maintainer's check
    target to catch this kind of mistakes.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 5, 2006
  10. Merge branch 'maint'

    * maint:
      Remove unsupported C99 style struct initializers in git-archive.
      Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
      Use ULONG_MAX rather than implicit cast of -1.
    Junio C Hamano committed Nov 4, 2006
  11. @spearce

    Remove unsupported C99 style struct initializers in git-archive.

    At least one older version of the Solaris C compiler doesn't support
    the newer C99 style struct initializers.  To allow Git to compile
    on those systems use an archive description struct which is easier
    to initialize without the C99 struct initializer syntax.
    
    Also since the archives array is not used by anyone other than
    archive.c we can make it static.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  12. @spearce

    Remove SIMPLE_PROGRAMS and make git-daemon a normal program.

    Some platforms (Solaris in particular) appear to require -lz as
    part of the link line for git-daemon, due to it linking against
    sha1_file.o and that module requiring inflate/deflate support.
    
    So its time to retire SIMPLE_PROGRAMS and move its last remaining
    member into the standard PROGRAMS list, allowing it to link against
    all libraries used by the rest of Git.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  13. @spearce

    Use ULONG_MAX rather than implicit cast of -1.

    At least one (older) version of the Solaris C compiler won't allow
    'unsigned long x = -1' without explicitly casting -1 to a type of
    unsigned long.  So instead use ULONG_MAX, which is really the
    correct constant anyway.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 5, 2006
  14. git-svn: don't die on rebuild when --upgrade is specified

    --copy-remote and --upgrade are rarely (never?) used together,
    so if --copy-remote is specified, that means the user really
    wanted to copy the remote ref, and we should fail if that fails.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Nov 4, 2006
  15. git-svn: avoid printing filenames of files we're not tracking

    This is purely an aesthetic change, we already skip importing of
    files that don't affect the subdirectory we import.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Nov 4, 2006
  16. git-pickaxe: fix origin refcounting

    When we introduced the cached origin per commit, we gave up proper
    garbage collecting because it meant that commits hold onto their
    cached copy.  There is no need to do so.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 4, 2006
  17. Merge branch 'np/verbose-push'

    * np/verbose-push:
      make git-push a bit more verbose
    Junio C Hamano committed Nov 4, 2006
  18. Merge branch 'lt/push-config'

    * lt/push-config:
      git push: add verbose flag and allow overriding of default target repository
      Allow '-' in config variable names
    Junio C Hamano committed Nov 4, 2006
  19. @spearce

    Added bash completion support for git-reset.

    Completion for the --hard/--soft/--mixed modes of operation as
    well as a ref name for <commit-ish> can be very useful and save
    some fingers.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 4, 2006
  20. @spearce

    Added completion support for git-branch.exe.

    On Cygwin a user might complete the new git-branch builtin as
    git-branch.exe, at which point bash requires a new completion
    registration for the command.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Nov 4, 2006