Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 7, 2010
  1. @gitster

    Merge git://repo.or.cz/git-gui

    gitster authored
    * git://repo.or.cz/git-gui:
      git-gui: update french translation
      git-gui: update Japanese translation
      git-gui: fix shortcut for menu "Commit/Revert Changes"
      git-gui: Quote git path when starting another gui in a submodule
      git-gui: update Italian translation
      git-gui: Update Swedish translation (520t0f0u)
      git-gui: use themed tk widgets with Tk 8.5
      git-gui: Update German translation (12 new or changed strings).
      git-gui: Update translation template
      git-gui: Remove unused icon file_parttick
      git-gui: use different icon for new and modified files in the index
      git-gui: set GIT_DIR and GIT_WORK_TREE after setup
      git-gui: update shortcut tools to use _gitworktree
      git-gui: handle bare repos correctly
      git-gui: handle non-standard worktree locations
      git-gui: Support applying a range of changes at once
      git-gui: Add a special diff popup menu for submodules
      git-gui: Use git diff --submodule when available
  2. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      archive: simplify archive format guessing
  3. @gitster

    archive: simplify archive format guessing

    René Scharfe authored gitster committed
    The code to guess an output archive's format consumed any --format
    options and built a new one.  Jonathan noticed that it does so in an
    unsafe way, risking to overflow the static buffer fmt_opt.
    
    Change the code to keep the existing --format options intact and to only
    add a new one if a format could be guessed based on the output file name.
    The new option is added as the first one, allowing the existing ones to
    overrule it, i.e. explicit --format options given on the command line win
    over format guesses, as before.
    
    To simplify the code further, format_from_name() is changed to return the
    full --format option, thus no potentially dangerous sprintf() calls are
    needed any more.
    
    Reported-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 6, 2010
  1. @peff @gitster

    Fix invalid read in quote_c_style_counted

    peff authored gitster committed
    This function did not work on strings that were not NUL-terminated. It
    reads through a length-bounded string, searching for characters in need of
    quoting. After we find one, we output the quoted character, then advance
    our pointer to find the next one. However, we never decremented the
    length, meaning we ended up looking at whatever random junk was stored
    after the string.
    
    This bug was not found by the existing tests because most code paths feed
    a NUL-terminated string. The notable exception is a directory name being
    fed by ls-tree.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @peff @gitster

    docs: fix filter-branch example for quoted paths

    peff authored gitster committed
    If there is a quoted path, update-index will correctly
    unquote it. However, we must take care to put our new prefix
    inside the double-quote.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @Benabik @gitster

    t9501: Re-fix max load test

    Benabik authored gitster committed
    Revert the previous attempt to skip this test on platforms where we
    currently cannot determine the system load.  We want to make sure that
    the max-load-limit codepath produces results cleanly, when gitweb is
    updated and becomes capable of reading the load average by some other
    method.
    
    The code to check for load returns 0 if it doesn't know how to find
    load.  It also checks to see if the current load is higher than the
    max load.  So to force the script to quit early by setting the maxload
    variable negative which should work for systems where we can detect
    load (which should be a positive number) and systems where we can't
    (where detected load is 0)
    
    Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @bjorng @gitster

    bash: support the --autosquash option for rebase

    bjorng authored gitster committed
    Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix copyright symbol in About box message
  6. @Benabik @gitster

    t9501: Skip testing load if we can't detect it

    Benabik authored gitster committed
    Currently gitweb only knows how to check for load using /proc/loadavg,
    which isn't available on all systems.  We shouldn't fail the test just
    because we don't know how to check the system load.
    
    Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Update draft release notes to 1.7.0

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

    Merge branch 'maint'

    gitster authored
    * maint:
      Update git fsck --full short description to mention packs
Commits on Feb 5, 2010
  1. @wjl @gitster

    Update git fsck --full short description to mention packs

    wjl authored gitster committed
    The '--full' option to git fsck does two things:
    
      1) Check objects in packs
      2) Check alternate objects
    
    This is documented in the git fsck manual; this patch reflects that in
    the short git fsck option help message as well.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jc/maint-limit-note-output' into maint

    gitster authored
    * jc/maint-limit-note-output:
      Fix "log --oneline" not to show notes
      Fix "log" family not to be too agressive about showing notes
  3. @gitster

    Revert 3081623 and 7e62265

    gitster authored
    It seems that we have bad interaction with the code related to
    GIT_WORK_TREE and "grep --no-index", and broke running grep inside
    the .git directory.  For now, just revert it and resurrect it after
    1.7.0 ships.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @andrewmyrick

    git-svn: persistent memoization

    andrewmyrick authored Eric Wong committed
    Make memoization of the svn:mergeinfo processing functions persistent with
    Memoize::Storable so that the memoization tables don't need to be regenerated
    every time the user runs git-svn fetch.
    
    The Memoize::Storable hashes are stored in ENV{GIT_DIR}/svn/.caches.
    
    [ew: changed caches path to avoid conflicts with old repos]
    [ew: File::Path::{make_path => mkpath} for compatibility]
    [ew: line-wrapped at 80 chars]
    
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Andrew Myrick <amyrick@apple.com>
Commits on Feb 4, 2010
  1. @gitster

    fast-import: count --max-pack-size in bytes

    gitster authored
    Similar in spirit to 07cf0f2 (make --max-pack-size argument to 'git
    pack-object' count in bytes, 2010-02-03) which made the option by the same
    name to pack-objects, this counts the pack size limit in bytes.
    
    In order not to cause havoc with people used to the previous megabyte
    scale an integer smaller than 8192 is interpreted in megabytes but the
    user gets a warning.  Also a minimum size of 1 MiB is enforced to avoid an
    explosion of pack files.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
  2. @npitre @gitster

    update git-repack documentation wrt repack.UseDeltaBaseOffset

    npitre authored gitster committed
    This default for repack.UseDeltaBaseOffset has been "true" since
    Git v1.6.0.
    
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @mjg @gitster

    git-clean: fix the description of the default behavior

    mjg authored gitster committed
    Currently, when called without -n and -f, git clean issues
    
    fatal: clean.requireForce not set and -n or -f not given; refusing to clean
    
    which leaves the user wondering why force is required when requireForce
    is not set. Looking up in git-clean(1) does not help because its
    description is wrong.
    
    Change it so that git clean issues
    
    fatal: clean.requireForce defaults to true and -n or -f not given; refusing to clean
    
    in this situation (and "...set to true..." when it is set) which makes
    it clearer that an unset config means true here, and adjust the
    documentation.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    fast-import.c: Fix big-file-threshold parsing bug

    gitster authored
    Manual merge made at 844ad3d (Merge branch 'sp/maint-fast-import-large-blob'
    into sp/fast-import-large-blob, 2010-02-01) did not correctly reflect the change
    of unit in which this variable's value is counted from its previous version.
    
    Now it counts in bytes, not in megabytes.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
  5. @npitre @gitster

    make --max-pack-size argument to 'git pack-object' count in bytes

    npitre authored gitster committed
    The value passed to --max-pack-size used to count in MiB which was
    inconsistent with the corresponding configuration variable as well as
    other command arguments which are defined to count in bytes with an
    optional unit suffix.  This brings --max-pack-size in line with the
    rest of Git.
    
    Also, in order not to cause havoc with people used to the previous
    megabyte scale, and because this is a sane thing to do anyway, a
    minimum size of 1 MiB is enforced to avoid an explosion of pack files.
    
    Adjust and extend test suite accordingly.
    
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @npitre @gitster

    pack-objects: fix pack generation when using pack_size_limit

    npitre authored gitster committed
    Current handling of pack_size_limit is quite suboptimal.  Let's consider
    a list of objects to pack which contain alternatively big and small
    objects (which pretty matches reality when big blobs are interlaced
    with tree objects).  Currently, the code simply close the pack and opens
    a new one when the next object in line breaks the size limit.
    
    The current code may degenerate into:
    
      - small tree object => store into pack #1
      - big blob object busting the pack size limit => store into pack #2
      - small blob but pack #2 is over the limit already => pack #3
      - big blob busting the size limit => pack #4
      - small tree but pack #4 is over the limit => pack #5
      - big blob => pack #6
      - small tree => pack #7
      - ... and so on.
    
    The reality is that the content of packs 1, 3, 5 and 7 could well be
    stored more efficiently (and delta compressed) together in pack #1 if
    the big blobs were not forcing an immediate transition to a new pack.
    
    Incidentally this can be fixed pretty easily by simply skipping over
    those objects that are too big to fit in the current pack while trying
    the whole list of unwritten objects, and then that list considered from
    the beginning again when a new pack is opened.  This creates much fewer
    smallish pack files and help making more predictable test cases for the
    test suite.
    
    This change made one of the self sanity checks useless so it is removed
    as well. That check was rather redundant already anyway.
    
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @npitre @gitster

    fix multiple issues with t5300

    npitre authored gitster committed
    First of all, trying to run 'git verify-pack' on packs  produced by
    the tests using pack.packSizeLimit always failed.  After lots of digging
    and head scratching, it turns out that the preceeding test simulating
    a SHA1 collision did leave the repository quite confused, impacting
    subsequent tests.
    
    So let's move that destructive test last, and add tests to run
    verify-pack on the output from those packSizeLimit tests to catch such
    goofage.
    
    Finally, group those packSizeLimit tests together.
    
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @warthog9 @gitster

    gitweb: Simplify (and fix) chop_str

    warthog9 authored gitster committed
    The chop_str subroutine is meant to be used on strings (such as commit
    description / title) *before* HTML escaping, which means before
    applying esc_html or equivalent.
    
    Therefore get rid of the failed attempt to always remove full HTML
    entities (like e.g. &amp; or &nbsp;).  It is not necessary (HTML
    entities gets added later), and it can cause chop_str to chop a string
    incorrectly.
    
    Specifically:
    
         API & protocol: support option to force written data immediately to disk
    
    from http://git.kernel.org/?p=daemon/distsrv/chunkd.git;a=commit;h=3b02f749df2cb1288f345a689d85e7061f507e54
    
    The short version of the title gets chopped to
    
         API ...
    
    where it should be
    
         API & protocol: support option to force written data...
    
    Noticed-by: John 'Warthog9' Hawley <warthog9@kernel.org>
    Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 3, 2010
  1. @paulusmack

    gitk: Fix copyright symbol in About box message

    paulusmack authored
    Somehow it got corrupted in commit d93f171 ("gitk: Use themed tk
    widgets").
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  2. @gitster

    grep: simplify assignment of ->fixed

    René Scharfe authored gitster committed
    After 885d211, the value of the ->fixed pattern option only depends on
    the grep option of the same name.  Regex flags don't matter any more,
    because fixed mode and regex mode are strictly separated.  Thus we can
    simply copy the value from struct grep_opt to struct grep_pat, as we do
    already for ->word_regexp and ->ignore_case.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'ms/filter-branch-submodule'

    gitster authored
    * ms/filter-branch-submodule:
      filter-branch: Add tests for submodules in tree-filter
      filter-branch: Fix to allow replacing submodules with another content
  4. @gitster

    Merge branch 'jh/gitweb-caching' (early part)

    gitster authored
    * 'jh/gitweb-caching' (early part):
      gitweb: Add optional extra parameter to die_error, for extended explanation
      gitweb: add a "string" variant of print_sort_th
      gitweb: add a "string" variant of print_local_time
      gitweb: Check that $site_header etc. are defined before using them
      gitweb: Makefile improvements
      gitweb: Load checking
      gitweb: Make running t9501 test with '--debug' reliable and usable
  5. @gitster

    Merge branch 'bw/no-python-autoconf'

    gitster authored
    * bw/no-python-autoconf:
      configure: Allow --without-python
      configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM
  6. @gitster

    Merge branch 'sp/fast-import-large-blob'

    gitster authored
    * sp/fast-import-large-blob:
      fast-import: Stream very large blobs directly to pack
Commits on Feb 2, 2010
  1. @spearce @gitster

    Correct spelling of 'REUC' extension

    spearce authored gitster committed
    The new dircache extension CACHE_EXT_RESOLVE_UNDO, whose value is
    0x52455543, is actually the ASCII sequence 'REUC', not the ASCII
    sequence 'REUN'.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @spearce

    git-gui: update french translation

    Emmanuel Trillaud authored spearce committed
    Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. @spearce

    git-gui: update Japanese translation

    Nanako Shiraishi authored spearce committed
    Update ja.po to match 2010-01-26 version of pot file.
    
    Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  4. @gitster

    build: make code "-Wpointer-arith" clean

    gitster authored
    Recently introduced resolve_undo_read() expected arithmetic to (void *)
    to work on byte-addresses.  Correct this.
    
    Noticed by Brandon Casey.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 1, 2010
  1. @gitster

    configure: Allow --without-python

    Ben Walton authored gitster committed
    This patch allows someone to use configure to build git while at the
    same time disabling the python remote helper code.  It leverages the
    ability of GIT_ARG_SET_PATH to accept an optional second argument
    indicating that --without-$PROGRAM is acceptable.
    
    Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM

    Ben Walton authored gitster committed
    Add an optional second argument to both GIT_ARG_SET_PATH and
    GIT_CONF_APPEND_PATH such that any value of the second argument will
    enable configure to set NO_$PROGRAM in addition to an empty
    $PROGRAM_PATH.  This is initially useful for allowing configure to
    disable the use of python, as the remote helper code has nothing
    leveraging it yet.
    
    The Makefile already recognizes NO_PYTHON, but configure provided no
    way to set it appropriately.
    
    Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.