Skip to content
Commits on Aug 6, 2008
  1. @gitster

    GIT 1.6.0-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 6, 2008
  2. @gitster

    perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section

    Use double quotes to protect against paths which may contain spaces.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Aug 5, 2008
  3. @gitster

    Sync with 1.5.6.5

    gitster committed Aug 6, 2008
  4. @gitster

    GIT 1.5.6.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 6, 2008
  5. @gitster

    Files given on the command line are relative to $cwd

    When running "git commit -F file" and "git tag -F file" from a
    subdirectory, we should take it as relative to the directory we started
    from, not relative to the top-level directory.
    
    This adds a helper function "parse_options_fix_filename()" to make it more
    convenient to fix this class of issues.  Ideally, parse_options() should
    support a new type of option, "OPT_FILENAME", to do this uniformly, but
    this patch is meant to go to 'maint' to fix it minimally.
    
    One thing to note is that value for "commit template file" that comes from
    the command line is taken as relative to $cwd just like other parameters,
    but when it comes from the configuration varilable 'commit.template', it
    is taken as relative to the working tree root as before.  I think this
    difference actually is sensible (not that I particularly think
    commit.template itself is sensible).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 6, 2008
  6. @gitster

    Merge git://repo.or.cz/git-gui

    * git://repo.or.cz/git-gui:
      git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
      git-gui: add a part about format strings in po/README
      git-gui: update po/it.po
      git-gui: update Japanese translation
      git-gui: Update swedish translation.
      git-gui: Update git-gui.pot for 0.11 nearing release
      git-gui: Update German translation
    gitster committed Aug 6, 2008
  7. @gitster

    Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Update swedish translation.
      gitk: Updated German translation
      gitk: Fallback to selecting the head commit upon load
      gitk: Fixed automatic row selection during load
      gitk: Fixed broken exception handling in diff
      gitk: On Windows, use a Cygwin-specific flag for kill
      gitk: Arrange to kill diff-files & diff-index on quit
      gitk: Kill back-end processes on window close
    gitster committed Aug 6, 2008
  8. @gitster

    Merge branch 'rs/archive-parse-options'

    * rs/archive-parse-options:
      archive: allow --exec and --remote without equal sign
    gitster committed Aug 6, 2008
  9. @gitster

    fix diff-tree --stdin documentation

    Long time ago, the feature of "diff-tree --stdin" to take a commit and its
    parents on one line was broken, and did not support the common:
    
        git rev-list --parents $commits... -- $paths... |
        git diff-tree --stdin -v -p
    
    usage pattern by Porcelains properly.  For diff-tree to talk sensibly
    about commits, it needs to see commits, not just trees; the code was fixed
    to take list of commits on the standard input in 1.2.0.
    
    However we left the documentation stale for a long time, until Karl
    Hasselström finally noticed it very recently.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 5, 2008
  10. @gitster

    Optimize sha1_object_info for loose objects, not concurrent repacks

    When dealing with a repository with lots of loose objects, sha1_object_info
    would rescan the packs directory every time an unpacked object was referenced
    before finally giving up and looking for the loose object. This caused a lot
    of extra unnecessary system calls during git pack-objects; the code was
    rereading the entire pack directory once for each loose object file.
    
    This patch looks for a loose object before falling back to rescanning the
    pack directory, rather than the other way around.
    
    Signed-off-by: Steven Grimm <koreth@midwinter.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Steven Grimm committed with gitster Aug 5, 2008
  11. @gitster

    Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long

    As Shawn pointed out, not all temporary file creation routines can
    ensure that the generated temporary file is of a certain length.
    e.g. Java's createTempFile(prefix, suffix). So just depend on the
    prefix 'tmp_obj_' for detection.
    
    Update prune, and fix the "fix" introduced by a08c53a :)
    
    Signed-off-by: Brandon "appendixless" Casey <casey@nrlssc.navy.mil>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Aug 5, 2008
  12. @lmarlow @gitster

    bash completion: Add completion for 'git mv'

    Add completions for all long options specified in the docs
        --dry-run
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 4, 2008
  13. @lmarlow @gitster

    bash completion: Add completion for 'git ls-files'

    Add completions for all long options specified in the docs
        --cached --deleted --modified --others --ignored
        --stage --directory --no-empty-directory --unmerged
        --killed --exclude= --exclude-from=
        --exclude-per-directory= --exclude-standard
        --error-unmatch --with-tree= --full-name
        --abbrev --ignored --exclude-per-directory
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 4, 2008
  14. @lmarlow @gitster

    bash completion: Add completion for 'git archive'

    Add completions for all long options specified in the docs
        --format= --list --verbose
        --prefix= --remote= --exec=
    
    The --format= long option can be completed with available formats
    and the --remote= can be completed with defined remote repositories.
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 4, 2008
  15. @lmarlow @gitster

    bash completion: More completions for 'git stash'

    Add branch subcommand to completions and USAGE for git-stash.sh.
    Complete stash names for show, apply, drop, pop, and branch.
    Add "--index" long option for apply.
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 4, 2008
  16. @lmarlow @gitster

    bash completion: Add completion for 'git revert'

    Add completions for all long options specified in the docs
        --edit --mainline --no-edit --no-commit --signoff
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 4, 2008
  17. @lmarlow @gitster

    bash completion: Add completion for 'git init'

    Add completions for all long options specified in the docs
        --quiet --bare --template= --shared
        --shared={false|true|umask|group|all|world|everybody}
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 4, 2008
  18. @lmarlow @gitster

    bash completion: Add completion for 'git clean'

    Add completions for all long options specified in the docs
        --dry-run --quiet
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 4, 2008
  19. @lmarlow @gitster

    bash completion: Add completion for 'git clone'

    Add completions for all long options specified in the docs
        --local --no-hardlinks --shared --reference
        --quiet --no-checkout --bare --mirror --origin
        --upload-pack --template= --depth
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 4, 2008
  20. @gitster

    t9119: conditionally re-enable test depending on svn(1) version

    I've tested this with svn 1.4.4
    
    This also adds quoting to make it work odd characters
    in the trash path.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Wong committed with gitster Aug 5, 2008
  21. @ddkilzer @gitster

    Fix race condition in t9119-git-svn-info.sh

    Changed the ptouch bash function to use the "Text Last Updated"
    date reported by 'svn info' when changing the modified time
    (mtime) of the file/symlink/directory in the git working
    directory.  Previously it used the mtime of the item in the
    svn working directory, which caused the race condition.
    
    [ew: swapped argument order of ptouch() to minimize diff]
    
    From: David D. Kilzer <ddkilzer@kilzer.net>
    
    Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ddkilzer committed with gitster Aug 5, 2008
  22. @gitster

    git-svn: properly set path for "info" command

    canonicalize_path() was previously changed to better
    fit SVN 1.5, but it makes the "info" command not match
    svn(1) in two places:
    
      1) URL ended up with a trailing slash when run without an
         argument.
    
      2) "Path: " was displayed instead of "Path: ." when run
         without an argument.
    
    We will also handle odd cases where a user wants to
    get information on a file or directory named "0", too.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Wong committed with gitster Aug 5, 2008
  23. @MikeRalphson @gitster

    Documentation: typos / spelling fixes

    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MikeRalphson committed with gitster Aug 5, 2008
  24. @gitster

    Merge branch 'maint'

    * maint:
      RelNotes 1.5.6.5 updates
      diff.renamelimit is a basic diff configuration
      git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
      Documentation: typos / spelling fixes in older RelNotes
    gitster committed Aug 5, 2008
  25. @gitster

    RelNotes 1.5.6.5 updates

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 5, 2008
  26. @torvalds @gitster

    diff.renamelimit is a basic diff configuration

    The configuration was added as a core option in 3299c6f (diff: make
    default rename detection limit configurable., 2005-11-15), but 9ce392f
    (Move diff.renamelimit out of default configuration., 2005-11-21)
    separated diff-related stuff out of the core.
    
    Up to that point it was Ok.
    
    When we separated the Porcelain options out of the git_diff_config in
    83ad63c (diff: do not use configuration magic at the core-level,
    2006-07-08), we should have been more careful.
    
    This mistake made diff-tree plumbing and git-show Porcelain to notice
    different set of renames when the user explicitly asked for rename
    detection.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    torvalds committed with gitster Aug 5, 2008
Commits on Aug 5, 2008
  1. @meyering @gitster

    git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.

    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Aug 5, 2008
  2. @MikeRalphson @gitster

    Documentation: typos / spelling fixes in older RelNotes

    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MikeRalphson committed with gitster Aug 5, 2008
  3. @dmpot @gitster

    correct access right for git-svn-dcommit test

    The tests requires anonymous write access. Therefore, "anon-access =
    write" is added to conf/svnserve.conf. But because it was added to
    the end of the file, it is impossible to guarantee in what section
    it will be located. It turned out that on SVN 1.5, it was placed in
    the wrong section and as result the test failed.
    
    Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
    Tested-by: Brad King <brad.king@kitware.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dmpot committed with gitster Aug 4, 2008
  4. @amenonsen @gitster

    Fix typos in INSTALL

    Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    amenonsen committed with gitster Aug 5, 2008
  5. @amenonsen @gitster

    Fix typo in perl/Git.pm

    Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    amenonsen committed with gitster Aug 5, 2008
  6. @amenonsen @gitster

    Fix hash slice syntax error

    Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    amenonsen committed with gitster Aug 4, 2008
  7. @amenonsen @gitster

    Git.pm: localise $? in command_close_bidi_pipe()

    Git::DESTROY calls _close_cat_blob and _close_hash_and_insert_object,
    which in turn call command_close_bidi_pipe, which calls waitpid, which
    alters $?. If this happens during global destruction, it may alter the
    program's exit status unexpectedly. Making $? local to the function
    solves the problem.
    
    (The problem was discovered due to a failure of test #8 in
    t9106-git-svn-commit-diff-clobber.sh.)
    
    Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    amenonsen committed with gitster Aug 4, 2008
  8. @lmarlow @gitster

    bash completion: Add completion for 'git grep'

    Add completions for all long options specified in the docs
    
        --cached
        --text --ignore-case --word-regexp --invert-match
        --full-name
        --extended-regexp --basic-regexp --fixed-strings
        --files-with-matches --name-only
        --files-without-match
        --count
        --and --or --not --all-match
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lmarlow committed with gitster Aug 1, 2008
  9. @gitster

    Add output flushing before fork()

    This adds fflush(NULL) before fork() in start_command(), to keep
    the generic interface safe.
    
    A remaining use of fork() with no flushing is in a comment in
    show_tree(). Rewrite that comment to use start_command().
    
    Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Anders Melchiorsen committed with gitster Aug 4, 2008
Something went wrong with that request. Please try again.