aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* cleanups: ensure that git-compat-util.h is included firstDavid Aguilar2014-09-15
| | | | | | | | | CodingGuidelines states that the first #include in C files should be git-compat-util.h or another header file that includes it, such as cache.h or builtin.h. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge git://github.com/git-l10n/git-poJunio C Hamano2014-08-29
|\ | | | | | | | | | | * git://github.com/git-l10n/git-po: po/TEAMS: add new members to German translation team l10n: de.po: translate 38 new messages
| * po/TEAMS: add new members to German translation teamRalf Thielow2014-08-29
| | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| * l10n: de.po: translate 38 new messagesRalf Thielow2014-08-29
| | | | | | | | | | | | | | 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>
* | Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2014-08-26
|\ \ | | | | | | | | | | | | | | | | | | 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
| * | intersect_paths: respect mode in git's tree-sortJeff King2014-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | pack-objects: turn off bitmaps when we see --shallow linesJeff King2014-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'jk/fix-profile-feedback-build'Junio C Hamano2014-08-26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix profile-feedback build broken in 2.1 for tarball releases. * jk/fix-profile-feedback-build: Makefile: make perf tests optional for profile build
| * | | | Makefile: make perf tests optional for profile buildJeff King2014-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-08-25
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | l10n: de.po: improve message when switching branchesRalf Thielow2014-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | Suggested-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| * | | | l10n: de.po: fix typoRalf Thielow2014-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | Reported-by: Hartmut Henkel Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| * | | | po/TEAMS: Add Catalan teamAlex Henrie2014-08-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
| * | | | l10n: Add Catalan translationAlex Henrie2014-08-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
| * | | | l10n: fr.po (2257t) update for version 2.1.0Jean-Noel Avila2014-08-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| * | | | Merge remote-tracking branch 'l10n/vi/vnwildman/master'Jiang Xin2014-08-05
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * l10n/vi/vnwildman/master: l10n: vi.po (2257t): Update translation
| | * | | | l10n: vi.po (2257t): Update translationTran Ngoc Quan2014-08-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| * | | | | Merge branch 'master' of github.com:alshopov/git-poJiang Xin2014-08-05
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:alshopov/git-po: l10n: Updated Bulgarian translation of git (2257t,0f,0u)
| | * | | | | l10n: Updated Bulgarian translation of git (2257t,0f,0u)Alexander Shopov2014-08-04
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with tags v2.1.0-rc1 and v2.0.4 Signed-off-by: Alexander Shopov <ash@kambanaria.org>
| * | | | | l10n: sv.po: Update Swedish translation (2257t0f0u)Peter Krefting2014-08-05
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| * | | | l10n: zh_CN: translations for git v2.1.0-rc0Jiang Xin2014-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate 37 new messages (2257t0f0u) for git v2.1.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | | Merge commit 'bg/alshopov/master'Jiang Xin2014-08-04
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bg/alshopov/master': l10n: Updated Bulgarian translation of git (2247t,0f,0u) l10n: Updated Bulgarian translation of git (2228t,0f,0u)
| | * | | | l10n: Updated Bulgarian translation of git (2247t,0f,0u)Alexander Shopov2014-08-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used make po/git.pot from git-l10n/git-po/master Signed-off-by: Alexander Shopov <ash@kambanaria.org>
| | * | | | l10n: Updated Bulgarian translation of git (2228t,0f,0u)Alexander Shopov2014-08-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used po/git.pot from git-l10n/git-po/master Signed-off-by: Alexander Shopov <ash@kambanaria.org>
| * | | | | Merge remote-tracking branch 'sv/nafmo/master'Jiang Xin2014-08-04
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sv/nafmo/master: l10n: Fix more typos in the Swedish translations
| | * | | | | l10n: Fix more typos in the Swedish translationsPeter Krefting2014-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks-to: Anders Jonsson <anders.jonsson@norsjovallen.se> Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| * | | | | | l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)Jiang Xin2014-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Git 2.1v2.1.0Junio C Hamano2014-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | tests: fix negated test_i18ngrep callsJohannes Sixt2014-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano2014-08-10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Updated Bulgarian translation (302t,0f,0u) gitk: Add keybinding to switch to parent commit
| * | | | | | | gitk: Updated Bulgarian translation (302t,0f,0u)Alexander Shopov2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | | | | | gitk: Add keybinding to switch to parent commitMax Kirillov2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | | | | | | Git 2.1-rc2v2.1.0-rc2Junio C Hamano2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | Merge branch 'mb/relnotes-2.1'Junio C Hamano2014-08-07
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mb/relnotes-2.1: Release notes: grammatical fixes RelNotes: no more check_ref_format micro-optimization
| * | | | | | | | Release notes: grammatical fixesMarc Branchaud2014-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | RelNotes: no more check_ref_format micro-optimizationJunio C Hamano2014-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | various contrib: Fix links in man pagesStefan Beller2014-08-07
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | Git 2.1.0-rc1v2.1.0-rc1Junio C Hamano2014-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | Merge branch 'tf/maint-doc-push'Junio C Hamano2014-08-04
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tf/maint-doc-push: git-push: fix link in man page
| * | | | | | | | git-push: fix link in man pageTony Finch2014-07-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tony Finch <dot@dotat.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | Merge branch 'ta/doc-config'Junio C Hamano2014-08-04
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ta/doc-config: add documentation for writing config files
| * | | | | | | | | add documentation for writing config filesTanay Abhra2014-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace TODO introduced in commit 9c3c22 with documentation explaining Git config API functions for writing configuration files. Signed-off-by: Tanay Abhra <tanayabh@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | Sync with 2.0.4Junio C Hamano2014-07-30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Git 2.0.4 commit --amend: test specifies authorship but forgets to check
| * | | | | | | | | | Git 2.0.4v2.0.4Junio C Hamano2014-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | | | commit --amend: test specifies authorship but forgets to checkFabian Ruch2014-07-30
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test case "--amend option copies authorship" specifies that the git-commit option `--amend` uses the authorship of the replaced commit for the new commit. Add the omitted check that this property actually holds. Signed-off-by: Fabian Ruch <bafain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | Update draft release notes to 2.1Junio C Hamano2014-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | Merge branch 'jk/more-push-completion'Junio C Hamano2014-07-30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jk/more-push-completion: completion: complete `git push --force-with-lease=` completion: add some missing options to `git push` completion: complete "unstuck" `git push --recurse-submodules`
| * | | | | | | | | | completion: complete `git push --force-with-lease=`John Keeping2014-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | | | completion: add some missing options to `git push`John Keeping2014-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>