Skip to content
Commits on Mar 28, 2008
  1. @gitster

    GIT 1.5.5-rc2

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

    GIT 1.5.4.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 27, 2008
Commits on Mar 27, 2008
  1. @gitster

    builtin-prune: protect objects listed on the command line

    Finally, this resurrects the documented behaviour to protect other
    objects listed on the command line from getting pruned.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 24, 2008
  2. @chunga @gitster

    builtin-prune.c: use parse_options()

    Using the OPT_DATE() introduced earlier, this updates builtin-prune to
    use parse_options().
    
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chunga committed with gitster Mar 23, 2008
  3. @chunga @gitster

    Add tests for git-prune

    It seems that git prune changed behaviour with respect to revisions added
    from command line, probably when it became a builtin. Currently, it prints
    a short usage and exits: instead, it should take those revisions into
    account and not prune them. So add a couple of test to point this out.
    
    We'll be fixing this by switching to parse_options(), so add tests to
    detect bogus command line parameters as well, to keep ourselves from
    introducing regressions.
    
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chunga committed with gitster Mar 23, 2008
  4. @chunga @gitster

    parse-options.c: introduce OPT_DATE

    There are quite a few places that will need to call approxidate(),
    when they'll adopt the parse-options system, so this patch adds the
    function parse_opt_approxidate_cb(), used by OPT_DATE.
    
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chunga committed with gitster Mar 24, 2008
  5. @gitster

    Update draft release notes for 1.5.5

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

    Merge branch 'maint'

    * maint:
      Update draft release notes for 1.5.4.5
      Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
      t/t3800-mktag.sh: use test_must_fail rather than '!'
    
    Conflicts:
    
    	t/t3800-mktag.sh
    gitster committed Mar 27, 2008
  7. @gitster

    Update draft release notes for 1.5.4.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 27, 2008
  8. @gitster

    Merge branch 'jc/maint-fetch-regression-1.5.4' into maint

    * jc/maint-fetch-regression-1.5.4:
      git-fetch test: test tracking fetch results, not just FETCH_HEAD
      Fix branches file configuration
      Tighten refspec processing
    gitster committed Mar 27, 2008
  9. @peff @gitster

    Documentation: clarify use of .git{ignore,attributes} versus .git/info/*

    gitignore patterns can be read from three different
    files, while gitattributes can come from two files. Let's
    provide some hints to the user about the differences and how
    they are typically used.
    
    Suggested by Toby Corkindale, but gratuitously reworded by Jeff King.
    
    Signed-off-by: Toby Corkindale <toby.corkindale@rea-group.com>
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Mar 27, 2008
  10. @gitster

    test_must_fail: 129 is a valid error code from usage()

    When a git command is run under test_must_fail to make sure that
    the argument parser catches bogus command line, it exits with 129.
    We need to catch it as a valid "graceful error exit".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 24, 2008
Commits on Mar 26, 2008
  1. @gitster

    imap-send: properly error out if imap.host is not set in config

    If no imap host is specified in the git config, git imap-send used
    to try to lookup a null pointer through gethostbyname(), causing a
    segfault.  Since setting the imap.host variable is mandatory,
    imap-send now properly fails with an explanatory error message.
    
    The problem has been reported by picca through
     http://bugs.debian.org/472632
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Gerrit Pape committed with gitster Mar 26, 2008
  2. @flichtenheld @gitster

    t9600-cvsimport.sh: set HOME before checking for cvsps availability

    This actually sounds like a bug in cvsps, which requires an existing
    home directory when asked for the usage through -h
    
     $ HOME=/nonexistent cvsps -h
     Cannot create the cvsps directory '.cvsps': No such file or directory
    
    This made t9600 think that cvsps is not available if HOME did not exist,
    causing the tests to be skipped
    
     $ HOME=/nonexistent sh t9600-cvsimport.sh
     * skipping cvsimport tests, cvsps not found
     * passed all 0 test(s)
    
    Now t9600 sets HOME to the current working directory before checking for
    the availability of the cvsps program.
    
    This issue has been discovered by Marco Rodrigues, and fixed by Frank
    Lichtenheld through
     http://bugs.debian.org/471969
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    flichtenheld committed with gitster Mar 26, 2008
  3. @szeder @gitster

    Always set *nongit_ok in setup_git_directory_gently()

    setup_git_directory_gently() only modified the value of its *nongit_ok
    argument if we were not in a git repository.  Now it will always set it
    to 0 when we are inside a repository.
    
    Also remove now unnecessary initializations in the callers of this
    function.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Mar 25, 2008
  4. @gitster

    t/t3800-mktag.sh: use test_must_fail rather than '!'

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Mar 25, 2008
  5. @gitster

    Merge branch 'jc/maint-fetch-regression-1.5.4'

    * jc/maint-fetch-regression-1.5.4:
      git-fetch test: test tracking fetch results, not just FETCH_HEAD
      Fix branches file configuration
      Tighten refspec processing
      Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
    gitster committed Mar 26, 2008
  6. @gitster

    git-fetch test: test tracking fetch results, not just FETCH_HEAD

    We really should have done this long time ago.  Existing t5515 test
    was written for the specific purpose of catching regression to the
    contents of generated FETCH_HEAD file, but it also is a good place
    to make sure various fetch configurations do fetch what they intend
    to fetch (and nothing else).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 26, 2008
  7. @gitster

    Fix branches file configuration

    Fetched remote branch from .git/branches/foo should fetch into
    refs/heads/foo.  Also when partial URL is given, the fetched head should
    always be remote HEAD, and the result should not be stored anywhere.
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Daniel Barkalow committed with gitster Mar 25, 2008
  8. @gitster

    Tighten refspec processing

    This changes the pattern matching code to not store the required final
    / before the *, and then to require each side to be a valid ref (or
    empty). In particular, any refspec that looks like it should be a
    pattern but doesn't quite meet the requirements will be found to be
    invalid as a fallback non-pattern.
    
    This was cherry picked from commit ef00d15 (Tighten refspec processing,
    2008-03-17), and two fix-up commits 46220ca (remote.c: Fix overtight
    refspec validation, 2008-03-20) and 7d19da4 (refspec: allow colon-less
    wildcard "refs/category/*", 2008-03-25) squashed in.
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Daniel Barkalow committed with gitster Mar 17, 2008
  9. @guanqun @gitster

    Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.

    Texts between ~ and ~ will be subscripted during the asciidoc translation.
    
    Signed-off-by: Guanqun Lu <Guanqun.Lu@Gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    (cherry picked from commit 0c82939)
    guanqun committed with gitster Mar 24, 2008
  10. @gitster

    refspec: allow colon-less wildcard "refs/category/*"

    "git push --tags elsewhere" is implemented in terms of wildcarded refspec
    "refs/tags/*" these days, and the user wants to push the tags under the
    same name to the other branch.  This resurrects the support for it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 25, 2008
Commits on Mar 25, 2008
  1. @dscho @gitster

    init: show "Reinit" message even in an (existing) empty repository

    Earlier, git-init tested for a valid HEAD ref, but if the repository
    was empty, there was none.  Instead, test for the existence of
    the file $GIT_DIR/HEAD.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Mar 24, 2008
  2. @qur @gitster

    Documentation/git-checkout: Update summary to reflect current abilities

    For a while now, git-checkout has been more powerful than the man-page
    summary would suggest (the main text does describe the new features),
    so update the summary to hopefully better reflect the current
    functionality.  Also update the glossary description of the word checkout.
    
    Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    qur committed with gitster Mar 24, 2008
  3. @gitster

    Documentation: git-tag '-m'/'-F' implies '-a'

    Dirk Süsserott committed with gitster Mar 24, 2008
Commits on Mar 24, 2008
  1. @gitster

    builtin-remote: Fix missing newline at end of listing of pushed branches

    Without this the output of 'git remote show' does not end with a new-line:
    
    bash> git remote show repo
    * remote repo
      URL: repo.or.cz:/srv/git/kdbg.git
      Tracked remote branches
        maint master mob
      Local branch pushed with 'git push'
        +master:masterbash>
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Johannes Sixt committed with gitster Mar 18, 2008
Commits on Mar 23, 2008
  1. @guanqun @gitster

    Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.

    Texts between ~ and ~ will be subscripted during the asciidoc translation.
    
    Signed-off-by: Guanqun Lu <Guanqun.Lu@Gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    guanqun committed with gitster Mar 24, 2008
  2. @dscho @gitster

    RelNotes: mention checkout/branch's --track option, too

    checkout and branch recently learnt to track local branches when
    branch.autosetupmerge = always, but they _also_ learnt to do that when
    asked explicitely with the option "--track".
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Mar 23, 2008
  3. @gitster

    GIT 1.5.5-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 23, 2008
  4. @gitster

    gc --auto: raise default auto pack limit from 20 to 50

    Recent discussion on the list, with the improvement f7c22cc (always start
    looking up objects in the last used pack first, 2007-05-30) brought in,
    reached the concensus that the current default 20 is too low.
    
    Reference: http://thread.gmane.org/gmane.comp.version-control.git/77586
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 23, 2008
  5. @gitster

    Merge branch 'git-p4' of git://repo.or.cz/git/git-p4

    * 'git-p4' of git://repo.or.cz/git/git-p4:
      git-p4: Use P4EDITOR environment variable when set
      git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
      git-p4: Optimize the fetching of data from perforce.
    gitster committed Mar 23, 2008
  6. @gitster

    remote.c: Fix overtight refspec validation

    We tightened the refspec validation code in an earlier commit ef00d15
    (Tighten refspec processing, 2008-03-17) per my suggestion, but the
    suggestion was misguided to begin with and it broke this usage:
    
        $ git push origin HEAD~12:master
    
    The syntax of push refspecs and fetch refspecs are similar in that they
    are both colon separated LHS and RHS (possibly prefixed with a + to
    force), but the similarity ends there.  For example, LHS in a push refspec
    can be anything that evaluates to a valid object name at runtime (except
    when colon and RHS is missing, or it is a glob), while it must be a
    valid-looking refname in a fetch refspec.  To validate them correctly, the
    caller needs to be able to say which kind of refspecs they are.  It is
    unreasonable to keep a single interface that cannot tell which kind it is
    dealing with, and ask it to behave sensibly.
    
    This commit separates the parsing of the two into different functions, and
    clarifies the code to implement the parsing proper (i.e. splitting into
    two parts, making sure both sides are wildcard or neither side is).
    
    This happens to also allow pushing a commit named with the esoteric "look
    for that string" syntax:
    
        $ git push ../test.git ':/remote.c: Fix overtight refspec:master'
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 20, 2008
  7. @gitster

    fast-import: Document the effect of "merge" with no "from" in a commit

    The fast-import documentation currently does not document the behaviour
    of "merge" when there is no "from" in a commit.  This patch adds a
    description of what happens: the commit is created with a parent, but
    no files.  This behaviour is equivalent to "from" followed by
    "filedeleteall".
    
    Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eyvind Bernhardsen committed with gitster Mar 21, 2008
  8. @kballard @gitster

    Make git-svn tests behave better on OS X

    Give lib-git-svn.sh a few alternate paths to look for apache2.
    Explicitly define the LockFile so httpd will actually start under OS X
    
    Signed-off-by: Kevin Ballard <kevin@sb.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kballard committed with gitster Mar 21, 2008
  9. @gitster

    Improve description of git filter-branch.

    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ralf Wildenhues committed with gitster Mar 20, 2008
Something went wrong with that request. Please try again.