Skip to content
Commits on Apr 23, 2010
  1. @gitster

    Git 1.7.0.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 22, 2010
  2. @gitster

    Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint

    * mg/use-default-abbrev-length-in-rev-list:
      rev-list: use default abbrev length when abbrev-commit is in effect
    gitster committed Apr 22, 2010
  3. @gitster

    Merge branch 'wp/doc-filter-direction' into maint

    * wp/doc-filter-direction:
      documentation: clarify direction of core.autocrlf
    gitster committed Apr 22, 2010
  4. @gitster

    Merge branch 'jk/maint-diffstat-overflow' into maint

    * jk/maint-diffstat-overflow:
      diff: use large integers for diffstat calculations
    gitster committed Apr 22, 2010
  5. @gitster

    Merge branch 'da/maint-python-startup' into maint

    * da/maint-python-startup:
      Makefile: Remove usage of deprecated Python "has_key" method
    gitster committed Apr 22, 2010
Commits on Apr 22, 2010
  1. @jrn @gitster

    Documentation/Makefile: fix interrupted builds of user-manual.xml

    Unlike gcc, asciidoc does not atomically write its output file or
    delete it when interrupted.  If it is interrupted in the middle of
    writing an XML file, the result will be truncated input for xsltproc.
    
    	XSLTPROC user-manual.html
    	user-manual.xml:998: parser error : Premature end of data in t
    
    Take care of this case by writing to a temporary and renaming it when
    finished.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 21, 2010
Commits on Apr 20, 2010
  1. @mjg @gitster

    t7012: Mark missing tests as TODO

    Currently, there are 6 tests which are not even written but are
    'test_expect_failure message false'.
    Do not abuse test_expect_failure as a to do marker, but mark them as
    '#TODO' instead.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 19, 2010
  2. @szeder @gitster

    reflog: remove 'show' from 'expire's usage string

    Most of 'expire's options are not recognized by the 'show' subcommand,
    hence it errors out.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Apr 19, 2010
Commits on Apr 19, 2010
  1. @gitster

    Merge branch 'maint-1.6.6' into maint

    * maint-1.6.6:
      MSVC: Fix build by adding missing termios.h dummy
    gitster committed Apr 19, 2010
  2. @j6t @gitster

    MSVC: Fix build by adding missing termios.h dummy

    A use of this header file was introduced in eb80042 (Add missing #include
    to support TIOCGWINSZ on Solaris, 2010-01-11).
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Apr 19, 2010
Commits on Apr 18, 2010
  1. @hashpling @gitster

    Documentation: Describe other situations where -z affects git diff

    -z also alters the behaviour of --name-only and --name-status.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    hashpling committed with gitster Apr 18, 2010
Commits on Apr 17, 2010
  1. @wpalmer @gitster

    documentation: clarify direction of core.autocrlf

    The description for core.autocrlf refers to reads from / writes to
    "the filesystem", the only use of this rather ambiguous term, which
    technically could be referring to the git object database. (All other
    mentions are part of phrases such as "..filesystems (like NFS)..").
    
    Other sections, including the section on core.safecrlf, use the term
    "work tree" for the same purpose as the term "the filesystem" is used in
    the core.autocrlf section, so that seems like a good alternative, which
    makes it clearer what direction the addition/removal of CR characters
    occurs in.
    
    Signed-off-by: Will Palmer <wmpalmer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wpalmer committed with gitster Apr 17, 2010
  2. @peff @gitster

    diff: use large integers for diffstat calculations

    The diffstat "added" and "changed" fields generally store
    line counts; however, for binary files, they store file
    sizes. Since we store and print these values as ints, a
    diffstat on a file larger than 2G can show a negative size.
    Instead, let's use uintmax_t, which should be at least 64
    bits on modern platforms.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Apr 17, 2010
  3. @mjg @gitster

    t1010-mktree: Adjust expected result to code and documentation

    The last two tests here were always supposed to fail in the sense
    that, according to code and documentation, mktree should read non-recursive
    ls-tree output, but not recursive one, and therefore explicitely refuses
    to deal with slashes.
    
    Adjust the test (must_fail) so that it succeeds when mktree dies on
    slashes.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 15, 2010
  4. @trast @gitster

    combined diff: correctly handle truncated file

    Consider an evil merge of two commits A and B, both of which have a
    file 'foo', but the merge result does not have that file.
    
    The combined-diff code learned in 4462731 (combine-diff: do not punt
    on removed or added files., 2006-02-06) to concisely show only the
    removal, since that is the evil part and the previous contents are
    presumably uninteresting.
    
    However, to diagnose an empty merge result, it overloaded the variable
    that holds the file's length.  This means that the check also triggers
    for truncated files.  Consequently, such files were not shown in the
    diff at all despite the merge being clearly evil.
    
    Fix this by adding a new variable that distinguishes whether the file
    was deleted (which is the case 4462731 handled) or truncated.  In the
    truncated case, we show the full combined diff again, which is rather
    spammy but at least does not hide the evilness.
    
    Reported-by: David Martínez Martí <desarrollo@gestiweb.com>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Apr 15, 2010
Commits on Apr 15, 2010
  1. @jrn @gitster

    Document new "already-merged" rule for branch -d

    v1.7.0-rc0~18^2 (branch -d: base the "already-merged" safety on the
    branch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic
    for when it is safe to delete a branch without forcing the issue.  It
    is safe to delete a branch "topic" without second thought if:
    
     - the branch "topic" is set up to pull from a (remote-tracking,
       usually) branch and is fully merged in that "upstream" branch, or
    
     - there is no branch.topic.merge configuration and branch "topic" is
       fully merged in the current HEAD.
    
    Update the man page to acknowledge the new rules.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 15, 2010
Commits on Apr 13, 2010
  1. @jaysoffian @gitster

    Documentation/config.txt: default gc.aggressiveWindow is 250, not 10

    The default for gc.aggressiveWindow has been 250 since 1c192f3
    (gc --aggressive: make it really aggressive, 2007-12-06).
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jaysoffian committed with gitster Apr 13, 2010
Commits on Apr 12, 2010
  1. @marcnarc @gitster

    Docs: Add -X option to git-merge's synopsis.

    Also move -X's description next to -s's in merge-options.txt.
    
    This makes it easier to learn how to specify merge strategy options.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcnarc committed with gitster Apr 12, 2010
Commits on Apr 11, 2010
  1. @gitster

    Git 1.7.0.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 11, 2010
  2. @gitster

    Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint

    * rc/maint-reflog-msg-for-forced-branch:
      branch: say "Reset to" in reflog entries for 'git branch -f' operations
    gitster committed Apr 11, 2010
  3. @gitster

    blame documentation: -M/-C notice copied lines as well as moved ones

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 11, 2010
Commits on Apr 10, 2010
  1. @jlehmann @gitster

    Let check_preimage() use memset() to initialize "struct checkout"

    Every code site except check_preimage() uses either memset() or declares
    a static instance of "struct checkout" to achieve proper initialization.
    Lets use memset() instead of explicit initialization of all members here
    too to be on the safe side in case this structure is expanded someday.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlehmann committed with gitster Apr 9, 2010
  2. @gitster

    Merge branch 'ef/maint-empty-commit-log' into maint

    * ef/maint-empty-commit-log:
      rev-list: fix --pretty=oneline with empty message
    gitster committed Apr 9, 2010
  3. @gitster

    Merge branch 'jc/conflict-marker-size' into maint

    * jc/conflict-marker-size:
      diff --check: honor conflict-marker-size attribute
    gitster committed Apr 9, 2010
  4. @gitster

    Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' int…

    …o maint
    
    * sp/maint-http-backend-die-triggers-die-recursively:
      http-backend: Don't infinite loop during die()
    gitster committed Apr 9, 2010
  5. @gitster

    Merge branch 'mg/maint-send-email-lazy-editor' into maint

    * mg/maint-send-email-lazy-editor:
      send-email: lazily assign editor variable
    gitster committed Apr 9, 2010
  6. @gitster

    Merge branch 'rr/imap-send-unconfuse-from-line' into maint

    * rr/imap-send-unconfuse-from-line:
      imap-send: Remove limitation on message body
    gitster committed Apr 9, 2010
  7. @gitster

    Merge branch 'rb/maint-python-path' into maint

    * rb/maint-python-path:
      Correct references to /usr/bin/python which does not exist on FreeBSD
    gitster committed Apr 9, 2010
  8. @gitster

    Merge branch 'gh/maint-stash-show-error-message' into maint

    * gh/maint-stash-show-error-message:
      Improve error messages from 'git stash show'
    gitster committed Apr 9, 2010
  9. @gitster

    Merge branch 'mg/mailmap-update' into maint

    * mg/mailmap-update:
      .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
    gitster committed Apr 9, 2010
  10. @gitster

    Merge branch 'bc/maint-daemon-sans-ss-family' into maint

    * bc/maint-daemon-sans-ss-family:
      daemon.c: avoid accessing ss_family member of struct sockaddr_storage
    gitster committed Apr 9, 2010
  11. @rctay @gitster

    fetch/push: fix usage strings

     - use "<options>" instead of just "options".
     - use "[<repository> [<refspec>...]]" to indicate that <repository> and
       <refspec> are optional, and that <refspec> cannot be specified
       without specifying <repository>.
    
    Note that when called without specifying <repository> (eg. "git fetch
    -f"), it is accurate to say that the "git fetch [<options>]
    [<repository> ...]" case takes precedence over "git fetch [<options>]
    <group>".
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    rctay committed with gitster Apr 10, 2010
  12. @rctay @gitster

    branch: say "Reset to" in reflog entries for 'git branch -f' operations

    In 5f856dd (fix reflog entries for "git-branch"), it is mentioned that
    'git branch -f' is intended to be equivalent to 'git reset'. Since we
    usually say "reset to <commit>" in the git-reset Documentation and
    elsewhere, it would make sense to say "Reset to" here as well, instead
    of "Reset from" previously.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    rctay committed with gitster Apr 9, 2010
Commits on Apr 8, 2010
  1. @peff @gitster

    docs: clarify "branch -l"

    This option is mostly useless these days because we turn on
    reflogs by default in non-bare repos.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Apr 8, 2010
Commits on Apr 4, 2010
  1. @rctay @gitster

    pack-protocol.txt: fix pkt-line lengths

    Previously, the lengths were 4-bytes short. Fix it such that the lengths
    reflect the total length of the pkt-line, as per spec.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    rctay committed with gitster Apr 4, 2010
Something went wrong with that request. Please try again.