Permalink
Commits on Feb 2, 2008
  1. GIT 1.5.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 2, 2008
  2. Fix "git checkout -b foo ':/substring'"

    Because ':/substring' extended SHA1 expression cannot take
    postfix modifiers such as ^{tree} and ^{commit}, we would need
    to do it in multiple steps.  With the patch, you can start a new
    branch from a randomly-picked commit whose message has the named
    string in it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 2, 2008
Commits on Jan 31, 2008
  1. Fix typo in a comment in t/test-lib.sh

    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chunga committed with gitster Jan 31, 2008
  2. git rev-parse manpage: spelling fix

    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Jan 31, 2008
  3. Revert "filter-branch docs: remove brackets so not to imply revision …

    …arg is optional"
    
    This reverts commit c41b439, as
    we decided to default to HEAD when revision parameters are missing
    and they are no longer mandatory.
    gitster committed Jan 31, 2008
  4. Documentation/git-cvsserver: Fix typo

    Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlherren committed with gitster Jan 31, 2008
  5. filter-branch: assume HEAD if no revision supplied

    filter-branch previously took the first non-option argument as the name for
    a new branch. Since dfd05e3, it now takes a revision or a revision range
    and modifies the current branch. Update to operate on HEAD by default to
    conform with standard git interface practice.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Jan 30, 2008
  6. filter-branch docs: remove brackets so not to imply revision arg is o…

    …ptional
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Jan 31, 2008
  7. Use 'printf %s $x' notation in t5401

    We only care about getting what should be an empty string and
    sending it to a file, without a trailing LF, so the empty string
    translates into a 0 byte file.  Earlier when I originally wrote
    these lines Mac OS X allowed the format string of printf to be
    the empty string, but more recent versions appear to have been
    'improved' with error messages if the format is not given.
    
    This may cause problems if we ever wind up with changes to the hook
    tests.  A minor cleanup makes the test more safe on all systems,
    by conforming to accepted printf conventions.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    spearce committed with gitster Jan 30, 2008
Commits on Jan 30, 2008
  1. filter-branch.sh: remove temporary directory on failure

    One of the first things filter-branch does is to create a temporary
    directory. This directory is eventually removed by the script during
    normal operation, but is not removed if the script encounters an error.
    
    Set a trap to remove it when the script terminates for any reason.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Jan 28, 2008
  2. git-relink: avoid hard linking in objects/info directory

    git-relink is intended to search for packs and loose objects in
    common between two repositories and to replace the one set with
    hard links to the other. Files other than packs and loose objects
    should not be touched, so add the "info" sub-directory to the
    pattern of directory excludes.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Jan 29, 2008
  3. gitweb: Make use of the $git_dir variable at sub git_get_project_desc…

    …ription
    
    Signed-off-by: Bruno Ribas <ribas@c3sl.ufpr.br>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bcribas committed with gitster Jan 30, 2008
  4. gitweb: Add info about $projectroot and $projects_list to gitweb/README

    Those two configuration variables are important enough that it is
    worth to explicitely write about them in the "Gitweb config file
    variables" section even if they are usually set during build by
    GITWEB_PROJECTROOT and GITWEB_LIST build (Makefile) configuration
    variables.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnareb committed with gitster Jan 29, 2008
  5. fix doc typos

    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Jan 29, 2008
  6. reflog-expire: Avoid creating new files in a directory inside readdir…

    …(3) loop
    
    "git reflog expire --all" opened a directory in $GIT_DIR/logs/,
    read reflog files in there readdir(3), and rewrote the file by
    creating a new file and renaming it back inside the loop.  This
    code structure can cause the newly created file to be returned
    by subsequent call to readdir(3), and fall into an infinite loop
    in the worst case.
    
    This separates the processing to two phase.  Running
    for_each_reflog() to find out and collect all refs, and then
    iterate over them, calling expire_reflog().  This way, the
    program would behave exactly the same way as if all the refs
    were given by the user from the command line.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 26, 2008
  7. gitweb: Convert generated contents to utf8 in commitdiff_plain

    If the commit message, or commit author contains non-ascii, it must be
    converted from Perl internal representation to utf-8, to follow what
    got declared in HTTP header.  Use to_utf8() to do the conversion.
    
    This necessarily replaces here-doc with "print" statements.
    
    Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
    Acked-by: İsmail Dönmez <ismail@pardus.org.tr>
    Acked-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    yashi committed with gitster Jan 29, 2008
Commits on Jan 29, 2008
  1. instaweb: use 'browser.<tool>.path' config option if it's set.

    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chriscool committed with gitster Jan 29, 2008
  2. Documentation: help: specify supported html browsers.

    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chriscool committed with gitster Jan 29, 2008
  3. Documentation: config: add "browser.<tool>.path".

    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chriscool committed with gitster Jan 29, 2008
Commits on Jan 28, 2008
  1. Add test for rebase -i with commits that do not pass pre-commit

    This accompanies c5b09fe (Avoid
    update hook during git-rebase --interactive) to make sure that
    any regression to make Debian's Bug#458782 (git-core: git-rebase
    doesn't work when trying to squash changes into commits created
    with --no-verify) resurface will be caught.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Jan 28, 2008
  2. t9001: add missing && operators

    The exit value of some commands was not being used for the
    test output.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jan 22, 2008
Commits on Jan 27, 2008
  1. GIT 1.5.4-rc5

    Hopefully the last rc before the final...
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 27, 2008
  2. pull --rebase: be cleverer with rebased upstream branches

    When the upstream branch is tracked, we can detect if that branch
    was rebased since it was last fetched.  Teach git to use that
    information to rebase from the old remote head onto the new remote head.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Jan 26, 2008
  3. cvsserver: Fix for histories with multiple roots

    Git histories may have multiple roots, which can cause
    git merge-base to fail and this caused git cvsserver to die.
    
    This commit teaches git cvsserver to handle a failing git
    merge-base gracefully, and modifies the test case to verify this.
    All the test cases now use a history with two roots.
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>
    
     git-cvsserver.perl              |    9 ++++++++-
     t/t9400-git-cvsserver-server.sh |   10 +++++++++-
     2 files changed, 17 insertions(+), 2 deletions(-)
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sprohaska committed with gitster Jan 26, 2008
  4. t9400-git-cvsserver-server: Wrap setup into test case

    It is preferable to have the test setup in a test case.  The
    setup itself may fail and having it as a test case handles this
    situation more gracefully.
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sprohaska committed with gitster Jan 26, 2008
Commits on Jan 26, 2008
  1. Documentation: add a bit about sendemail.to configuration

    While there is information about this in the configuration section, it was
    missing in the options section.
    
    Signed-off-by: Mike Hommey <mh@glandium.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    glandium committed with gitster Jan 26, 2008
  2. parse-options: catch likely typo in presense of aggregated options.

    If options are aggregated, and that the whole token is an exact
    prefix of a long option that is longer than 2 letters, reject
    it.  This is to prevent a common typo:
    
    	$ git commit -amend
    
    to get interpreted as "commit all with message 'end'".
    
    The typo check isn't performed if there is no aggregation,
    because the stuck form is the recommended one.  If we have `-o`
    being a valid short option that takes an argument, and --option
    a long one, then we _MUST_ accept -option as "'o' option with
    argument 'ption'", which is our official recommended form.
    
    Signed-off-by: Pierre Habouzit <madcoder@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MadCoder committed with gitster Jan 26, 2008
  3. Add a missing dependency on http.h

    Signed-off-by: Mike Hommey <mh@glandium.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    glandium committed with gitster Jan 26, 2008
  4. git pull manpage: don't include -n from fetch-options.txt

    The -n option stands for --no-summary in git pull
    
    [jes: reworded the description to avoid mentioning 'git-fetch';
     also exclude '-n' conditional on git-pull -- ugly because of
     the missing "else" statement in asciidoc]
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Jan 25, 2008
  5. git-svn(1): update instructions for resuming a git-svn clone

    git-svn expects its references under refs/remotes/*; but these will
    not be copied or set by "git clone"; put in this man page the manual
    fiddling that is required with current git-svn to get this to work.
    
    Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    samv committed with gitster Jan 24, 2008
  6. autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.

    Pre-POSIX.1-2001 systems don't have <sys/select.h>, but select(2)
    is declared in <sys/time.h>, which git-compat-util.h includes.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnareb committed with gitster Jan 25, 2008
Commits on Jan 25, 2008
  1. Makefile: customization for supporting HP-UX

    Signed-off-by: Robert Schiele <rschiele@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    schiele committed with gitster Jan 24, 2008
Commits on Jan 24, 2008
  1. pre-POSIX.1-2001 systems do not have <sys/select.h>

    POSIX.1-2001 has declaration of select(2) in <sys/select.h>, but
    in the previous version of SUS, it was declared in <sys/time.h>
    (which is already included in git-compat-util.h).
    
    This introduces NO_SYS_SELECT_H macro in the Makefile to be set
    on older systems, to skip inclusion of <sys/select.h> that does
    not exist on them.
    
    We could check _POSIX_VERSION with 200112L and do this
    automatically, but earlier it was reported that the approach
    does not work well on some vintage of HP-UX.  Other systems may
    get _POSIX_VERSION itself wrong.  At least for now, this manual
    configuration is safer.
    
    Signed-off-by: Robert Schiele <rschiele@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    schiele committed with gitster Jan 24, 2008
  2. Merge git://repo.or.cz/git-gui

    * git://repo.or.cz/git-gui:
      git-gui: Correctly cleanup msgfmt '1 message untranslated' output
      git-gui: Make the statistics of po2msg match those of msgfmt
      git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
      git-gui: Work around random missing scrollbar in revision list
    gitster committed Jan 24, 2008
Commits on Jan 23, 2008
  1. git-commit: exit non-zero if we fail to commit the index

    In certain rare cases, the creation of the commit object
    and update of HEAD can succeed, but then installing the
    updated index will fail. This is most likely caused by a
    full disk or exceeded disk quota. When this happens the
    new index file will be removed, and the repository will
    be left with the original now-out-of-sync index. The
    user can recover with a "git reset HEAD" once the disk
    space issue is resolved.
    
    We should detect this failure and offer the user some
    helpful guidance.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Jan 23, 2008