Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 31, 2008
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      git-svn: change dashed git-commit-tree to git commit-tree
      Documentation: clarify information about 'ident' attribute
      bash completion: add doubledash to "git show"
      Use test-chmtime -v instead of perl in t5000 to get mtime of a file
      Add --verbose|-v to test-chmtime
      asciidoc: add minor workaround to add an empty line after code blocks
      Plug a memleak in builtin-revert
      Add file delete/create info when we overflow rename_limit
      Install git-cvsserver in $(bindir)
      Install git-shell in bindir, too
  2. @deskin @gitster

    git-svn: change dashed git-commit-tree to git commit-tree

    deskin authored gitster committed
    Signed-off-by: Deskin Miller <deskinm@umich.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @jast @gitster

    Documentation: clarify information about 'ident' attribute

    jast authored gitster committed
    The documentation spoke of the attribute being set "to" a path; this can
    mistakenly be interpreted as "the attribute needs to have its value set to
    some kind of path". This clarifies things.
    
    Signed-off-by: Jan Krüger <jk@jk.gs>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @marcows @gitster

    bash completion: add doubledash to "git show"

    marcows authored gitster committed
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @raalkml @gitster

    Use test-chmtime -v instead of perl in t5000 to get mtime of a file

    raalkml authored gitster committed
    The test was broken on admittedly broken combination of Windows, Cygwin,
    and ActiveState Perl.
    
    Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @raalkml @gitster

    Add --verbose|-v to test-chmtime

    raalkml authored gitster committed
    This allows us replace perl when getting the mtime of a file because
    of time zone conversions, though at the moment only one platform which
    does this has been identified: Cygwin when used with ActiveState Perl
    (as usual).
    
    The output format is:
    
        <mtime1> TAB <filename1> <LF>
        <mtime2> TAB <filename2> <LF>
        ...
    
    which, if only mtime is needed can be parsed with cut(1):
    
        test-chmtime -v +0 filename1 | cut -f 1
    
    Also, the change adds a description of programs features, with examples.
    
    Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @jonas @gitster

    asciidoc: add minor workaround to add an empty line after code blocks

    jonas authored gitster committed
    Insert an empty <simpara> in manpages after code blocks to force and
    empty line.
    
    The problem can be seen on the manpage for the git tutorial, where an
    example command and the following paragraph is printed with no empty
    line between them:
    
         First, note that you can get documentation for a command such as git
         log --graph with:
    
             $ man git-log
         It is a good idea to introduce yourself to git [...]
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 30, 2008
  1. @raalkml @gitster

    Plug a memleak in builtin-revert

    raalkml authored gitster committed
    Probably happened when working around git_path's problem with returned
    buffer being reused.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 28, 2008
  1. @gitster

    compat/cygwin.c: make runtime detection of lstat/stat lessor impact

    gitster authored
    The original patch that lead to an earlier commit adbc0b6 (cygwin: Use
    native Win32 API for stat, 2008-09-30) did not call git_default_config()
    and it was a good thing.  The lazy config reading when lstat/stat is
    called for the first time to find out if core.filemode is set can happen
    anytime in the calling program.  If it happens after the calling program
    parsed the configuration file to prime its default parameter settings and
    processed its command line parameters to tweak them, this will overwrite
    the values set by the program with the values read from the config file.
    
    This essentially reverts the code to the version as submitted by Mark,
    with a bit more comments to clarify why we do not fall back on the default
    configuration parser from git_cygwin_config().
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @torvalds @gitster

    Add file delete/create info when we overflow rename_limit

    torvalds authored gitster committed
    When we refuse to do rename detection due to having too many files
    created or deleted, let the user know the numbers.  That way there is a
    reasonable starting point for setting the diff.renamelimit option.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Install git-cvsserver in $(bindir)

    Nanako Shiraishi authored gitster committed
    It is one of the server side programs and needs to be found on usual $PATH.
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @tv42 @gitster

    Install git-shell in bindir, too

    tv42 authored gitster committed
    /etc/passwd shell field must be something execable, you can't enter
    "/usr/bin/git shell" there. git-shell must be present as a separate
    executable, or it is useless.
    
    Signed-off-by: Tommi Virtanen <tv@eagain.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 26, 2008
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      add -p: warn if only binary changes present
      git-archive: work in bare repos
      git-svn: change dashed git-config to git config
  2. @trast @gitster

    add -p: warn if only binary changes present

    trast authored gitster committed
    Current 'git add -p' will say "No changes." if there are no changes to
    text files, which can be confusing if there _are_ changes to binary
    files.  Add some code to distinguish the two cases, and give a
    different message in the latter one.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @hashpling @gitster

    git-archive: work in bare repos

    hashpling authored gitster committed
    This moves the call to git_config to a place where it doesn't break the
    logic for using git archive in a bare repository but retains the fix to
    make git archive respect core.autocrlf.
    
    Tests are by René Scharfe.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Tested-by: Deskin Miller <deskinm@umich.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    receive-pack: fix "borrowing from alternate object store" implementation

    gitster authored
    In the alternate_object_database structure, ent->base[] is a buffer the
    users can use to form pathnames to loose objects, and ent->name is a
    pointer into that buffer (it points at one beyond ".git/objects/").  If
    you get a call to add_refs_from_alternate() after somebody used the entry
    (has_loose_object() has been called, for example), *ent->name would not be
    NUL, and ent->base[] won't be the path to the object store.
    
    This caller is expecting to read the path to the object store in ent->base[];
    it needs to NUL terminate the buffer if it wants to.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 24, 2008
  1. @joeyh @gitster

    git-daemon: set REMOTE_ADDR to client address

    joeyh authored gitster committed
    This allows hooks like pre-receive to look at the client's IP
    address.
    
    Of course the IP address can't be used to get strong security;
    git-daemon isn't the right thing to use if you need that. However,
    basic IP address checking can be good enough in some situations.
    
    REMOTE_ADDR is the same environment variable used to communicate the
    client's address to CGI scripts.
    
    Signed-off-by: Joey Hess <joey@kitenet.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @deskin @gitster

    git-svn: change dashed git-config to git config

    deskin authored gitster committed
    Signed-off-by: Deskin Miller <deskinm@umich.edu>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 23, 2008
  1. @peff @gitster

    submodule: fix some non-portable grep invocations

    peff authored gitster committed
    Not all greps support "-e", but in this case we can easily convert it to a
    single extended regex.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    git-remote: list branches in vertical lists

    Johannes Sixt authored gitster committed
    Previously, branches were listed on a single line in each section. But
    if there are many branches, then horizontal, line-wrapped lists are very
    inconvenient to scan for a human. This makes the lists vertical, i.e one
    branch per line is printed.
    
    Since "git remote" is porcelain, we can easily make this
    backwards-incompatible change.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @peff @gitster

    rm: loosen safety valve for empty files

    peff authored gitster committed
    If a file is different between the working tree copy, the index, and the
    HEAD, then we do not allow it to be deleted without --force.
    
    However, this is overly tight in the face of "git add --intent-to-add":
    
      $ git add --intent-to-add file
      $ : oops, I don't actually want to stage that yet
      $ git rm --cached file
      error: 'empty' has staged content different from both the
      file and the HEAD (use -f to force removal)
      $ git rm -f --cached file
    
    Unfortunately, there is currently no way to distinguish between an empty
    file that has been added and an "intent to add" file. The ideal behavior
    would be to disallow the former while allowing the latter.
    
    This patch loosens the safety valve to allow the deletion only if we are
    deleting the cached entry and the cached content is empty.  This covers
    the intent-to-add situation, and assumes there is little harm in not
    protecting users who have legitimately added an empty file.  In many
    cases, the file will still be empty, in which case the safety valve does
    not trigger anyway (since the content remains untouched in the working
    tree). Otherwise, we do remove the fact that no content was staged, but
    given that the content is by definition empty, it is not terribly
    difficult for a user to recreate it.
    
    However, we still document the desired behavior in the form of two
    tests. One checks the correct removal of an intent-to-add file. The other
    checks that we still disallow removal of empty files, but is marked as
    expect_failure to indicate this compromise. If the intent-to-add feature
    is ever extended to differentiate between normal empty files and
    intent-to-add files, then the safety valve can be re-tightened.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 22, 2008
  1. @gitster

    Merge branch 'jk/diff-convfilter'

    gitster authored
    * jk/diff-convfilter:
      diff: add filter for converting binary to text
      diff: introduce diff.<driver>.binary
      diff: unify external diff and funcname parsing code
      t4012: use test_cmp instead of cmp
  2. @gitster

    Merge branch 'js/maint-fetch-update-head'

    gitster authored
    * js/maint-fetch-update-head:
      pull: allow "git pull origin $something:$current_branch" into an unborn branch
      Fix fetch/pull when run without --update-head-ok
    
    Conflicts:
    	t/t5510-fetch.sh
  3. @gitster

    Merge branch 'jc/maint-co-track'

    gitster authored
    * jc/maint-co-track:
      Enhance hold_lock_file_for_{update,append}() API
      demonstrate breakage of detached checkout with symbolic link HEAD
      Fix "checkout --track -b newbranch" on detached HEAD
    
    Conflicts:
    	builtin-commit.c
  4. @gitster

    Merge branch 'rs/alloc-ref'

    gitster authored
    * rs/alloc-ref:
      make alloc_ref_from_str() the new alloc_ref()
      use alloc_ref_from_str() everywhere
      add alloc_ref_with_prefix()
  5. @gitster

    Merge branch 'jk/fix-ls-files-other'

    gitster authored
    * jk/fix-ls-files-other:
      refactor handling of "other" files in ls-files and status
Commits on Oct 21, 2008
  1. @gitster

    Merge branch 'jc/maint-reset-remove-unmerged-new'

    gitster authored
    * jc/maint-reset-remove-unmerged-new:
      reset --hard/read-tree --reset -u: remove unmerged new paths
  2. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      GIT 1.6.0.3
      rehabilitate 'git index-pack' inside the object store
  3. @gitster

    GIT 1.6.0.3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    rehabilitate 'git index-pack' inside the object store

    Nicolas Pitre authored gitster committed
    Before commit d0b92a3 it was possible to run 'git index-pack'
    directly in the .git/objects/pack/ directory.  Restore that ability.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Fix testcase failure when extended attributes are in use
  6. @lmarlow @gitster

    workflows documentation: fix link to git-request-pull[1]

    lmarlow authored gitster committed
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @lmarlow @gitster

    bash completion: Add 'workflows' to 'git help'

    lmarlow authored gitster committed
    Completion for new workflow documentation introduced in f948dd8
    
    Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Turn short SHA1 names into links too
      gitk: Regenerate .po files
      gitk: New way of constructing menus that allows for Alt+letter accelerators
      gitk: Bind Key-Return to create on new branch dialog
      gitk: Fix binding for <Return> in sha1 entry field
      gitk: Clean up file encoding code and add enable/disable option
      gitk: Implement batch lookup and caching of encoding attrs
      gitk: Enhance file encoding support
      gitk: Add untranslated error messages to translation
      gitk: Fix a bug in collapsing deeply nested trees
      gitk: Use <Button-2> for context menus on OSX
  9. @peff @gitster

    document "intent to add" option to git-add

    peff authored gitster committed
    This was added by 3942581 but never documented.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.