Permalink
Commits on Mar 31, 2010
  1. Git 1.7.0.4

    gitster committed Mar 31, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/maint-refs-dangling' into maint

    gitster committed Mar 31, 2010
    * jc/maint-refs-dangling:
      refs: ref entry with NULL sha1 is can be a dangling symref
  3. Documentation: show-ref <pattern>s are optional

    weiss authored and gitster committed Mar 29, 2010
    Specifying one or more <pattern> parameters is optional when calling
    show-ref, so mark them as such using brackets in the manual.
    
    Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Link against libiconv on IRIX

    weiss authored and gitster committed Mar 29, 2010
    On IRIX, "-liconv" must be added to the linker command line in order to
    get iconv(3) support; set the according Makefile variable appropriately.
    
    Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Don't redefine htonl and ntohl on big-endian

    weiss authored and gitster committed Mar 29, 2010
    Since commit 0fcabde, compat/bswap.h
    redefined htonl and ntohl to bswap32 not only if bswap32 has been
    defined earlier in compat/bswap.h (which is done only on selected
    platforms), but also if bswap32 has been defined anywhere else.  This
    broke Git at least for NetBSD systems running on big-endian machines
    (where ntohl and htonl should, of course, be NOOPs), since NetBSD
    defines a bswap32 macro in the system headers.
    
    So, we now undefine any previously defined bswap32 in compat/bswap.h
    before defining our own.
    
    Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. gitweb: git_get_project_config requires only $git_dir, not also $project

    jnareb authored and gitster committed Mar 27, 2010
    Fix overeager early return in git_get_project_config, introduced in 9be3614
    (gitweb: Fix project-specific feature override behavior, 2010-03-01).  When
    git_get_project_config is called from projects list page via
    git_get_project_owner($path) etc., it is called with $git_dir defined (in
    git_get_project_owner($path) etc.), but $project variable is not defined.
    git_get_project_config doesn't use $project variable anyway.
    
    Reported-by: Tobias Heinlein <keytoaster@gentoo.org>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Updated the usage string of git reset

    jstepien authored and gitster committed Mar 31, 2010
    Make git reset usage string reflect the command's behaviour and contents of
    the man page.
    
    Signed-off-by: Jan Stępień <jstepien@users.sourceforge.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 30, 2010
  1. Documentation: Clarify support for smart HTTP backend

    Greg Bacon authored and gitster committed Mar 30, 2010
    In the description of http.getanyfile, replace the vague "older Git
    clients" with the earliest release whose client is able to use the
    upload pack service.
    
    Signed-off-by: Greg Bacon <gbacon@dbresearch.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Windows: fix utime() for read-only files

    j6t authored and gitster committed Mar 30, 2010
    Starting with 5256b00 (Use git_mkstemp_mode instead of plain mkstemp to
    create object files, 2010-02-22) utime() is invoked on read-only files.
    This is not allowed on Windows and results in many warnings of the form
    
    failed utime() on .git/objects/23/tmp_obj_VlgHlc: Permission denied
    
    during a repack.  Fix it by making the file temporarily writable.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. diff: fix textconv error zombies

    j6t authored and gitster committed Mar 30, 2010
    To make the code simpler, run_textconv lumps all of its
    error checking into one conditional. However, the
    short-circuit means that an error in reading will prevent us
    from calling finish_command, leaving a zombie child.
    Clean up properly after errors.
    
    Based-on-work-by: Jeff King <peff@peff.net>
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. format-patch: Squelch 'fatal: Not a range." error

    kballard authored and gitster committed Mar 30, 2010
    Don't output an error on `git format-patch --ignore-if-in-upstream HEAD`.
    This matches the behavior of `git format-patch HEAD`.
    
    Signed-off-by: Kevin Ballard <kevin@sb.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 29, 2010
  1. Prepare for 1.7.0.4

    gitster committed Mar 29, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'cp/add-u-pathspec' into maint

    gitster committed Mar 29, 2010
    * cp/add-u-pathspec:
      test for add with non-existent pathspec
      git add -u: die on unmatched pathspec
  3. t9350: fix careless use of "cd"

    gitster committed Mar 29, 2010
    Upon failure of any of these tests (or when a test that is marked as
    expecting a failure is fixed), we will end up running later tests in
    random places.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 28, 2010
  1. difftool: Fix '--gui' when diff.guitool is unconfigured

    davvid authored and gitster committed Mar 27, 2010
    When diff.guitool is unconfigured and "--gui" is specified
    git-difftool dies with the following error message:
    
    	config diff.guitool: command returned error: 1
    
    Catch the error so that the "--gui" flag is a no-op when
    diff.guitool is unconfigured.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. fast-export: don't segfault when marks file cannot be opened

    SRabbelier authored and gitster committed Mar 28, 2010
    The error function only prints an error message, resulting in a
    segfault if we later on try to fprintf to a NULL handle.
    
    Fix this by using die_errno instead.
    
    Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 24, 2010
  1. Merge branch 'jc/color-attrs' into maint

    gitster committed Mar 24, 2010
    * jc/color-attrs:
      color: allow multiple attributes
  2. Merge branch 'jk/maint-add-ignored-dir' into maint

    gitster committed Mar 24, 2010
    * jk/maint-add-ignored-dir:
      tests for "git add ignored-dir/file" without -f
      dir: fix COLLECT_IGNORED on excluded prefixes
      t0050: mark non-working test as such
  3. Merge branch 'bg/apply-fix-blank-at-eof' into maint

    gitster committed Mar 24, 2010
    * bg/apply-fix-blank-at-eof:
      t3417: Add test cases for "rebase --whitespace=fix"
      t4124: Add additional tests of --whitespace=fix
      apply: Allow blank context lines to match beyond EOF
      apply: Remove the quick rejection test
      apply: Don't unnecessarily update line lengths in the preimage
  4. Documentation: explain the meaning of "-g" in git-describe output

    marcows authored and gitster committed Mar 22, 2010
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 22, 2010
  1. Git 1.7.0.3

    gitster committed Mar 22, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.6.6' into maint

    gitster committed Mar 22, 2010
    * maint-1.6.6:
      Documentation/git-clone: Transform description list into item list
      Documentation/urls: Remove spurious example markers
      Documentation/gitdiffcore: Remove misleading date in heading
      Documentation/git-reflog: Fix formatting of command lists
Commits on Mar 21, 2010
  1. .mailmap: Map the the first submissions of MJG by e-mail

    mjg authored and gitster committed Mar 21, 2010
    so that git shortlog with '-e' coalesces all my commits.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Documentation/git-clone: Transform description list into item list

    mjg authored and gitster committed Mar 21, 2010
    so that the list of examples is formatted in the same way as for
    git-fetch, and, more importantly, the different identation for the
    code blocks in the examples (compared to the immediately preceding code
    blocks from url.txt) doesn't look like misformatted, but is clarified by
    the items' bullets.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Documentation/urls: Remove spurious example markers

    mjg authored and gitster committed Mar 21, 2010
    In urls.txt (which is included from git-{clone,fetch,push}.txt)
    several item lists are surrounded by example block markers. This is
    problematic for two reasons:
    
    - None of these lists are example lists, so they should not be marked as
      such semantically.
    - The html output looks weird (bulleted list with left sidebar).
    
    Therefore, remove the example block markers. Output by the man backend
    is unaffected.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Documentation/gitdiffcore: Remove misleading date in heading

    mjg authored and gitster committed Mar 21, 2010
    Ever since the automatic conversion into man form, the heading
    contained a misidentified subheading reading "June 2005".
    Remove this since the documentation is more recent, and the correct
    date is in the footer.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Documentation/git-reflog: Fix formatting of command lists

    mjg authored and gitster committed Mar 21, 2010
    A misplaced list continuation mark appears literally in the
    rendered doc. Fix this by removing it.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 20, 2010
  1. Update draft release notes to 1.7.0.3

    gitster committed Mar 20, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. fetch: Fix minor memory leak

    Andreas Gruenbacher authored and gitster committed Mar 15, 2010
    A temporary struct ref is allocated in store_updated_refs() but not
    freed.
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. fetch: Future-proof initialization of a refspec on stack

    Andreas Gruenbacher authored and gitster committed Mar 12, 2010
    The open-coded version to initialize each and every member will break
    when a new member is added to the structure.
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. fetch: Check for a "^{}" suffix with suffixcmp()

    Andreas Gruenbacher authored and gitster committed Mar 13, 2010
    Otherwise, we will check random bytes for ref names < 3 characters.
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. daemon: parse_host_and_port SIGSEGV if port is specified

    ideak authored and gitster committed Mar 20, 2010
    This typo will lead to git-daemon dying any time the connect
    string includes a port after the host= attribute. This can lead
    for example to one of the following error messages on the client
    side when someone tries git clone git://...:<port>.
    
    When the daemon is running on localhost:
      fatal: The remote end hung up unexpectedly
    
    or when the daemon is connected through an ssh tunnel:
      fatal: protocol error: bad line length character: erro
    
    In the latter case 'erro' comes from the daemon's reply:
      error: git-daemon died of signal 11
    
    Signed-off-by: Imre Deak <imre.deak@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Makefile: Fix CDPATH problem

    jrn authored and gitster committed Mar 20, 2010
    If CDPATH is set, "cd" prints its destination to stdout, causing
    the common (cd a && tar cf - .) | (cd b && tar xf -) idiom to fail.
    For example:
    
     make -C templates DESTDIR='' install
     make[1]: Entering directory `/users/e477610/exptool/src/git-1.7.0.2/templates'
     install -d -m 755 '/home/e477610/exptool/share/git-core/templates'
     (cd blt && gtar cf - .) | \
    	(cd '/home/e477610/exptool/share/git-core/templates' && umask 022 && gtar xof -)
     gtar: This does not look like a tar archive
    
    Most git scripts already protect against use of CDPATH through
    git-sh-setup, but the Makefile doesn’t.
    
    Reported-by: Michael Cox <mhcox@bluezoosoftware.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. pull: replace unnecessary sed invocation

    bebarino authored and gitster committed Mar 18, 2010
    Getting the shortened branch name is as easy as using the shell's
    parameter expansion.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 17, 2010
  1. Documentation: receive.denyCurrentBranch defaults to 'refuse'

    trast authored and gitster committed Mar 17, 2010
    acd2a45 (Refuse updating the current branch in a non-bare repository
    via push, 2009-02-11) changed the default to refuse such a push, but
    it forgot to update the docs.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>