Skip to content
Commits on Oct 17, 2012
  1. @gitster

    Git 1.8.0-rc3

    gitster committed Oct 17, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge git://github.com/git-l10n/git-po

    gitster committed Oct 17, 2012
    * git://github.com/git-l10n/git-po:
      l10n: vi.po: update from v1.8.0-rc2-4-g42e55
      l10n: Update Swedish translation (1964t0f0u)
  3. @gitster

    Sync with 1.7.12.4

    gitster committed Oct 17, 2012
  4. @gitster

    Git 1.7.12.4

    gitster committed Oct 17, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'jk/maint-http-half-auth-push' into maint

    gitster committed Oct 17, 2012
    * jk/maint-http-half-auth-push:
      http: fix segfault in handle_curl_result
  6. @gitster

    Merge branch 'rr/git-uri-doc' into maint

    gitster committed Oct 17, 2012
    * rr/git-uri-doc:
      Git url doc: mark ftp/ftps as read-only and deprecate them
  7. @gitster

    Merge branch 'bw/cp-a-is-gnuism' into maint

    gitster committed Oct 17, 2012
    * bw/cp-a-is-gnuism:
      tests: "cp -a" is a GNUism
  8. @gitster

    Merge branch 'nd/doc-ignore' into maint

    gitster committed Oct 17, 2012
    * nd/doc-ignore:
      gitignore.txt: suggestions how to get literal # or ! at the beginning
  9. @gitster

    Merge branch 'jc/doc-long-options' into maint

    gitster committed Oct 17, 2012
    * jc/doc-long-options:
      gitcli: parse-options lets you omit tail of long options
  10. @gitster

    Merge branch 'jc/maint-t1450-fsck-order-fix' into maint

    gitster committed Oct 17, 2012
    * jc/maint-t1450-fsck-order-fix:
      t1450: the order the objects are checked is undefined
  11. @gitster

    Merge branch 'rr/test-use-shell-path-not-shell' into maint

    gitster committed Oct 17, 2012
    * rr/test-use-shell-path-not-shell:
      test-lib: use $SHELL_PATH, not $SHELL
  12. @gitster

    Merge branch 'rr/test-make-sure-we-have-git' into maint

    gitster committed Oct 17, 2012
    * rr/test-make-sure-we-have-git:
      t/test-lib: make sure Git has already been built
  13. @gitster

    Merge branch 'po/maint-docs' into maint

    gitster committed Oct 17, 2012
    * po/maint-docs:
      Doc branch: show -vv option and alternative
      Doc clean: add See Also link
      Doc add: link gitignore
      Doc: separate gitignore pattern sources
      Doc: shallow clone deepens _to_ new depth
  14. @gitster

    Merge branch 'jc/ll-merge-binary-ours' into maint

    gitster committed Oct 17, 2012
    * jc/ll-merge-binary-ours:
      ll-merge: warn about inability to merge binary files only when we can't
      attr: "binary" attribute should choose built-in "binary" merge driver
      merge: teach -Xours/-Xtheirs to binary ll-merge driver
  15. @gitster

    Merge branch 'db/doc-custom-xmlto' into maint

    gitster committed Oct 17, 2012
    * db/doc-custom-xmlto:
      Documentation/Makefile: Allow custom XMLTO binary
  16. @jiangxin

    Merge branch 'master' of https://github.com/nafmo/git-l10n-sv

    jiangxin committed Oct 17, 2012
    * 'master' of https://github.com/nafmo/git-l10n-sv:
      l10n: Update Swedish translation (1964t0f0u)
  17. @jiangxin

    Merge branch 'master' of git://github.com/vnwildman/git

    jiangxin committed Oct 17, 2012
    * 'master' of git://github.com/vnwildman/git:
      l10n: vi.po: update from v1.8.0-rc2-4-g42e55
  18. @vnwildman

    l10n: vi.po: update from v1.8.0-rc2-4-g42e55

    vnwildman committed Oct 17, 2012
    * translate 3 new messages
    * review quotes
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Commits on Oct 16, 2012
  1. @tacker66 @gitster

    Documentation/RelNotes: remove "updated up to this revision" markers

    tacker66 committed with gitster Oct 16, 2012
    These were used to keep track of the last commit a release notes
    entry was written for, and should have been removed when cutting
    the final release.
    
    Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Update draft release notes to 1.8.0

    gitster committed Oct 16, 2012
    We are almost there...
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'jk/maint-http-half-auth-push'

    gitster committed Oct 16, 2012
    Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1)
    and master (v1.8.0-rc0).
    
    * jk/maint-http-half-auth-push:
      http: fix segfault in handle_curl_result
  4. @nafmo

    l10n: Update Swedish translation (1964t0f0u)

    nafmo committed Oct 16, 2012
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
  5. @jiangxin

    l10n: Update git.pot (3 new, 6 removed messages)

    jiangxin committed Oct 16, 2012
    This po/git.pot update is generated from v1.8.0-rc2-4-g42e55.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
  6. @jiangxin

    Merge branch 'master' of git://github.com/vnwildman/git

    jiangxin committed Oct 16, 2012
    * 'master' of git://github.com/vnwildman/git:
      l10n: vi.po: update translation upto cc76011
Commits on Oct 15, 2012
  1. @vnwildman

    l10n: vi.po: update translation upto cc76011

    vnwildman committed Oct 15, 2012
    * translate all new messages (100%)
    * review some others
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Commits on Oct 14, 2012
  1. @gitster

    Merge branch 'maint'

    gitster committed Oct 13, 2012
    * maint:
      Fix spelling error in post-receive-email hook
  2. @richardfearn @gitster

    Fix spelling error in post-receive-email hook

    richardfearn committed with gitster Oct 13, 2012
    Signed-off-by: Richard Fearn <richardfearn@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 12, 2012
  1. @gitster

    Merge branch 'maint'

    gitster committed Oct 12, 2012
    * maint:
      gitweb.cgi: fix "comitter_tz" typo in feed
  2. @peff @gitster

    http: fix segfault in handle_curl_result

    peff committed with gitster Oct 12, 2012
    When we create an http active_request_slot, we can set its
    "results" pointer back to local storage. The http code will
    fill in the details of how the request went, and we can
    access those details even after the slot has been cleaned
    up.
    
    Commit 8809703 (http: factor out http error code handling)
    switched us from accessing our local results struct directly
    to accessing it via the "results" pointer of the slot. That
    means we're accessing the slot after it has been marked as
    finished, defeating the whole purpose of keeping the results
    storage separate.
    
    Most of the time this doesn't matter, as finishing the slot
    does not actually clean up the pointer. However, when using
    curl's multi interface with the dumb-http revision walker,
    we might actually start a new request before handing control
    back to the original caller. In that case, we may reuse the
    slot, zeroing its results pointer, and leading the original
    caller to segfault while looking for its results inside the
    slot.
    
    Instead, we need to pass a pointer to our local results
    storage to the handle_curl_result function, rather than
    relying on the pointer in the slot struct. This matches what
    the original code did before the refactoring (which did not
    use a separate function, and therefore just accessed the
    results struct directly).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @dylex @gitster

    gitweb.cgi: fix "comitter_tz" typo in feed

    dylex committed with gitster Oct 11, 2012
    gitweb's feeds sometimes contained committer timestamps in the wrong timezone
    due to a misspelling.
    
    Signed-off-by: Dylan Simon <dylan@dylex.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 11, 2012
  1. @gitster

    Git 1.8.0-rc2

    gitster committed Oct 11, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 10, 2012
  1. @gitster

    Merge branch 'rr/git-uri-doc'

    gitster committed Oct 10, 2012
    * rr/git-uri-doc:
      Git url doc: mark ftp/ftps as read-only and deprecate them
  2. @gitster

    Merge branch 'bw/cp-a-is-gnuism'

    gitster committed Oct 10, 2012
    * bw/cp-a-is-gnuism:
      tests: "cp -a" is a GNUism
  3. @gitster

    Merge branch 'nd/doc-ignore'

    gitster committed Oct 10, 2012
    * nd/doc-ignore:
      gitignore.txt: suggestions how to get literal # or ! at the beginning
  4. @gitster

    Merge branch 'jc/doc-long-options'

    gitster committed Oct 10, 2012
    * jc/doc-long-options:
      gitcli: parse-options lets you omit tail of long options
Something went wrong with that request. Please try again.