Permalink
Commits on Oct 21, 2012
  1. Git 1.8.0

    gitster committed Oct 21, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 17, 2012
  1. Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui

    gitster committed Oct 17, 2012
    git-gui 0.17.0
    
    * tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui:
      git-gui 0.17
      git-gui: Don't prepend the prefix if value looks like a full path
      git-gui: Detect full path when parsing arguments
      git-gui: remove .git/CHERRY_PICK_HEAD after committing
      git-gui: Fix a loose/lose mistake
      git-gui: Fix semi-working shortcuts for unstage and revert
      git-gui: de.po: translate "remote" as "extern"
      git-gui: de.po: translate "bare" as "bloß"
      git-gui: de.po: consistently add untranslated hook names within braces
      git-gui: preserve commit messages in utf-8
      git-gui: open console when using --trace on windows
      git-gui: fix a typo in po/ files
      git-gui: Use PWD if it exists on Mac OS X
      git-gui: fix git-gui crash due to uninitialized variable
  2. git-gui 0.17

    patthoyts committed Oct 17, 2012
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  3. git-gui: Don't prepend the prefix if value looks like a full path

    andrewkww authored and patthoyts committed Oct 2, 2012
    When argument parsing fails to detect a file name, "git-gui" will try to
    use the previously detected "head" as the file name. We should avoid
    prepending the prefix if "head" looks like a full path.
    
    Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  4. git-gui: Detect full path when parsing arguments

    andrewkww authored and patthoyts committed Oct 2, 2012
    When running "git-gui blame" from a subfolder (which means prefix is
    non-empty), if we pass a full path as argument, the argument parsing
    will fail to recognize the argument as a file name, because prefix is
    prepended to the argument.
    
    This patch handles that scenario by adding an additional branch that
    checks the file name without using the prefix.
    
    Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  5. Git 1.8.0-rc3

    gitster committed Oct 17, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. 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)
  7. Sync with 1.7.12.4

    gitster committed Oct 17, 2012
  8. Git 1.7.12.4

    gitster committed Oct 17, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. 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
  10. 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
  11. 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
  12. 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
  13. 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
  14. 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
  15. 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
  16. 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
  17. 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
  18. 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
  19. Merge branch 'db/doc-custom-xmlto' into maint

    gitster committed Oct 17, 2012
    * db/doc-custom-xmlto:
      Documentation/Makefile: Allow custom XMLTO binary
  20. 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)
  21. 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
  22. 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. Documentation/RelNotes: remove "updated up to this revision" markers

    tacker66 authored and gitster committed 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. 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. 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. l10n: Update Swedish translation (1964t0f0u)

    nafmo committed Oct 16, 2012
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
  5. 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. 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. 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. Merge branch 'maint'

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

    richardfearn authored and gitster committed 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. Merge branch 'maint'

    gitster committed Oct 12, 2012
    * maint:
      gitweb.cgi: fix "comitter_tz" typo in feed
  2. http: fix segfault in handle_curl_result

    peff authored and gitster committed 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. gitweb.cgi: fix "comitter_tz" typo in feed

    dylex authored and gitster committed 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>