summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-09-02Merge branch 'bc/archive-pax-header-mode'Libravatar Junio C Hamano2-2/+7
Implementations of "tar" that do not understand an extended pax header would extract the contents of it in a regular file; make sure the permission bits of this file follows the same tar.umask configuration setting. * bc/archive-pax-header-mode: archive: honor tar.umask even for pax headers
2014-09-02Merge branch 'pr/remotes-in-hashmap'Libravatar Junio C Hamano2-17/+49
Optimize remotes configuration look-up in a repository with very many remotes defined. * pr/remotes-in-hashmap: use a hashmap to make remotes faster
2014-09-02Merge branch 'jk/pretty-empty-format'Libravatar Junio C Hamano5-6/+14
"git log --pretty/format=" with an empty format string did not mean the more obvious "No output whatsoever" but "Use default format", which was counterintuitive. * jk/pretty-empty-format: pretty: make empty userformats truly empty pretty: treat "--format=" as an empty userformat revision: drop useless string offset when parsing "--pretty"
2014-09-02Merge branch 'ta/config-set'Libravatar Junio C Hamano8-0/+801
Add in-core caching layer to let us avoid reading the same configuration files number of times. * ta/config-set: test-config: add tests for the config_set API add `config_set` API for caching config-like files
2014-09-02Merge branch 'rs/init-no-duplicate-real-path'Libravatar Junio C Hamano1-4/+4
* rs/init-no-duplicate-real-path: init: avoid superfluous real_path() calls
2014-09-02Merge branch 'mm/config-edit-global'Libravatar Junio C Hamano5-10/+69
Start "git config --edit --global" from a skeletal per-user configuration file contents, instead of a total blank, when the user does not already have any. This immediately reduces the need for a later "Have you forgotten setting core.user?" and we can add more to the template as we gain more experience. * mm/config-edit-global: commit: advertise config --global --edit on guessed identity home_config_paths(): let the caller ignore xdg path config --global --edit: create a template file if needed
2014-09-02Merge branch 'jc/reopen-lock-file'Libravatar Junio C Hamano2-0/+11
There are cases where you lock and open to write a file, close it to show the updated contents to external processes, and then have to update the file again while still holding the lock, but the lockfile API lacked support for such an access pattern. * jc/reopen-lock-file: lockfile: allow reopening a closed but still locked file
2014-08-29Merge git://github.com/git-l10n/git-poLibravatar Junio C Hamano2-1359/+1515
* git://github.com/git-l10n/git-po: po/TEAMS: add new members to German translation team l10n: de.po: translate 38 new messages
2014-08-29po/TEAMS: add new members to German translation teamLibravatar Ralf Thielow1-0/+2
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-08-29l10n: de.po: translate 38 new messagesLibravatar Ralf Thielow1-1359/+1513
Translate 38 new messages came from git.pot update in fe05e19 (l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-08-26Merge branch 'jk/diff-tree-t-fix'Libravatar Junio C Hamano2-1/+45
Fix (rarely used) "git diff-tree -t" regression in 2.0. * jk/diff-tree-t-fix: intersect_paths: respect mode in git's tree-sort
2014-08-26Merge branch 'jk/pack-shallow-always-without-bitmap'Libravatar Junio C Hamano2-0/+40
Reachability bitmaps do not work with shallow operations. Fixes regression in 2.0. * jk/pack-shallow-always-without-bitmap: pack-objects: turn off bitmaps when we see --shallow lines
2014-08-26Merge branch 'jk/fix-profile-feedback-build'Libravatar Junio C Hamano1-1/+5
Fix profile-feedback build broken in 2.1 for tarball releases. * jk/fix-profile-feedback-build: Makefile: make perf tests optional for profile build
2014-08-25Merge git://github.com/git-l10n/git-poLibravatar Junio C Hamano9-9039/+21279
* git://github.com/git-l10n/git-po: l10n: de.po: improve message when switching branches l10n: de.po: fix typo po/TEAMS: Add Catalan team l10n: Add Catalan translation l10n: fr.po (2257t) update for version 2.1.0 l10n: sv.po: Update Swedish translation (2257t0f0u) l10n: vi.po (2257t): Update translation l10n: Updated Bulgarian translation of git (2257t,0f,0u) l10n: zh_CN: translations for git v2.1.0-rc0 l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed) l10n: Updated Bulgarian translation of git (2247t,0f,0u) l10n: Updated Bulgarian translation of git (2228t,0f,0u) l10n: Fix more typos in the Swedish translations
2014-08-23l10n: de.po: improve message when switching branchesLibravatar Ralf Thielow1-3/+3
Suggested-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-08-23l10n: de.po: fix typoLibravatar Ralf Thielow1-2/+2
Reported-by: Hartmut Henkel Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-08-22po/TEAMS: Add Catalan teamLibravatar Alex Henrie1-0/+4
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2014-08-22l10n: Add Catalan translationLibravatar Alex Henrie1-0/+10951
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2014-08-20intersect_paths: respect mode in git's tree-sortLibravatar Jeff King2-1/+45
When we do a combined diff, we individually diff against each parent, and then use intersect_paths to do a parallel walk through the sorted results and come up with a final list of interesting paths. The sort order here is that returned by the diffs, which means it is in git's tree-order which sorts sub-trees as if their paths have "/" at the end. When we do our parallel walk, we need to use a comparison function which provides the same order. Since 8518ff8 (combine-diff: optimize combine_diff_path sets intersection, 2014-01-20), we use a simple strcmp to compare the pathnames, and get this wrong. It's somewhat hard to trigger because normally a diff does not produce tree entries at all, and therefore the sort order is the same as a strcmp. However, if the "-t" option is used with the diff, then we will produce diff_filepairs for both trees and files. We can use base_name_compare to do the comparison, just as the tree-diff code does. Even though what we have are not technically base names (they are full paths within the tree), the end result is the same (we do not care about interior slashes at all, only about the final character). However, since we do not have the length of each path stored, we take a slight shortcut: if neither of the entries is a sub-tree then the comparison is equivalent to a strcmp. This lets us skip the extra strlen calls in the common case without having to reimplement base_name_compare from scratch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-19Makefile: make perf tests optional for profile buildLibravatar Jeff King1-1/+5
The perf tests need a repository to operate on; if none is defined, we fall back to the repository containing our build directory. That fails, though, for an exported tarball of git.git, which has no repository. Since 5d7fd6d we run the perf tests as part of "make profile". Therefore "make profile" fails out of the box on released tarballs of v2.1.0. We can fix this by making the perf tests optional; if they are skipped, we still run the regular test suite, which should give a lot of profile data (and is what we used to do prior to 5d7fd6d anyway). Signed-off-by: Jeff King <peff@peff.net> Acked-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-15Git 2.1Libravatar Junio C Hamano2-1/+6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-13tests: fix negated test_i18ngrep callsLibravatar Johannes Sixt3-6/+6
The helper function test_i18ngrep pretends that it found the expected results when it is running under GETTEXT_POISON. For this reason, it must not be used negated like so ! test_i18ngrep foo bar because the test case would fail under GETTEXT_POISON. The function offers a special syntax to test that a pattern is *not* found: test_i18ngrep ! foo bar Convert incorrect uses to this syntax. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-12pack-objects: turn off bitmaps when we see --shallow linesLibravatar Jeff King2-0/+40
Reachability bitmaps do not work with shallow operations, because they cache a view of the object reachability that represents the true objects. Whereas a shallow repository (or a shallow operation in a repository) is inherently cutting off the object graph with a graft. We explicitly disallow the use of bitmaps in shallow repositories by checking is_repository_shallow(), and we should continue to do that. However, we also want to disallow bitmaps when we are serving a fetch to a shallow client, since we momentarily take on their grafted view of the world. It used to be enough to call is_repository_shallow at the start of pack-objects. Upload-pack wrote the other side's shallow state to a temporary file and pointed the whole pack-objects process at this state with "git --shallow-file", and from the perspective of pack-objects, we really were in a shallow repo. But since b790e0f (upload-pack: send shallow info over stdin to pack-objects, 2014-03-11), we do it differently: we send --shallow lines to pack-objects over stdin, and it registers them itself. This means that our is_repository_shallow check is way too early (we have not been told about the shallowness yet), and that it is insufficient (calling is_repository_shallow is not enough, as the shallow grafts we register do not change its return value). Instead, we can just turn off bitmaps explicitly when we see these lines. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-10Merge branch 'master' of git://ozlabs.org/~paulus/gitkLibravatar Junio C Hamano2-323/+341
* 'master' of git://ozlabs.org/~paulus/gitk: gitk: Updated Bulgarian translation (302t,0f,0u) gitk: Add keybinding to switch to parent commit
2014-08-08Git 2.1-rc2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-08gitk: Updated Bulgarian translation (302t,0f,0u)Libravatar Alexander Shopov1-323/+329
Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-08-08gitk: Add keybinding to switch to parent commitLibravatar Max Kirillov1-0/+12
Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
2014-08-07Merge branch 'mb/relnotes-2.1'Libravatar Junio C Hamano1-61/+53
* mb/relnotes-2.1: Release notes: grammatical fixes RelNotes: no more check_ref_format micro-optimization
2014-08-07Release notes: grammatical fixesLibravatar Marc Branchaud1-55/+53
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-07various contrib: Fix links in man pagesLibravatar Stefan Beller3-3/+3
Inspired by 2147fa7e (2014-07-31 git-push: fix link in man page), I grepped through the whole tree searching for 'gitlink:' occurrences. Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-07l10n: fr.po (2257t) update for version 2.1.0Libravatar Jean-Noel Avila1-1353/+1518
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2014-08-05RelNotes: no more check_ref_format micro-optimizationLibravatar Junio C Hamano1-6/+0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-05Merge remote-tracking branch 'l10n/vi/vnwildman/master'Libravatar Jiang Xin1-1350/+1503
* l10n/vi/vnwildman/master: l10n: vi.po (2257t): Update translation
2014-08-05Merge branch 'master' of github.com:alshopov/git-poLibravatar Jiang Xin1-549/+601
* 'master' of github.com:alshopov/git-po: l10n: Updated Bulgarian translation of git (2257t,0f,0u)
2014-08-05l10n: sv.po: Update Swedish translation (2257t0f0u)Libravatar Peter Krefting1-1342/+1493
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2014-08-05l10n: vi.po (2257t): Update translationLibravatar Tran Ngoc Quan1-1350/+1503
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2014-08-04Git 2.1.0-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-04Merge branch 'tf/maint-doc-push'Libravatar Junio C Hamano1-1/+1
* tf/maint-doc-push: git-push: fix link in man page
2014-08-04Merge branch 'ta/doc-config'Libravatar Junio C Hamano1-1/+30
* ta/doc-config: add documentation for writing config files
2014-08-04archive: honor tar.umask even for pax headersLibravatar brian m. carlson2-2/+7
git archive's tar format uses extended pax headers to encode metadata into the archive. Most tar implementations correctly treat these as metadata, but some that do not understand the pax format extract these as files instead. Apply the tar.umask setting to these entries to prevent tampering by other users. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-08-04l10n: Updated Bulgarian translation of git (2257t,0f,0u)Libravatar Alexander Shopov1-549/+601
Sync with tags v2.1.0-rc1 and v2.0.4 Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2014-08-04l10n: zh_CN: translations for git v2.1.0-rc0Libravatar Jiang Xin1-1342/+1480
Translate 37 new messages (2257t0f0u) for git v2.1.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-08-04Merge commit 'bg/alshopov/master'Libravatar Jiang Xin1-2208/+2694
* commit 'bg/alshopov/master': l10n: Updated Bulgarian translation of git (2247t,0f,0u) l10n: Updated Bulgarian translation of git (2228t,0f,0u)
2014-08-04Merge remote-tracking branch 'sv/nafmo/master'Libravatar Jiang Xin1-19/+19
* sv/nafmo/master: l10n: Fix more typos in the Swedish translations
2014-08-04l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)Libravatar Jiang Xin1-1332/+1472
Generate po/git.pot from v2.1.0-rc0 for git v2.1.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-08-03l10n: Updated Bulgarian translation of git (2247t,0f,0u)Libravatar Alexander Shopov1-1252/+1348
Used make po/git.pot from git-l10n/git-po/master Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2014-08-03l10n: Updated Bulgarian translation of git (2228t,0f,0u)Libravatar Alexander Shopov1-962/+1352
Used po/git.pot from git-l10n/git-po/master Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2014-07-31git-push: fix link in man pageLibravatar Tony Finch1-1/+1
Signed-off-by: Tony Finch <dot@dotat.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-07-30Sync with 2.0.4Libravatar Junio C Hamano3-1/+8
* maint: Git 2.0.4 commit --amend: test specifies authorship but forgets to check
2014-07-30Update draft release notes to 2.1Libravatar Junio C Hamano1-3/+5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 11:21:14 +0000