Skip to content
Commits on May 26, 2011
  1. @gitster

    Git 1.7.5.3

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

    Merge branch 'maint-1.7.4' into maint

    * maint-1.7.4:
    gitster committed May 26, 2011
  3. @gitster

    Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4

    * jk/git-connection-deadlock-fix:
      test core.gitproxy configuration
      send-pack: avoid deadlock on git:// push with failed pack-objects
      connect: let callers know if connection is a socket
      connect: treat generic proxy processes like ssh processes
    
    Conflicts:
    	connect.c
    gitster committed May 26, 2011
  4. @gitster

    Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into mai…

    …nt-1.7.4
    
    * js/maint-send-pack-stateless-rpc-deadlock-fix:
      sideband_demux(): fix decl-after-stmt
      send-pack: unbreak push over stateless rpc
      send-pack: avoid deadlock when pack-object dies early
    gitster committed May 26, 2011
  5. @gitster

    Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4

    * jk/maint-upload-pack-shallow:
      upload-pack: start pack-objects before async rev-list
    gitster committed May 26, 2011
  6. @gitster

    Merge branch 'jm/maint-diff-words-with-sbe' into maint

    * jm/maint-diff-words-with-sbe:
      do not read beyond end of malloc'd buffer
    gitster committed May 26, 2011
  7. @gitster

    Merge branch 'kk/maint-prefix-in-config-mak' into maint

    * kk/maint-prefix-in-config-mak:
      Honor $(prefix) set in config.mak* when defining ETC_GIT*
      Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
      Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
    gitster committed May 26, 2011
  8. @gitster

    Merge branch 'mg/diff-uiconfig-doc' into maint

    * mg/diff-uiconfig-doc:
      config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
    gitster committed May 26, 2011
  9. @gitster

    Merge branch 'ft/gitweb-tar-with-gzip-n' into maint

    * ft/gitweb-tar-with-gzip-n:
      gitweb: supply '-n' to gzip for identical output
    gitster committed May 26, 2011
  10. @gitster

    Merge branch 'ss/doc-svn' into maint

    * ss/doc-svn:
      remove noise and inaccuracies from git-svn docs
    gitster committed May 26, 2011
  11. @gitster

    Merge branch 'jn/format-patch-doc' into maint

    * jn/format-patch-doc:
      Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
      Documentation: publicize hints for sending patches with GMail
      Documentation: publicize KMail hints for sending patches inline
      Documentation: hints for sending patches inline with Thunderbird
      Documentation: explain how to check for patch corruption
    gitster committed May 26, 2011
  12. @gitster

    Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maint

    * jc/maint-pathspec-stdin-and-cmdline:
      setup_revisions(): take pathspec from command line and --stdin correctly
    gitster committed May 26, 2011
  13. @gitster

    Merge branch 'jk/cherry-pick-root-with-resolve' into maint

    * jk/cherry-pick-root-with-resolve:
      t3503: test cherry picking and reverting root commits
      revert: allow reverting a root commit
      cherry-pick: handle root commits with external strategies
    gitster committed May 26, 2011
  14. @gitster

    Merge branch 'rg/copy-gecos-username' into maint

    * rg/copy-gecos-username:
      copy_gecos: fix not adding nlen to len when processing "&"
    gitster committed May 26, 2011
  15. @gitster

    Merge branch 'fc/completion-zsh' into maint

    * fc/completion-zsh:
      git-completion: fix regression in zsh support
    gitster committed May 26, 2011
  16. @gitster

    Merge branch 'jk/git-connection-deadlock-fix' into maint

    * jk/git-connection-deadlock-fix:
      test core.gitproxy configuration
      send-pack: avoid deadlock on git:// push with failed pack-objects
      connect: let callers know if connection is a socket
      connect: treat generic proxy processes like ssh processes
    
    Conflicts:
    	connect.c
    gitster committed May 26, 2011
  17. @gitster

    Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint

    * js/maint-send-pack-stateless-rpc-deadlock-fix:
      sideband_demux(): fix decl-after-stmt
      send-pack: unbreak push over stateless rpc
      send-pack: avoid deadlock when pack-object dies early
    gitster committed May 26, 2011
  18. @gitster

    Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maint

    * 'svn-fe-maint' of git://repo.or.cz/git/jrn:
      Revert "t0081 (line-buffer): add buffering tests"
    gitster committed May 26, 2011
Commits on May 25, 2011
  1. @pclouds @gitster

    init/clone: remove short option -L and document --separate-git-dir

    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds committed with gitster May 24, 2011
Commits on May 20, 2011
  1. @meyering @gitster

    do not read beyond end of malloc'd buffer

    With diff.suppress-blank-empty=true, "git diff --word-diff" would
    output data that had been read from uninitialized heap memory.
    The problem was that fn_out_consume did not account for the
    possibility of a line with length 1, i.e., the empty context line
    that diff.suppress-blank-empty=true converts from " \n" to "\n".
    Since it assumed there would always be a prefix character (the space),
    it decremented "len" unconditionally, thus passing len=0 to emit_line,
    which would then blindly call emit_line_0 with len=-1 which would
    pass that value on to fwrite as SIZE_MAX.  Boom.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster May 20, 2011
  2. @mjg @gitster

    git-svn: Fix git svn log --show-commit

    git svn log --show-commit had no tests and, consequently, no attention
    by the author of
    
    b1b4755 (git-log: put space after commit mark, 2011-03-10)
    
    who kept git svn log working only without --show-commit.
    
    Introduce a test and fix it.
    
    Reported-by: Bernt Hansen <bernt@norang.ca>
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster May 20, 2011
  3. @gitster

    Git 1.7.5.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 19, 2011
  4. @jrn @gitster

    provide a copy of the LGPLv2.1

    The LGPL seems to require providing a copy of the license when
    distributing xdiff, compat/fnmatch, and so on, or altering the license
    notices to refer to the GPL intead.  Since we don't want to do the
    latter, let's do the former.  It's nice to let people know their
    rights anyway.
    
    Inspired-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster May 19, 2011
Commits on May 18, 2011
  1. @peff @gitster

    test core.gitproxy configuration

    This is just a basic sanity test to see whether
    core.gitproxy works at all. Until now, we were not testing
    anywhere.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster May 18, 2011
  2. @rgieschke @gitster

    copy_gecos: fix not adding nlen to len when processing "&"

    nlen has to be added to len when inserting (capitalized) pw_name as
    substitution for "&" in pw_gecos. Otherwise, pw_gecos will be truncated
    and data might be written beyond name+sz.
    
    Signed-off-by: Rafael Gieschke <rafael@gieschke.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    rgieschke committed with gitster May 16, 2011
Commits on May 17, 2011
  1. @gitster

    Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' in…

    …to js/maint-send-pack-stateless-rpc-deadlock-fix
    
    * js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
      sideband_demux(): fix decl-after-stmt
    gitster committed May 16, 2011
Commits on May 16, 2011
  1. @gitster

    Update draft release notes to 1.7.5.2

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

    Merge branch 'jn/maint-format-patch-doc' into maint

    * jn/maint-format-patch-doc:
      Documentation: describe the format of messages with inline patches
    gitster committed May 16, 2011
  3. @gitster

    Merge branch 'ss/cherry-pick-x-doc' into maint

    * ss/cherry-pick-x-doc:
      doc: Clarify that "cherry-pick -x" does not use "git notes"
    gitster committed May 16, 2011
  4. @gitster

    Merge branch 'vr/merge-base-doc' into maint

    * vr/merge-base-doc:
      Restructure documentation for git-merge-base.
      Documentation: update to git-merge-base --octopus
    gitster committed May 16, 2011
  5. @gitster

    Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maint

    * sr/maint-fast-import-tighten-option-parsing:
      fast-import: fix option parser for no-arg options
    gitster committed May 16, 2011
  6. @gitster

    Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint

    * jc/t1506-shell-param-expansion-gotcha:
      t1507: avoid "${parameter<op>'word'}" inside double-quotes
    gitster committed May 16, 2011
  7. @gitster

    Merge branch 'jc/fix-add-u-unmerged' into maint

    * jc/fix-add-u-unmerged:
      Fix "add -u" that sometimes fails to resolve unmerged paths
    
    Conflicts:
    	builtin/add.c
    gitster committed May 16, 2011
  8. @gitster

    Merge branch 'jn/gitweb-dependency' into maint

    * jn/gitweb-dependency:
      Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
      git-instaweb: Simplify build dependency on gitweb
    gitster committed May 16, 2011
  9. @gitster

    Merge branch 'jc/maint-branch-mergeoptions' into maint

    * jc/maint-branch-mergeoptions:
      merge: make branch.<name>.mergeoptions correctly override merge.<option>
    
    Conflicts:
    	builtin/merge.c
    gitster committed May 16, 2011
Something went wrong with that request. Please try again.