kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
29,895 Commits
7 Branches
1,000 Tags
174 MiB
Commit Graph

29895 Commits (e6b895efdb77f3a1c8e489ff13ed5834bba16736)

Author SHA1 Message Date
Nguyễn Thái Ngọc Duy e6b895efdb i18n: notes: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy 422cad0ab1 i18n: name-rev: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy 6c54dc46aa i18n: mv: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy a631281022 i18n: mktree: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy 962e629567 i18n: merge: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy c7d93da38e i18n: merge-file: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy f037dbf49c i18n: merge-base: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy 373f922174 i18n: ls-tree: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy 377adc3aaf i18n: ls-files: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:18 -07:00
Nguyễn Thái Ngọc Duy e62cd35a3e i18n: log: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy ce4a5e53d5 i18n: init-db: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy 68918696cc i18n: help: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy 483bbf41ca i18n: hash-object: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy 4b407bc506 i18n: grep: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy 6705c1629c i18n: gc: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy cf8fe315e6 i18n: fsck: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy 61007a5868 i18n: format-patch: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy 18913521e2 i18n: for-each-ref: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy 93eced6c1b i18n: fmt-merge-msg: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:17 -07:00
Nguyễn Thái Ngọc Duy 719acedba4 i18n: fetch: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy 3b787b9678 i18n: fast-export: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy bfb0737d96 i18n: describe: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy 1bd31ce691 i18n: config: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy 7adaddc21a i18n: count-objects: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy 9c23f4c537 i18n: commit: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy 997f44d0dc i18n: column: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy 32b77add95 i18n: clone: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy 145f9c81aa i18n: clean: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy 986d1bb877 i18n: cherry: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:16 -07:00
Nguyễn Thái Ngọc Duy e05a10937c i18n: checkout: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy 0ed217188d i18n: checkout-index: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy 5a72beb791 i18n: check-attr: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy d68faec7c0 i18n: cat-file: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy 24a8521459 i18n: branch: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy efd2a8bd38 i18n: blame: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy 1b56024c7a i18n: add: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy 9e7bbe2d6b i18n: bisect--helper: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy 0012a3873b i18n: archive: mark parseopt strings for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:15 -07:00
Nguyễn Thái Ngọc Duy a054e04912 i18n: mark "style" in OPT_COLUMN() for translation 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-20 12:23:14 -07:00
Junio C Hamano 889d35899b Git 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-19 17:02:11 -07:00
Junio C Hamano 91e4bfe96f Merge branch 'jc/doc-git-updates' (early part) 
* 'jc/doc-git-updates' (early part):
  Documentation: update URL for formatted pages
 2012-08-17 13:27:10 -07:00
Junio C Hamano c70c09b6fc Documentation: update URL for formatted pages 
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>
 2012-08-17 13:25:43 -07:00
Junio C Hamano bd120e36d2 Merge git://github.com/git-l10n/git-po to update Swedish translation 
* git://github.com/git-l10n/git-po:
  l10n: Fixes to Swedish translation
 2012-08-16 20:13:45 -07:00
Peter Krefting 5b8056c155 l10n: Fixes to Swedish translation 
Tersify texts overflowing an 80-character terminal.
Fix spelling mistakes.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2012-08-16 13:57:51 +01:00
Junio C Hamano 2a9a19e1b1 Git 1.7.12-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-15 13:46:16 -07:00
Junio C Hamano 47e32d071e Sync with 1.7.11.5 2012-08-15 13:41:17 -07:00
Junio C Hamano cd7c0be19f Git 1.7.11.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-15 13:39:53 -07:00
Junio C Hamano d7d3b56bb1 Merge branch 'rj/maint-grep-remove-redundant-test' into maint 
* rj/maint-grep-remove-redundant-test:
  t7810-*.sh: Remove redundant test
 2012-08-15 13:37:20 -07:00
Junio C Hamano 45b65a6b67 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
 2012-08-15 13:36:47 -07:00
Peter Baumann 61b472ed8b 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  -  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 68f532f4ba 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>
 2012-08-10 19:53:18 +00:00