Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 20, 2012
  1. @gitster

    Git 1.7.12

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 17, 2012
  1. @gitster

    Merge branch 'jc/doc-git-updates' (early part)

    gitster authored
    * 'jc/doc-git-updates' (early part):
      Documentation: update URL for formatted pages
  2. @gitster

    Documentation: update URL for formatted pages

    gitster authored
    The one at kernel.org has not been updated for quite a while and
    can no longer be called "the latest".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge git://github.com/git-l10n/git-po to update Swedish translation

    gitster authored
    * git://github.com/git-l10n/git-po:
      l10n: Fixes to Swedish translation
Commits on Aug 16, 2012
  1. @nafmo

    l10n: Fixes to Swedish translation

    nafmo authored
    Tersify texts overflowing an 80-character terminal.
    Fix spelling mistakes.
    
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Commits on Aug 15, 2012
  1. @gitster

    Git 1.7.12-rc3

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

    Sync with 1.7.11.5

    gitster authored
  3. @gitster

    Git 1.7.11.5

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

    Merge branch 'rj/maint-grep-remove-redundant-test' into maint

    gitster authored
    * rj/maint-grep-remove-redundant-test:
      t7810-*.sh: Remove redundant test
  5. @gitster

    Merge branch 'hv/link-alt-odb-entry' into maint

    gitster authored
    * hv/link-alt-odb-entry:
      link_alt_odb_entry: fix read over array bounds reported by valgrind
Commits on Aug 10, 2012
  1. git svn: reset invalidates the memoized mergeinfo caches

    Peter Baumann authored Eric Wong committed
    Since v1.7.0-rc2~11 (git-svn: persistent memoization, 2010-01-30),
    git-svn has maintained some private per-repository caches in
    .git/svn/.caches to avoid refetching and recalculating some
    mergeinfo-related information with every 'git svn fetch'.
    
    This memoization can cause problems, e.g consider the following case:
    
    SVN repo:
    
      ... - a - b - c - m  <- trunk
              \        /
                d  -  e    <- branch1
    
    The Git import of the above repo is at commit 'a' and doesn't know about
    the branch1. In case of an 'git svn rebase', only the trunk of the
    SVN repo is imported. During the creation of the git commit 'm', git svn
    uses the svn:mergeinfo property and tries to find the corresponding git
    commit 'e' to create 'm' with 'c' and 'e' as parents. But git svn rebase
    only imports the current branch so commit 'e' is not imported.
    Therefore git svn fails to create commit 'm' as a merge commit, because one
    of its parents is not known to git. The imported history looks like this:
    
      ... - a - b - c - m  <- trunk
    
    A later 'git svn fetch' to import all branches can't rewrite the commit 'm'
    to add 'e' as a parent and to make it a real git merge commit, because it
    was already imported.
    
    That's why the imported history misses the merge and looks like this:
    
      ... - a - b - c - m  <- trunk
              \
                d  -  e    <- branch1
    
    Right now the only known workaround for importing 'm' as a merge is to
    force reimporting 'm' again from SVN, e.g. via
    
      $ git svn reset --revision $(git find-rev $c)
      $ git svn fetch
    
    Sadly, this is where the behavior has regressed: git svn reset doesn't
    invalidate the old mergeinfo cache, which is no longer valid for the
    reimport, which leads to 'm' beeing imprted with only 'c' as parent.
    
    As solution to this problem, this commit invalidates the mergeinfo cache
    to force correct recalculation of the parents.
    
    During development of this patch, several ways for invalidating the cache
    where considered. One of them is to use Memoize::flush_cache, which will
    call the CLEAR method on the underlying Memoize persistency implementation.
    Sadly, neither Memoize::Storable nor the newer Memoize::YAML module
    introduced in 68f532f could optionally be used implement the
    CLEAR method, so this is not an option.
    
    Reseting the internal hash used to store the memoized values has the same
    problem, because it calls the non-existing CLEAR method of the
    underlying persistency layer, too.
    
    Considering this and taking into account the different implementations
    of the memoization modules, where Memoize::Storable is not in our control,
    implementing the missing CLEAR method is not an option, at least not if
    Memoize::Storable is still used.
    
    Therefore the easiest solution to clear the cache is to delete the files
    on disk in 'git svn reset'. Normally, deleting the files behind the back
    of the memoization module would be problematic, because the in-memory
    representation would still exist and contain wrong data. Fortunately, the
    memoization is active in memory only for a small portion of the code.
    Invalidating the cache by deleting the files on disk if it isn't active
    should be safe.
    
    Signed-off-by: Peter Baumann <waste.manager@gmx.de>
    Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  2. git svn: handle errors and concurrent commits in dcommit

    Robert Luberda authored Eric Wong committed
    dcommit didn't handle errors returned by SVN and coped very
    poorly with concurrent commits that appear in SVN repository
    while dcommit was running. In both cases it left git repository
    in inconsistent state: index (which was reset with `git reset
    --mixed' after a successful commit to SVN) no longer matched the
    checkouted tree, when the following commit failed or needed to be
    rebased. See http://bugs.debian.org/676904 for examples.
    
    This patch fixes the issues by:
    - introducing error handler for dcommit. The handler will try
      to rebase or reset working tree before returning error to the
      end user. dcommit_rebase function was extracted out of cmd_dcommit
      to ensure consistency between cmd_dcommit and the error handler.
    - calling `git reset --mixed' only once after all patches are
      successfully committed to SVN. This ensures index is not touched
      for most of the time of dcommit run.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
Commits on Aug 9, 2012
  1. @gitster

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

    gitster authored
    L10n updates for 1.7.12-rc2
    
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: Update Swedish translation (1168t0f0u)
      l10n: de.po: translate 77 new messages
      l10n: vi.po: update one message
      l10n: zh_CN.po: update one translation
      l10n: Update one message in git.pot
  2. @nafmo

    l10n: Update Swedish translation (1168t0f0u)

    nafmo authored
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Commits on Aug 8, 2012
  1. @gitster

    Merge branch 'bw/maint-1.7.9-solaris-getpass'

    gitster authored
    The recent update to terminal I/O interface to get passwords &c
    interactively didn't quite work on Solaris.
    
    * bw/maint-1.7.9-solaris-getpass:
      Enable HAVE_DEV_TTY for Solaris
      terminal: seek when switching between reading and writing
  2. @moy @gitster

    Documentation: list git-credential in plumbing commands

    moy authored gitster committed
    Commit e30b2fe (Jun 24 2012, add 'git credential' plumbing command)
    forgot to add git-credential to command-list.txt, hence the command was
    not appearing in the documentation, making it hard for users to discover
    it.
    
    While we're there, capitalize the description line for git-crendential
    for consistency with other commands.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 7, 2012
  1. @jiangxin

    Merge git://github.com/ralfth/git-po-de

    jiangxin authored
    * git://github.com/ralfth/git-po-de:
      l10n: de.po: translate 77 new messages
  2. @gitster

    Git 1.7.12-rc2

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. l10n: de.po: translate 77 new messages

    Ralf Thielow authored
    Translate 77 new messages came from git.pot update
    in 3b6137f (l10n: Update git.pot (76 new, 4 removed
    messages)) and bb2ba06 (l10n: Update one message in
    git.pot).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
  4. @gitster

    Enable HAVE_DEV_TTY for Solaris

    Ben Walton authored gitster committed
    Now that git_terminal_prompt can cleanly interact with /dev/tty on
    Solaris, enable HAVE_DEV_TTY so that this code path is used for
    credential reading instead of relying on the crippled getpass().
    
    Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @peff @gitster

    terminal: seek when switching between reading and writing

    peff authored gitster committed
    When a stdio stream is opened in update mode (e.g., "w+"),
    the C standard forbids switching between reading or writing
    without an intervening positioning function. Many
    implementations are lenient about this, but Solaris libc
    will flush the recently-read contents to the output buffer.
    In this instance, that meant writing the non-echoed password
    that the user just typed to the terminal.
    
    Fix it by inserting a no-op fseek between the read and
    write.
    
    The opposite direction (writing followed by reading) is also
    disallowed, but our intervening fflush is an acceptable
    positioning function for that alternative.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @vnwildman

    l10n: vi.po: update one message

    vnwildman authored
    * Translate message that updated from commit bb2ba06
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Commits on Aug 6, 2012
  1. @gitster

    Drop 1.7.11.x items from 1.7.12 release notes

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

    Sync with maint

    gitster authored
  3. @gitster

    Prepare for 1.7.11.5

    gitster authored
    Hopefully that will be the final 1.7.11.x maintenance release.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'jn/block-sha1' into maint

    gitster authored
    * jn/block-sha1:
      Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads
      block-sha1: put expanded macro parameters in parentheses
      block-sha1: avoid pointer conversion that violates alignment constraints
  5. @gitster

    Merge branch 'jn/make-assembly-in-right-directory' into maint

    gitster authored
    * jn/make-assembly-in-right-directory:
      Makefile: fix location of listing produced by "make subdir/foo.s"
  6. @gitster

    Merge branch 'ms/daemon-doc-typo' into maint

    gitster authored
    * ms/daemon-doc-typo:
      Documentation/git-daemon: add missing word
  7. @gitster

    Merge branch 'lm/git-blame-el' into maint

    gitster authored
    * lm/git-blame-el:
      git-blame.el: Do not use bare 0 to mean (point-min)
      git-blame.el: Use with-current-buffer where appropriate
      git-blame.el: Do not use goto-line in lisp code
  8. @gitster

    Merge branch 'rs/ipv6-ssh-url' into maint

    gitster authored
    * rs/ipv6-ssh-url:
      git: Wrong parsing of ssh urls with IPv6 literals ignores port
  9. @gitster

    Merge branch 'rs/git-blame-mapcar-mapc' into maint

    gitster authored
    * rs/git-blame-mapcar-mapc:
      git-blame.el: use mapc instead of mapcar
  10. @gitster

    Merge branch 'rr/doc-commit' into maint

    gitster authored
    * rr/doc-commit:
      commit: document a couple of options
  11. @stepnem @gitster

    doc: A few minor copy edits.

    stepnem authored gitster committed
    - (glossary) the quotes around the Wikipedia URL prevented its
      linkification in frontends that support it; remove them
    
    - (manual) newer version (SHA-1) == following, older == preceding, not
      the other way around
    
    - trivial typo and wording fixes
    
    Signed-off-by: Štěpán Němec <stepnem@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @gitster

    Merge branch 'jk/maint-checkout-orphan-check-fix' into maint

    gitster authored
    * jk/maint-checkout-orphan-check-fix:
      checkout: don't confuse ref and object flags
  13. @gitster

    Merge branch 'mh/maint-revisions-doc' into maint

    gitster authored
    * mh/maint-revisions-doc:
      Enumerate revision range specifiers in the documentation
      Make <refname> documentation more consistent.
Something went wrong with that request. Please try again.