Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.12-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.12-rc3
Junio C Hamano
Sync with 1.7.11.5
Junio C Hamano
Git 1.7.11.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.11.5
Junio C Hamano
Merge branch 'rj/maint-grep-remove-redundant-test' into maint * rj/maint-grep-remove-redundant-test: t7810-*.sh: Remove redundant test
Junio C Hamano
Merge branch 'hv/link-alt-odb-entry' into maint * hv/link-alt-odb-entry: link_alt_odb_entry: fix read over array bounds reported by valgrind
Peter Baumann
git svn: reset invalidates the memoized mergeinfo caches 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 - …
Robert Luberda
git svn: handle errors and concurrent commits in dcommit 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://bu…
Junio C Hamano
Merge git://github.com/git-l10n/git-po 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
Peter Krefting
l10n: Update Swedish translation (1168t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Junio C Hamano
Merge branch 'bw/maint-1.7.9-solaris-getpass' 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
Matthieu Moy
Documentation: list git-credential in plumbing commands Commit e30b2feb1b (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: Juni…
Jiang Xin
Merge git://github.com/ralfth/git-po-de * git://github.com/ralfth/git-po-de: l10n: de.po: translate 77 new messages
Junio C Hamano
Git 1.7.12-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.12-rc2
Ralf Thielow
l10n: de.po: translate 77 new messages 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>
Ben Walton
Enable HAVE_DEV_TTY for Solaris 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>
Jeff King
terminal: seek when switching between reading and writing 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 …
Tran Ngoc Quan
l10n: vi.po: update one message * Translate message that updated from commit bb2ba06 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Junio C Hamano
Drop 1.7.11.x items from 1.7.12 release notes Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with maint
Junio C Hamano
Prepare for 1.7.11.5 Hopefully that will be the final 1.7.11.x maintenance release. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jn/block-sha1' into maint * 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
Junio C Hamano
Merge branch 'jn/make-assembly-in-right-directory' into maint * jn/make-assembly-in-right-directory: Makefile: fix location of listing produced by "make subdir/foo.s"
Junio C Hamano
Merge branch 'ms/daemon-doc-typo' into maint * ms/daemon-doc-typo: Documentation/git-daemon: add missing word
Junio C Hamano
Merge branch 'lm/git-blame-el' into maint * 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
Junio C Hamano
Merge branch 'rs/ipv6-ssh-url' into maint * rs/ipv6-ssh-url: git: Wrong parsing of ssh urls with IPv6 literals ignores port
Junio C Hamano
Merge branch 'rs/git-blame-mapcar-mapc' into maint * rs/git-blame-mapcar-mapc: git-blame.el: use mapc instead of mapcar
Junio C Hamano
Merge branch 'rr/doc-commit' into maint * rr/doc-commit: commit: document a couple of options
stepnem
doc: A few minor copy edits. - (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>
Junio C Hamano
Merge branch 'jk/maint-checkout-orphan-check-fix' into maint * jk/maint-checkout-orphan-check-fix: checkout: don't confuse ref and object flags
Junio C Hamano
Merge branch 'mh/maint-revisions-doc' into maint * mh/maint-revisions-doc: Enumerate revision range specifiers in the documentation Make <refname> documentation more consistent.
  1. Prev
  2. Next