Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 27, 2013
  1. @gitster

    Git 1.8.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Sync with maint

    gitster authored
    * maint:
      remote-hg: don't decode UTF-8 paths into Unicode objects
  3. @richardhansen @gitster

    remote-hg: don't decode UTF-8 paths into Unicode objects

    richardhansen authored gitster committed
    The internal mercurial API expects ordinary 8-bit string objects, not
    Unicode string objects.  With this change, the test-hg.sh unit tests
    pass again.
    
    Signed-off-by: Richard Hansen <rhansen@bbn.com>
    Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 25, 2013
  1. @gitster

    Merge branch 'rh/remote-hg-bzr-updates' (early part)

    gitster authored
    Unbreaks a recent breakage due to use of unquote-c-style.
    
    This may need to be cherry-picked down to 1.8.4.x series.
    
    * 'rh/remote-hg-bzr-updates' (early part):
      remote-hg: don't decode UTF-8 paths into Unicode objects
Commits on Nov 20, 2013
  1. @gitster

    Git 1.8.5-rc3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Sync with 1.8.4.4

    gitster authored
  3. @gitster

    Git 1.8.4.4

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'mb/relnotes-1.8.5-fix'

    gitster authored
    * mb/relnotes-1.8.5-fix:
      RelNotes: spelling & grammar fixes
Commits on Nov 18, 2013
  1. @gitster

    RelNotes: spelling & grammar fixes

    Marc Branchaud authored gitster committed
    Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'nd/literal-pathspecs'

    gitster authored
    Fixes a regression on 'master' since v1.8.4.
    
    * nd/literal-pathspecs:
      pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses
  3. @richardhansen @gitster

    remote-hg: don't decode UTF-8 paths into Unicode objects

    richardhansen authored gitster committed
    The internal mercurial API expects ordinary 8-bit string objects, not
    Unicode string objects.  With this change, the test-hg.sh unit tests
    pass again.
    
    Signed-off-by: Richard Hansen <rhansen@bbn.com>
    Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'maint'

    gitster authored
    Hotfix for recent regression while talking to upload-pack
    in a repository with many symbolic refs.
    
    * maint:
      Revert "upload-pack: send non-HEAD symbolic refs"
  5. @gitster

    Merge branch 'jx/branch-vv-always-compare-with-upstream'

    gitster authored
    Hot-fix for a regression.
    
    * jx/branch-vv-always-compare-with-upstream:
      branch: fix --verbose output column alignment
  6. @hegge @gitster

    branch: fix --verbose output column alignment

    hegge authored gitster committed
    Commit f2e0873 (branch: report invalid tracking branch as gone) removed
    an early return from fill_tracking_info() in the path taken when 'git
    branch -v' lists a branch in sync with its upstream. This resulted in an
    unconditionally added space in front of the subject line:
    
        $ git branch -v
        * master f5eb3da  commit pushed to upstream
          topic  f935eb6 unpublished topic
    
    Instead, only add the trailing space if a decoration have been added.
    
    To catch this kind of whitespace breakage in the tests, be a bit less
    smart when filtering the output through sed.
    
    Signed-off-by: Torstein Hegge <hegge@resisty.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Revert "upload-pack: send non-HEAD symbolic refs"

    gitster authored
    This reverts commit 5e7dcad; there
    may be unbounded number of symbolic refs in the repository, but the
    capability header line in the on-wire protocol has a rather low
    length limit.
Commits on Nov 13, 2013
  1. @gitster

    Git 1.8.5-rc2

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 12, 2013
  1. @gitster

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

    gitster authored
    * git://github.com/git-l10n/git-po:
      l10n: de.po: improve error message when pushing to unknown upstream
      l10n: de.po: translate 68 new messages
      po/TEAMS: update Thomas Rast's email address
      l10n: Update Swedish translation (2194t0f0u)
      l10n: fr.po 2194/1294 messages translated
      l10n: zh_CN.po: translate 68 messages (2194t0f0u)
      l10n: vi.po (2194t): Update and minor fix
      l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)
  2. @jrstjohn @gitster

    Correct word usage of "timezone" in "Documentation" directory

    jrstjohn authored gitster committed
    "timezone" is two words, not one (i.e. "time zone" is correct).
    
    Correct this in these files:
    -- date-formats.txt
    -- git-blame.txt
    -- git-cvsimport.txt
    -- git-fast-import.txt
    -- git-svn.txt
    -- gitweb.conf.txt
    -- rev-list-options.txt
    
    Signed-off-by: Jason St. John <jstjohn@purdue.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. l10n: de.po: improve error message when pushing to unknown upstream

    Ralf Thielow authored
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Acked-by: Thomas Rast <tr@thomasrast.ch>
  4. l10n: de.po: translate 68 new messages

    Ralf Thielow authored
    Translate 68 new messages came from git.pot update in 727b957
    (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Acked-by: Thomas Rast <tr@thomasrast.ch>
  5. po/TEAMS: update Thomas Rast's email address

    Ralf Thielow authored
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Acked-by: Thomas Rast <tr@thomasrast.ch>
Commits on Nov 10, 2013
  1. @jiangxin

    Merge remote-tracking branch 'sv/nafmo/master'

    jiangxin authored
    * sv/nafmo/master:
      l10n: Update Swedish translation (2194t0f0u)
Commits on Nov 9, 2013
  1. @nafmo

    l10n: Update Swedish translation (2194t0f0u)

    nafmo authored
    And fix a typo.
    
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Commits on Nov 8, 2013
  1. @jnavila

    l10n: fr.po 2194/1294 messages translated

    jnavila authored
    Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
    Signed-off-by: Sebastien Helleu <flashcode@flashtux.org>
  2. @gitster

    Sync with 1.8.4.3

    gitster authored
  3. @gitster

    Git 1.8.4.3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'jn/test-prereq-perl-doc' into maint

    gitster authored
    The interaction between use of Perl in our test suite and NO_PERL
    has been clarified a bit.
    
    * jn/test-prereq-perl-doc:
      t/README: tests can use perl even with NO_PERL
  5. @gitster

    Merge branch 'ap/remote-hg-unquote-cquote' into maint

    gitster authored
    A fast-import stream expresses a pathname with funny characters by
    quoting them in C style; remote-hg remote helper (in contrib/)
    forgot to unquote such a path.
    
    * ap/remote-hg-unquote-cquote:
      remote-hg: unquote C-style paths when exporting
  6. @gitster

    Merge branch 'jc/upload-pack-send-symref' into maint

    gitster authored
    One long-standing flaw in the pack transfer protocol used by "git
    clone" was that there was no way to tell the other end which branch
    "HEAD" points at, and the receiving end needed to guess.  A new
    capability has been defined in the pack protocol to convey this
    information so that cloning from a repository with more than one
    branches pointing at the same commit where the HEAD is at now
    reliably sets the initial branch in the resulting repository.
    
    * jc/upload-pack-send-symref:
      t5570: Update for clone-progress-to-stderr branch
      t5570: Update for symref capability
      clone: test the new HEAD detection logic
      connect: annotate refs with their symref information in get_remote_head()
      connect.c: make parse_feature_value() static
      upload-pack: send non-HEAD symbolic refs
      upload-pack: send symbolic ref information as capability
      upload-pack.c: do not pass confusing cb_data to mark_our_ref()
      t5505: fix "set-head --auto with ambiguous HEAD" test
  7. @gitster

    Merge branch 'jk/http-auth-redirects' into maint

    gitster authored
    We did not handle cases where http transport gets redirected during
    the authorization request (e.g. from http:// to https://).
    
    * jk/http-auth-redirects:
      http.c: Spell the null pointer as NULL
      remote-curl: rewrite base url from info/refs redirects
      remote-curl: store url as a strbuf
      remote-curl: make refs_url a strbuf
      http: update base URLs when we see redirects
      http: provide effective url to callers
      http: hoist credential request out of handle_curl_result
      http: refactor options to http_get_*
      http_request: factor out curlinfo_strbuf
      http_get_file: style fixes
Commits on Nov 7, 2013
  1. @gitster

    Sync with maint

    gitster authored
    * maint:
      Start preparing for 1.8.4.3
      gitignore.txt: fix documentation of "**" patterns
  2. @gitster

    Start preparing for 1.8.4.3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'sc/doc-howto-dumb-http' into maint

    gitster authored
    An ancient How-To on serving Git repositories on an HTTP server
    lacked a warning that it has been mostly superseded with more
    modern way.
    
    * sc/doc-howto-dumb-http:
      doc/howto: warn about (dumb)http server document being too old
  4. @gitster

    Merge branch 'vd/doc-unpack-objects' into maint

    gitster authored
    The synopsis section of "git unpack-objects" documentation has been
    clarified a bit.
    
    * vd/doc-unpack-objects:
      Documentation: "pack-file" is not literal in unpack-objects
      Documentation: restore a space in unpack-objects usage
  5. @gitster

    Merge branch 'jk/subtree-install-fix' into maint

    gitster authored
    We did not generate HTML version of documentation to "git subtree"
    in contrib/.
    
    * jk/subtree-install-fix:
      subtree: add makefile target for html docs
Something went wrong with that request. Please try again.