Permalink
Commits on Apr 11, 2010
  1. Git 1.7.0.5

    gitster committed Apr 11, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint

    gitster committed Apr 11, 2010
    * rc/maint-reflog-msg-for-forced-branch:
      branch: say "Reset to" in reflog entries for 'git branch -f' operations
  3. blame documentation: -M/-C notice copied lines as well as moved ones

    gitster committed Apr 11, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 10, 2010
  1. Let check_preimage() use memset() to initialize "struct checkout"

    jlehmann committed with gitster Apr 9, 2010
    Every code site except check_preimage() uses either memset() or declares
    a static instance of "struct checkout" to achieve proper initialization.
    Lets use memset() instead of explicit initialization of all members here
    too to be on the safe side in case this structure is expanded someday.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'ef/maint-empty-commit-log' into maint

    gitster committed Apr 10, 2010
    * ef/maint-empty-commit-log:
      rev-list: fix --pretty=oneline with empty message
  3. Merge branch 'jc/conflict-marker-size' into maint

    gitster committed Apr 10, 2010
    * jc/conflict-marker-size:
      diff --check: honor conflict-marker-size attribute
  4. Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' int…

    gitster committed Apr 10, 2010
    …o maint
    
    * sp/maint-http-backend-die-triggers-die-recursively:
      http-backend: Don't infinite loop during die()
  5. Merge branch 'mg/maint-send-email-lazy-editor' into maint

    gitster committed Apr 10, 2010
    * mg/maint-send-email-lazy-editor:
      send-email: lazily assign editor variable
  6. Merge branch 'rr/imap-send-unconfuse-from-line' into maint

    gitster committed Apr 10, 2010
    * rr/imap-send-unconfuse-from-line:
      imap-send: Remove limitation on message body
  7. Merge branch 'rb/maint-python-path' into maint

    gitster committed Apr 10, 2010
    * rb/maint-python-path:
      Correct references to /usr/bin/python which does not exist on FreeBSD
  8. Merge branch 'gh/maint-stash-show-error-message' into maint

    gitster committed Apr 10, 2010
    * gh/maint-stash-show-error-message:
      Improve error messages from 'git stash show'
  9. Merge branch 'mg/mailmap-update' into maint

    gitster committed Apr 10, 2010
    * mg/mailmap-update:
      .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
  10. Merge branch 'bc/maint-daemon-sans-ss-family' into maint

    gitster committed Apr 10, 2010
    * bc/maint-daemon-sans-ss-family:
      daemon.c: avoid accessing ss_family member of struct sockaddr_storage
  11. fetch/push: fix usage strings

    rctay committed with gitster Apr 10, 2010
     - use "<options>" instead of just "options".
     - use "[<repository> [<refspec>...]]" to indicate that <repository> and
       <refspec> are optional, and that <refspec> cannot be specified
       without specifying <repository>.
    
    Note that when called without specifying <repository> (eg. "git fetch
    -f"), it is accurate to say that the "git fetch [<options>]
    [<repository> ...]" case takes precedence over "git fetch [<options>]
    <group>".
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. branch: say "Reset to" in reflog entries for 'git branch -f' operations

    rctay committed with gitster Apr 9, 2010
    In 5f856dd (fix reflog entries for "git-branch"), it is mentioned that
    'git branch -f' is intended to be equivalent to 'git reset'. Since we
    usually say "reset to <commit>" in the git-reset Documentation and
    elsewhere, it would make sense to say "Reset to" here as well, instead
    of "Reset from" previously.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 8, 2010
  1. docs: clarify "branch -l"

    peff committed with gitster Apr 8, 2010
    This option is mostly useless these days because we turn on
    reflogs by default in non-bare repos.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 4, 2010
  1. pack-protocol.txt: fix pkt-line lengths

    rctay committed with gitster Apr 4, 2010
    Previously, the lengths were 4-bytes short. Fix it such that the lengths
    reflect the total length of the pkt-line, as per spec.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. pack-protocol.txt: fix spelling

    rctay committed with gitster Apr 4, 2010
    s/paramater/parameter/.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 25, 2010
  1. send-email: lazily assign editor variable

    mjg committed with gitster Mar 22, 2010
    b4479f0 (add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR",
    2009-10-30) introduced the use of "git var GIT_EDITOR" to obtain the
    preferred editor program, instead of reading environment variables
    themselves.
    
    However, "git var GIT_EDITOR" run without a tty (think "cron job") would
    give a fatal error "Terminal is dumb, but EDITOR unset".  This is not a
    problem for add-i, svn, p4 and callers of git_editor() defined in
    git-sh-setup, as all of these call it just before launching the editor.
    At that point, we know the caller wants to edit.
    
    But send-email ran this near the beginning of the program, even if it is
    not going to use any editor (e.g. run without --compose).  Fix this by
    calling the command only when we edit a file.
    
    Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>