Skip to content
Commits on May 2, 2009
  1. @gitster

    GIT 1.6.3-rc4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 1, 2009
  2. @gitster

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

    * git://repo.or.cz/git-gui:
      git-gui: Fixes for Mac OS X TkAqua
      git-gui: Update Russian translation
      git-gui: run post-checkout hook after clone
      git-gui: Ensure consistent usage of mergetool.keepBackup
      git-gui: fix use of undeclared variable diff_empty_count
      git-gui (Win): make starting via "Git GUI Here" on .git/ possible
      git-gui (Win): make "Explore Working Copy" more robust
      git-gui: run post-checkout hook on checkout
      git-gui: When calling post-commit hook wrong variable was cleared.
      git-gui: use `git --html-path` to get the location of installed HTML docs
      git-gui: fix deleting from the context menu with empty selection
      git-gui: minor spelling fix and string factorisation.
      git-gui: various French translation fixes
      git-gui: Fix merge conflict display error when filename contains spaces
      git-gui: don't hide the Browse button when resizing the repo chooser
      Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
      git-gui: Support more git version notations.
      git-gui: Avoid an infinite rescan loop in handle_empty_diff.
      git-gui: Fix post-commit status with subject in non-locale encoding
    gitster committed May 1, 2009
Commits on May 1, 2009
  1. @gitster

    ctype.c: fix typo in comment

    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster May 1, 2009
  2. @felipec @gitster

    Fix a bunch of pointer declarations (codestyle)

    Essentially; s/type* /type */ as per the coding guidelines.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    felipec committed with gitster May 1, 2009
  3. @das @spearce

    git-gui: Fixes for Mac OS X TkAqua

    - detect more Tk.framework variants
    - fix apple menu setup, use native preferences menu item
    - don't set menu font
    
    Signed-off-by: Daniel A. Steffen <das@users.sourceforge.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    das committed with spearce Aug 16, 2008
  4. @gitster

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

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Add Russian translation
      gitk: Fix compare-commits function when we have local changes
      gitk: Avoid crash if closed while reading references
      gitk: Handle external diff tool with spaces in the path
      gitk: Remember and restore the window state with the geometry
      gitk: Map KP_Divide to focus the search box
      gitk: Mark some more strings for translation
      gitk: Mark forgotten string for translation
      gitk: Make .gitk a hidden file under windows
      gitk: Add a command to compare two strings of commits
      gitk: Add a way to mark a commit, plus a "find descendant" command
      gitk: Fixes for Mac OS X TkAqua
      gitk: Provide a 32x32 window icon based on the git logo
      gitk: Provide a window icon if possible
      gitk: Handle blobs containing a DOS end-of-file marker
    gitster committed Apr 30, 2009
Commits on Apr 30, 2009
  1. @raalkml @paulusmack

    gitk: Add Russian translation

    Thanks go to Dmitry Potapov for proofreading and suggested translation
    of the word 'merge'.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    raalkml committed with paulusmack Apr 27, 2009
  2. @raalkml @gitster

    improve error message in config.c

    Show errno if opening a lockfile fails.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    raalkml committed with gitster Apr 29, 2009
Commits on Apr 29, 2009
  1. @gitster

    Merge branch 'maint'

    * maint:
      diff -c -p: do not die on submodules
    
    Conflicts:
    	combine-diff.c
    gitster committed Apr 29, 2009
  2. @d0k @gitster

    daemon.c: fix segfault on OS X

    On OS X (and maybe other unices), getaddrinfo(3) returns NULL
    in the ai_canonname field if it's called with an IP address for
    the hostname. We'll now use the IP address for the hostname if
    ai_canonname was NULL, this also matches the behaviour on Linux.
    
    steps to reproduce:
    $ git daemon --export-all
    $ git clone git://127.0.0.1/frotz
    => git daemon's fork (silently) segfaults.
    
    Remove the pointless loop while at it. There is only one iteration
    because of the break; on the last line and there are no continues.
    
    Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    d0k committed with gitster Apr 27, 2009
  3. @gitster

    merge-recursive: do not die on a conflicting submodule

    We cannot represent the 3-way conflicted state in the work tree
    for these entries, but it is normal not to have commit objects
    for them in our repository.  Just update the index and the life
    will be good.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 29, 2009
  4. @felipec @gitster

    git config: error when editing a repo config and not being in one

    Let's throw an error on this specific case. If the user specifies the
    config file, he must know what he is doing.
    
    Teemu Likonen pointed this out.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    felipec committed with gitster Apr 30, 2009
  5. @gitster

    parseopt: fix documentation for --keep-dashdash

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Uwe Kleine-König committed with gitster Apr 28, 2009
  6. @dscho @gitster

    Rename core.unreliableHardlinks to core.createObject

    "Unreliable hardlinks" is a misleading description for what is happening.
    So rename it to something less misleading.
    
    Suggested by Linus Torvalds.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Apr 28, 2009
  7. @gitster

    Merge branch 'maint-1.6.1' into maint

    * maint-1.6.1:
      diff -c -p: do not die on submodules
    gitster committed Apr 29, 2009
  8. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      diff -c -p: do not die on submodules
    gitster committed Apr 29, 2009
  9. @gitster

    diff -c -p: do not die on submodules

    The combine diff logic knew only about blobs (and their checked-out form
    in the work tree, either regular files or symlinks), and barfed when fed
    submodules.  This "externalizes" gitlinks in the same way as the normal
    patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the
    issue.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 29, 2009
  10. @raalkml @spearce

    git-gui: Update Russian translation

    Also, the previous translations of the words 'tag' and 'merge' were
    changed. Added translation of the 'Tool' submenu.
    
    Thanks go to Alexander Gavrilov and Dmitry Potapov for proofreading
    and suggestions.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    raalkml committed with spearce Apr 29, 2009
Commits on Apr 28, 2009
  1. @gitster

    doc: consistently use ASCIIDOC_EXTRA

    For all uses of $(ASCIIDOC) in Documentation/Makefile, supply the same
    options via $(ASCIIDOC_EXTRA).
    
    Signed-off-by: Eric Blake <ebb9@byu.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Blake committed with gitster Apr 28, 2009
  2. @gitster

    Makefile: installing git in cygwin 1.7.0

    On platforms with $X, make removes any leftover scripts 'a' from
    earlier builds if a new binary 'a.exe' is now built.  However, on
    cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file.
    Test for file equality before attempting a remove, in order to avoid
    nuking just-built binaries.
    
    This repeats commit 0d768f7 for the installation destdir.
    
    Signed-off-by: Eric Blake <ebb9@byu.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Blake committed with gitster Apr 28, 2009
  3. @gitster

    Merge branch 'maint'

    * maint:
      grep: fix segfault when "git grep '('" is given
      Documentation: fix a grammatical error in api-builtin.txt
      builtin-merge: fix a typo in an error message
    gitster committed Apr 28, 2009
  4. @gitster

    Merge branch 'maint-1.6.1' into maint

    * maint-1.6.1:
      grep: fix segfault when "git grep '('" is given
      Documentation: fix a grammatical error in api-builtin.txt
      builtin-merge: fix a typo in an error message
    gitster committed Apr 28, 2009
  5. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      grep: fix segfault when "git grep '('" is given
      Documentation: fix a grammatical error in api-builtin.txt
      builtin-merge: fix a typo in an error message
    gitster committed Apr 28, 2009
  6. @samv @gitster

    SubmittingPatches: itemize and reflect upon well written changes

    The SubmittingPatches file was trimmed down from a somewhat
    overwhelming set of requirements from the Linux Kernel equivalent;
    however perhaps a little of it can be returned without making the
    text too long.
    
    Signed-off-by: Sam Vilain <sam@vilain.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    samv committed with gitster Apr 28, 2009
  7. @peff @gitster

    Makefile: fix NO_PERL bug with gitweb

    When the user has defined NO_PERL, we want to skip building
    gitweb entirely.  However, the conditional to add
    gitweb/gitweb.cgi to OTHER_PROGRAMS was evaluated before we
    actually parsed the user's config.mak. This meant that "make
    NO_PERL=NoThanks" worked fine, but putting "NO_PERL=NoThanks"
    into your config.mak broke the build (it wanted gitweb.cgi
    to satisfy "all", but the rule to build it was conditionally
    ignored, so it complained).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Apr 27, 2009
  8. @torvalds @gitster

    grep: fix segfault when "git grep '('" is given

    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    torvalds committed with gitster Apr 27, 2009
Commits on Apr 27, 2009
  1. @dscho @gitster

    t5701: do not get stuck in empty-push/

    A test might happen to be the last one in the script, but other people
    later may want to add more tests after your test is done.
    
    Do not surprise them by going in a subdirectory to run a part of your test
    and never coming out of it.  This fixes a162e78 in that respect.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Apr 28, 2009
  2. @prlw1 @gitster

    NetBSD compilation fix

    Similar to other BSD variants, it needs USE_ST_TIMESPEC.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    prlw1 committed with gitster Apr 26, 2009
  3. @allancaffee @gitster

    Documentation: fix a grammatical error in api-builtin.txt

    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    allancaffee committed with gitster Apr 13, 2009
  4. @allancaffee @gitster

    builtin-merge: fix a typo in an error message

    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Acked-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    allancaffee committed with gitster Apr 13, 2009
  5. @markdrago @gitster

    Add semicolon to curly brace group in main Makefile

    This semicolon is technically required by POSIX shell and indeed causes a
    syntax error with e.g. bash-2.04.0.  Cf.
    
      http://www.opengroup.org/onlinepubs/000095399/utilities/xcu_chap02.html#tag_02_09_04_01
    
    Signed-off-by: Mark Drago <markdrago@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    markdrago committed with gitster Apr 26, 2009
  6. @j6t @gitster

    prune-packed: advanced progress even for non-existing fan-out directo…

    …ries
    
    A progress indicator is used to count through the 256 object fan-out
    directories while unused object files are removed. (However, it becomes
    visible only if this process takes long enough.)
    
    Previously, display_progress() was only called if object files were
    actually removed. But if directories towards the end (fd/, fe/, ff/) did
    not exist, this could leave a strange line
    
       Removing duplicate objects:  99% (255/256), done.
    
    in the terminal instead of the expected "100% (256/256)".
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Apr 27, 2009
Commits on Apr 26, 2009
  1. @torvalds @gitster

    t4202: fix typo

    While I did a
    
    	make -j64 test > ~/t.out
    
    to check my previous patch (in case some test actually tested 'trustctime'
    or something), I noticed this one. Somebody has speeling trouble:
    
    	t4202-log.sh: line 345: test_expect_sucess: command not found
    
    Fixed thus.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    torvalds committed with gitster Apr 26, 2009
Commits on Apr 25, 2009
  1. @dscho @gitster

    Add an option not to use link(src, dest) && unlink(src) when that is …

    …unreliable
    
    It seems that accessing NTFS partitions with ufsd (at least on my EeePC)
    has an unnerving bug: if you link() a file and unlink() it right away,
    the target of the link() will have the correct size, but consist of NULs.
    
    It seems as if the calls are simply not serialized correctly, as single-stepping
    through the function move_temp_to_file() works flawlessly.
    
    As ufsd is "Commertial software" (sic!), I cannot fix it, and have to work
    around it in Git.
    
    At the same time, it seems that this fixes msysGit issues 222 and 229 to
    assume that Windows cannot handle link() && unlink().
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Apr 25, 2009
  2. @d0k @gitster

    connect: replace inet_ntop with getnameinfo

    inet_ntop is not protocol independent.
    getnameinfo(3) is part of POSIX and is available when getaddrinfo(3) is.
    This code is only compiled when NO_IPV6 isn't defined.
    
    The old method was buggy anyway, not every ipv6 address was converted
    properly because the buffer (addr) was too small.
    
    Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    d0k committed with gitster Apr 24, 2009
Something went wrong with that request. Please try again.