Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 13, 2011
  1. @gitster

    Git 1.7.5-rc2

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

    Merge branch 'maint'

    gitster authored
    * maint:
  3. @gitster

    Merge branch 'jc/rev-list-options-fix' into maint

    gitster authored
    * jc/rev-list-options-fix:
      "log --cherry-pick" documentation regression fix
  4. @gitster

    Merge branch 'js/checkout-untracked-symlink' into maint

    gitster authored
    * js/checkout-untracked-symlink:
      t2021: mark a test as fixed
  5. @meyering @gitster

    remove doubled words, e.g., s/to to/to/, and fix related typos

    meyering authored gitster committed
    I found that some doubled words had snuck back into projects from which
    I'd already removed them, so now there's a "syntax-check" makefile rule in
    gnulib to help prevent recurrence.
    
    Running the command below spotted a few in git, too:
    
      git ls-files | xargs perl -0777 -n \
        -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt])\s+\1\b/gims)' \
        -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g;' \
        -e 'print "$ARGV:$n:$v\n"}'
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @artagnon @gitster

    revert: Hide '-r' option in default usage

    artagnon authored gitster committed
    The '-r' command-line option is a no-op provided only for backward
    compatiblity since abd6970 (cherry-pick: make -r the default, 2006-10-05),
    and somehow ended up surviving across reimplementation in C at 9509af6
    (Make git-revert & git-cherry-pick a builtin, 2007-03-01) and another
    rewrite of the command line parser at f810379 (Make builtin-revert.c use
    parse_options, 2007-10-07).  We should have stopped advertising the option
    long time ago.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 12, 2011
  1. @gitster

    Merge branch 'js/checkout-untracked-symlink'

    gitster authored
    * js/checkout-untracked-symlink:
      t2021: mark a test as fixed
  2. @gitster

    Merge branch 'nd/init-gitdir'

    gitster authored
    * nd/init-gitdir:
      t0001: guard a new test with SYMLINKS prerequisite
  3. @gitster

    t2021: mark a test as fixed

    Johannes Sixt authored gitster committed
    The failure was fixed by the previous commit.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    t0001: guard a new test with SYMLINKS prerequisite

    Johannes Sixt authored gitster committed
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 11, 2011
  1. @avar @gitster

    Makefile: extract Q_() source strings as ngettext()

    avar authored gitster committed
    The Q_() wrapper added by 0c9ea33 (i18n: add stub Q_() wrapper for
    ngettext, 2011-03-09) needs to be noticed by xgettext.
    
    Add an appropriate --keyword option to the Makefile, so that "make pot"
    would notice the strings in the plural form marked with the wrapper.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    i18n: avoid parenthesized string as array initializer

    Ramsay Jones authored gitster committed
    The syntax
    
        static const char ignore_error[] = ("something");
    
    is invalid C.  A parenthesized string is not allowed as an array
    initializer.
    
    Some compilers, for example GCC and MSVC, allow this syntax as an
    extension, but it is not a portable construct.  tcc does not parse it, for
    example.
    
    Remove the parenthesis from the definition of the N_() macro to
    fix this.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge git://git.bogomips.org/git-svn

    gitster authored
    * git://git.bogomips.org/git-svn:
      git-svn: Cache results of running the executable "git config"
      git-svn: Add a svn-remote.<name>.pushurl config key
  4. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Update cherry-pick error message parsing
      gitk: Quote tag names in event bindings to avoid problems with % chars
      gitk: Allow user to control how much of the SHA1 ID gets auto-selected
      gitk: spelling fixes in Russian translation
      gitk: Take only numeric version components when computing $git_version
Commits on Apr 9, 2011
  1. git-svn: Cache results of running the executable "git config"

    James Y Knight authored Eric Wong committed
    Running programs is not cheap!
    
    Signed-off-by: James Y Knight <jknight@itasoftware.com>
    Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  2. @asedeno

    git-svn: Add a svn-remote.<name>.pushurl config key

    asedeno authored Eric Wong committed
    Similar to the 'remote.<name>.pushurl' config key for git remotes,
    'pushurl' is designed to be used in cases where 'url' points to an SVN
    repository via a read-only transport, to provide an alternate
    read/write transport. It is assumed that both keys point to the same
    repository.
    
    The 'pushurl' key is distinct from the 'commiturl' key in that
    'commiturl' is a full svn path while 'pushurl' (like 'url') is a base
    path. 'commiturl' takes precendece over 'pushurl' in cases where
    either might be used.
    
    The 'pushurl' is used by git-svn's dcommit and branch commands.
    
    Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
    Reviewed-by: James Y Knight <jknight@itasoftware.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  3. @andersk @paulusmack

    gitk: Update cherry-pick error message parsing

    andersk authored paulusmack committed
    Commit 981ff5c changed the error
    message from git cherry-pick from
        Automatic cherry-pick failed.  [...advice...]
    to
        error: could not apply 7ab78c9... Do something neat.
        [...advice...]
    
    Update gitk’s regex to match this, restoring the ability to launch git
    citool to resolve conflicted cherry-picks.
    
    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
Commits on Apr 7, 2011
  1. @splicer @gitster

    git-p4: replace each tab with 8 spaces for consistency

    splicer authored gitster committed
    Note that the majority of git-p4 uses spaces, not tabs, for indentation.
    Consistent indentation is a good hygiene for Python scripts, and mixing
    tabs and spaces in Python can lead to hard-to-find bugs.
    
    Signed-off-by: Andrew Garber <andrew@andrewgarber.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 6, 2011
  1. @gitster

    Git 1.7.5-rc1

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

    Sync with 1.7.4.4

    gitster authored
  3. @gitster

    Git 1.7.4.4

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

    Merge branch 'nm/maint-conflicted-submodule-entries' into maint

    gitster authored
    * nm/maint-conflicted-submodule-entries:
      submodule: process conflicting submodules only once
  5. @gitster

    Merge branch 'mg/rev-list-n-reverse-doc' into maint

    gitster authored
    * mg/rev-list-n-reverse-doc:
      git-log.txt,rev-list-options.txt: put option blocks in proper order
      git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
  6. @gitster

    Merge branch 'jk/maint-remote-mirror-safer'

    gitster authored
    * jk/maint-remote-mirror-safer:
      remote: deprecate --mirror
      remote: separate the concept of push and fetch mirrors
      remote: disallow some nonsensical option combinations
  7. @gitster

    Merge branch 'mg/doc-revisions-txt'

    gitster authored
    * mg/doc-revisions-txt:
      revisions.txt: language improvements
      revisions.txt: structure with a labelled list
      revisions.txt: consistent use of quotes
Commits on Apr 4, 2011
  1. @mjg @gitster

    revisions.txt: language improvements

    mjg authored gitster committed
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Documentation: trivial grammar fix in core.worktree description
      gitweb: Fix parsing of negative fractional timezones in JavaScript
  3. @gitster

    Merge branch 'jl/submodule-fetch-on-demand'

    gitster authored
    * jl/submodule-fetch-on-demand:
      fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
      submodule update: Don't fetch when the submodule commit is already present
      fetch/pull: Don't recurse into a submodule when commits are already present
      Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
      config: teach the fetch.recurseSubmodules option the 'on-demand' value
      fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
      fetch/pull: recurse into submodules when necessary
    
    Conflicts:
    	builtin/fetch.c
    	submodule.c
  4. @gitster

    Merge branch 'jc/rev-list-options-fix'

    gitster authored
    * jc/rev-list-options-fix:
      "log --cherry-pick" documentation regression fix
  5. @szeder @gitster

    Documentation: trivial grammar fix in core.worktree description

    szeder authored gitster committed
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @jnareb @gitster

    gitweb: Fix parsing of negative fractional timezones in JavaScript

    jnareb authored gitster committed
    Extract converting numerical timezone in the form of '(+|-)HHMM' to
    timezoneOffset function, and fix parsing of negative fractional
    timezones.
    
    This is used to format timestamps in 'blame_incremental' view; this
    complements commit 2b1e172 (gitweb: Fix handling of fractional
    timezones in parse_date, 2011-03-25).
    
    Now
    
      gitweb.cgi/git.git/blame_incremental/3fe5489:/contrib/gitview/gitview#l853
    
    and
    
      gitweb.cgi/git.git/blame/3fe5489:/contrib/gitview/gitview#l853
    
    show the same correct time in author's local timezone in title
    (on mouseover) [Aneesh Kumar K.V, 2006-02-24 00:59:42 +0530].
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Merge branch 'nm/maint-conflicted-submodule-entries'

    gitster authored
    * nm/maint-conflicted-submodule-entries:
      submodule: process conflicting submodules only once
Commits on Apr 3, 2011
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Start preparing for 1.7.4.4
      pull: do not clobber untracked files on initial pull
      compat: add missing #include <sys/resource.h>
    
    Conflicts:
    	RelNotes
  2. @gitster

    Start preparing for 1.7.4.4

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

    pull: do not clobber untracked files on initial pull

    peff authored gitster committed
    For a pull into an unborn branch, we do not use "git merge"
    at all. Instead, we call read-tree directly. However, we
    used the --reset parameter instead of "-m", which turns off
    the safety features.
    
    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.