Permalink
Commits on Jan 12, 2008
  1. GIT 1.5.4-rc3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 12, 2008
  2. RPM spec: include gitk message files.

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 12, 2008
  3. git-relink.txt: describe more clearly how hard linking occurs

    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Jan 11, 2008
  4. Document some default values in config.txt

    This documents the default values of gc.auto, gc.autopacklimit
    fetch.unpacklimit, receive.unpacklimit and transfer.unpacklimit.
    
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chunga committed with gitster Jan 11, 2008
Commits on Jan 11, 2008
  1. Merge ../gitk

    * ../gitk:
      gitk: Update German translation.
      gitk: Fix typo in user message.
      gitk: Fix the Makefile to cope with systems lacking msgfmt
    gitster committed Jan 11, 2008
  2. gitk: Update German translation.

    Now 100% complete (163 strings).
    
    Signed-off-by: Christian Stimming <stimming@tuhh.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    cstim committed with gitster Jan 9, 2008
  3. gitk: Fix typo in user message.

    Signed-off-by: Christian Stimming <stimming@tuhh.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    cstim committed with gitster Jan 9, 2008
  4. gitk: Fix the Makefile to cope with systems lacking msgfmt

    The po2msg.sh script and the .gitignore in the po directory have been
    shamelessly copied from the current git-gui.  This enables the top
    level "make NO_MSGFMT" to work consistently for git across the git-gui
    and gitk sub-projects.
    
    This is the same effective patch that has previously been posted as a
    git.git patch which more succinctly described the copying of
    po/.gitignore and po/po2msg.sh from git-gui.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    hashpling committed with gitster Jan 9, 2008
  5. pack-objects: remove redundant and wrong call to deflateEnd()

    We somehow called deflateEnd() on a stream that we have called
    deflateEnd() on already.
    
    In fact, the second deflateEnd() has always been returning
    Z_STREAM_ERROR.  We just never checked the error return from
    that particular deflateEnd().
    
    The first one returns 0 for success.  We might want to tighten
    the check even more to check that.
    
    Noticed by Marco.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 11, 2008
Commits on Jan 10, 2008
  1. bundle, fast-import: detect write failure

    I noticed some unchecked writes.  This fixes them.
    
    * bundle.c (create_bundle): Die upon write failure.
    * fast-import.c (keep_pack): Die upon write or close failure.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Jan 10, 2008
Commits on Jan 9, 2008
  1. Trim leading / off of paths in git-svn prop_walk

    prop_walk adds a leading / to all subdirectory paths. Unfortunately
    this causes a problem when the remote repo lives in a subdirectory itself,
    as the leading / causes subsequent PROPFIND calls to be executed on
    the wrong path. Trimming the / before calling the PROPFIND fixes this problem.
    
    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 Jan 9, 2008
  2. shortlog: mention the "-e" option in the usage

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Jan 9, 2008
  3. Change git-gc documentation to reflect gc.packrefs implementation.

    5675239 (Make "git gc" pack all
    refs by default) changed the default of gc.packrefs to true, to
    pack all refs by default in any repository.  IOW, the users need
    to disable it explicitly if they want to by setting the config
    variable, since 1.5.3.
    
    However, we forgot to update the documentation.  This fixes it.
    
    Signed-off-by: Florian La Roche <laroche@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Florian La Roche committed with gitster Jan 9, 2008
  4. recv_sideband: Do not use ANSI escape sequence on dumb terminals.

    The "clear to end of line" sequence is used to nicely output the progress
    indicator without leaving garbage on the terminal. However, this works
    only on ANSI capable terminals. We use the same check as in color.c to
    find out whether the terminal supports this feature and use a workaround
    (a few spaces in a row) if it does not.
    
    [jc: as an old fashoned git myself, and given the fact that the
    possible prefix and suffix are small number of short constant strings,
    I actually prefer a simpler-and-more-stupid approach.  This is with
    Nico's clean-up.]
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Johannes Sixt committed with gitster Jan 8, 2008
  5. Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

    * 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
      [PATCH] gitk: use user-configured background in view definition dialog
      [PATCH] gitk: Update German translation
      [PATCH] gitk: Update and fix Makefile
      gitk: Restore some widget options whose defaults changed in Tk 8.5
      gitk: Recode de.po to UTF-8
      [PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
      [PATCH] gitk i18n: More markup -- various options menus
      [PATCH] gitk i18n: Initial German translation
      [PATCH] gitk i18n: Markup several strings for translation
      [PATCH] gitk i18n: Import msgcat for message string translation; load translation catalogs
      [PATCH] gitk i18n: Add Makefile with rules for po file creation and installation
    gitster committed Jan 9, 2008
  6. [PATCH] gitk: use user-configured background in view definition dialog

    Have the text fields in the view definition dialog (View->New view...)
    use the background color as configured through the preferences, instead
    of hard-coded 'white'.
    
    This was suggested by Paul Wise through http://bugs.debian.org/457124
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Gerrit Pape committed with paulusmack Jan 9, 2008
  7. [PATCH] gitk: Update German translation

    Signed-off-by: Christian Stimming <stimming@tuhh.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    cstim committed with paulusmack Jan 9, 2008
  8. [PATCH] gitk: Update and fix Makefile

    This Makefile uses the template provided at git.git/gitk-git/Makefile
    by Junio and adds the rules for the i18n files.
    
    Signed-off-by: Christian Stimming <stimming@tuhh.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    cstim committed with paulusmack Jan 9, 2008
  9. git.el: Make status refresh faster.

    Don't set the needs-refresh flag when inserting a new file info, since
    ewoc refreshes it upon insert already; this makes a full refresh twice
    as fast.
    
    Also make git-fileinfo-prettyprint a little faster by not retrieving
    permission values twice.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    julliard committed with gitster Jan 8, 2008
  10. git.el: Refresh files from their real state upon commit.

    Instead of just setting the state to up-to-date, retrieve the full
    state again, so that the file type can be displayed properly.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    julliard committed with gitster Jan 8, 2008
  11. git.el: Make sure we never insert the same file twice.

    Skip non-zero stage files during git-ls-files -c, they are handled
    later. Also fix git-insert-info-list to merge duplicate file names.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    julliard committed with gitster Jan 8, 2008
  12. "git-apply --check" should not report "fixed"

    When running "git apply --check" while --whitespace=fix is
    enabled (either from the command line or via the configuration),
    we reported that "N line(s) applied after _fixing_", but --check
    by itself does not apply and this message was alarming.
    
    We could even reword the message to say "N line(s) would have
    been applied after fixing...", but this patch does not go that
    far.  Instead, we just make it use the "N lines add whitespace
    errors" warning, which happens to be a good diagnostic message a
    user would expect from the --check option.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 8, 2008
Commits on Jan 8, 2008
  1. Merge in GIT 1.5.3.8

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 8, 2008
  2. GIT 1.5.3.8

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 8, 2008
  3. Documentation: config: add 'help.*' and 'instaweb.*' variables.

    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chriscool committed with gitster Jan 8, 2008
  4. Allow git-mergetool to handle paths with a leading space

    Signed-off-by: Rogan Dawes <rogan@dawes.za.net>
    RoganDawes committed with gitster Jan 7, 2008
  5. git-svn: clarify the "Ignoring error from SVN" piece

    I've heard of several users puzzled by this, and it sometimes it
    appears as if git-svn is doing nothing on slower connections and
    larger repositories.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Wong committed with gitster Jan 7, 2008
Commits on Jan 7, 2008
  1. git-svn: support for funky branch and project names over HTTP(S)

    SVN requires that paths be URI-escaped for HTTP(S) repositories.
    file:// and svn:// repositories do not need these rules.
    
    Additionally, accessing individual paths inside repositories
    (check_path() and get_log() do NOT require escapes to function
    and in fact it breaks things).
    
    Noticed-by: Michael J. Cohen <mjc@cruiseplanners.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Wong committed with gitster Nov 12, 2007
  2. slightly better auto gc message

    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nicolas Pitre committed with gitster Jan 7, 2008
  3. Documentation: typofix

    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ralf Wildenhues committed with gitster Jan 7, 2008
  4. Update draft release notes for 1.5.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 7, 2008
  5. diff: do not chomp hunk-header in the middle of a character

    We truncate hunk-header line at 80 bytes, but that 80th byte
    could be in the middle of a character, which is bad.  This uses
    pick_one_utf8_char() function to make sure we do not cut a character
    in the middle.
    
    This assumes that the internal representation of the text is
    UTF-8.  This needs to be extended in the future but the optimal
    direction has not been decided yet.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Junio C Hamano committed with gitster Jan 2, 2008
  6. utf8_width(): allow non NUL-terminated input

    The original interface assumed that the input string is
    always terminated with a NUL, but that wasn't too useful.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 2, 2008
  7. utf8: pick_one_utf8_char()

    utf8_width() function was doing two different things.  To pick a
    valid character from UTF-8 stream, and compute the display width of
    that character.  This splits the former to a separate function
    pick_one_utf8_char().
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 7, 2008
  8. git.el: Display file types and type changes.

    Handle the T status from git-diff-index to display type changes
    between file/symlink/subproject. Also always show the file type for
    symlink and subprojects to indicate that they are not normal files.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    julliard committed with gitster Jan 6, 2008