Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 5, 2011
  1. @gitster

    Git 1.7.3.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 4, 2011
  1. @jrn @gitster

    gitweb: skip logo in atom feed when there is none

    jrn authored gitster committed
    With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo,
    not $logo_url, 2006-12-04), the logo URI to be written to Atom
    feeds was corrected but the case of no logo forgotten.
    
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 29, 2010
  1. @robbat2 @gitster

    t9001: Fix test prerequisites

    robbat2 authored gitster committed
    Add in missing Perl prerequisites for new tests of send-email.
    
    Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 28, 2010
  1. @gitster

    Prepare for 1.7.3.5

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

    Merge branch 'jk/commit-die-on-bogus-ident' into maint

    gitster authored
    * jk/commit-die-on-bogus-ident:
      commit: die before asking to edit the log message
      ident: die on bogus date format
  3. @gitster

    Merge branch 'ks/blame-worktree-textconv-cached' into maint

    gitster authored
    * ks/blame-worktree-textconv-cached:
      fill_textconv(): Don't get/put cache if sha1 is not valid
      t/t8006: Demonstrate blame is broken when cachetextconv is on
  4. @gitster

    Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint

    gitster authored
    * jc/maint-rebase-rewrite-last-skip:
      rebase --skip: correctly wrap-up when skipping the last patch
  5. @gitster

    Merge branch 'jc/maint-am-abort-safely' into maint

    gitster authored
    * jc/maint-am-abort-safely:
      am --abort: keep unrelated commits since the last failure and warn
  6. @gitster

    Merge branch 'kb/maint-status-cquote' into maint

    gitster authored
    * kb/maint-status-cquote:
      status: Quote paths with spaces in short format
  7. @robbat2 @gitster

    Fix false positives in t3404 due to SHELL=/bin/false

    robbat2 authored gitster committed
    If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's
    package building), the git-rebase exec tests will fail, because they call
    $SHELL around the command, and in the existing testcase, $SHELL was not being
    cleared sufficently.
    
    This lead to false positive failures of t3404 on systems where the package
    build user was locked down as noted above.
    
    Signed-off-by: "Robin H. Johnson" <robbat2@gentoo.org>
    X-Gentoo-Bug: 349083
    X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 26, 2010
  1. @gitster

    Merge branch 'rs/maint-diff-fd-leak' into maint

    gitster authored
    * rs/maint-diff-fd-leak:
      close file on error in read_mmfile()
  2. @gitster

    close file on error in read_mmfile()

    René Scharfe authored gitster committed
    Reported in http://qa.debian.org/daca/cppcheck/sid/git_1.7.2.3-2.2.html
    and in http://thread.gmane.org/gmane.comp.version-control.git/123042.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 23, 2010
  1. @drafnel @gitster

    test-lib.sh/test_decode_color(): use octal not hex in awk script

    drafnel authored gitster committed
    POSIX awk seems to explicitly not support hexadecimal escape sequences.
    
    From http://pubs.opengroup.org/onlinepubs/009695399/:
    
       Regular expressions in awk have been extended somewhat...
       One sequence that is not supported is hexadecimal value escapes
       beginning with '\x'.
    
    This affects the awk on IRIX 6.5, and causes t4015.56 to fail.
    Use octal instead.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    rebase --skip: correctly wrap-up when skipping the last patch

    gitster authored
    When "rebase --skip" is used to skip the last patch in the series, the
    code to wrap up the rewrite by copying the notes from old to new commits
    and also by running the post-rewrite hook was bypassed.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 21, 2010
  1. @jrn @gitster

    t0050: fix printf format strings for portability

    jrn authored gitster committed
    Unlike bash and ksh, dash passes through hexadecimal \xcc escapes.
    So when run with dash, these tests *pass* (since '\xcc' is a perfectly
    reasonable filename) but they are not testing what was intended.
    
    Use octal escapes instead, in the spirit of v1.6.1-rc1~55^2
    (2008-11-09).
    
    Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    t3419-*.sh: Fix arithmetic expansion syntax error

    Ramsay Jones authored gitster committed
    Some shells, for example dash versions older than 0.5.4, need to
    spell a variable reference as '$N' rather than 'N' in an arithmetic
    expansion. In order to avoid the syntax error, we change the
    offending variable reference from 'i' to '$i' in function scramble.
    
    There is nothing bash specific to this test script (and we shouldn't
    have any bash dependent test).  Fix its shebang line.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    am --abort: keep unrelated commits since the last failure and warn

    gitster authored
    After making commits (either by pulling or doing their own work) after a
    failed "am", the user will be reminded by next "am" invocation that there
    was a failed "am" that the user needs to decide to resolve or to get rid
    of the old "am" attempt.  The "am --abort" option was meant to help the
    latter.  However, it rewinded the HEAD back to the beginning of the failed
    "am" attempt, discarding commits made (perhaps by mistake) since.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    commit: die before asking to edit the log message

    gitster authored
    When determine_author_info() returns to the calling prepare_to_commit(),
    we already know the pieces of information necessary to determine what
    author ident will be used in the final message, but deferred making a call
    to fmt_ident() before the final commit_tree().  Most importantly, we would
    open the editor to ask the user to compose the log message before it.
    
    As one important side effect of fmt_ident() is to error out when the given
    information is malformed, this resulted in us spawning the editor first
    and then refusing to commit due to error, even though we had enough
    information to detect the error before starting the editor, which was
    annoying.
    
    Move the fmt_ident() call to the end of determine_author_info() where we
    have final determination of author info to rectify this.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 20, 2010
  1. @peff @gitster

    ident: die on bogus date format

    peff authored gitster committed
    If the user gives "git commit --date=foobar", we silently
    ignore the --date flag. We should note the error.
    
    This patch puts the fix at the lowest level of fmt_ident,
    which means it also handles GIT_AUTHOR_DATE=foobar, as well.
    
    There are two down-sides to this approach:
    
      1. Technically this breaks somebody doing something like
         "git commit --date=now", which happened to work because
         bogus data is the same as "now". Though we do
         explicitly handle the empty string, so anybody passing
         an empty variable through the environment will still
         work.
    
         If the error is too much, perhaps it can be downgraded
         to a warning?
    
      2. The error checking happens _after_ the commit message
         is written, which can be annoying to the user. We can
         put explicit checks closer to the beginning of
         git-commit, but that feels a little hack-ish; suddenly
         git-commit has to care about how fmt_ident works. Maybe
         we could simply call fmt_ident earlier?
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    fill_textconv(): Don't get/put cache if sha1 is not valid

    Kirill Smelkov authored gitster committed
    When blaming files in the working tree, the filespec is marked with
    !sha1_valid, as we have not given the contents an object name yet.  The
    function to cache textconv results (keyed on the object name), however,
    didn't check this condition, and ended up on storing the cached result
    under a random object name.
    
    Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr>
    Cc: Clément Poulain <clement.poulain@ensimag.imag.fr>
    Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
    Cc: Jeff King <peff@peff.net>
    Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    t/t8006: Demonstrate blame is broken when cachetextconv is on

    Kirill Smelkov authored gitster committed
    I have a git repository with lots of .doc and .pdf files. There diff
    works ok, but blaming is painfully slow without textconv cache, and with
    textconv cache, blame says lots of lines are 'Not Yet Committed' which
    is wrong.
    
    Here is a test that demonstrates the problem.
    
    Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr>
    Cc: Clément Poulain <clement.poulain@ensimag.imag.fr>
    Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
    Cc: Jeff King <peff@peff.net>
    Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 19, 2010
  1. @jnareb @gitster

    gitweb: Include links to feeds in HTML header only for '200 OK' response

    jnareb authored gitster committed
    To do that, generating "<link />"s to feeds were refactored into
    print_feed_meta() subroutine, to keep nesting (indent) level in
    git_header_html() low.  This has also the advantage of making code
    more clear.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @MarkLodato @gitster

    fsck docs: remove outdated and useless diagnostic

    MarkLodato authored gitster committed
    In git-fsck(1), there was a reference to the warning "<tree> has full
    pathnames in it".  This exact wording has not been used since 2005
    (commit f1f0d08), when the wording was changed slightly.  More
    importantly, the description of that warning was useless, and there were
    many other similar warning messages which were not document at all.
    Since all these warnings are fairly obvious, there is no need for them
    to be in the man page.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @trast @gitster

    userdiff: fix typo in ruby and python word regexes

    trast authored gitster committed
    Both had an unclosed ] that ruined the safeguard against not matching
    a non-space char.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 17, 2010
  1. @vvavrychuk @gitster

    trace.c: mark file-local function static

    vvavrychuk authored gitster committed
    Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @jiangxin @gitster

    Fix typo in git-gc document.

    jiangxin authored gitster committed
    The variable gc.packrefs for git-gc can be set to true, false and
    "notbare", not "nobare".
    
    Signed-off-by: Jiang Xin <jiangxin@ossxp.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 16, 2010
  1. @mjg @gitster

    difftool: provide basename to external tools

    mjg authored gitster committed
    Currently, only configured diff helpers get the basename of the file
    being compared. Tools specified with "git difftool -x" only get the
    names of temporary files for the different versions.
    
    Export BASE so that an external tool can read the name from the
    environment. Rather than using a third argument, this avoids breaking
    existing scripts which may somewhat carelessly be using "$@" rather than
    "$1" "$2".
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @mjg @gitster

    git-difftool.txt: correct the description of $BASE and describe $MERGED

    mjg authored gitster committed
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 15, 2010
  1. @gitster

    Git 1.7.3.4

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

    Git 1.7.2.5

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

    Git 1.7.1.4

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

    Git 1.7.0.9

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

    Git 1.6.6.3

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

    Git 1.6.5.9

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

    Git 1.6.4.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.