summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* revision: do not fallback to default when rev_input_given is setjk/rev-list-empty-inputJeff King2017-08-022-1/+7
| | | | | | | | | | | | | If revs->def is set (as it is in "git log") and there are no pending objects after parsing the user's input, then we show whatever is in "def". But if the user _did_ ask for some input that just happened to be empty (e.g., "--glob" that does not match anything), showing the default revision is confusing. We should just show nothing, as that is what the user's request yielded. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* rev-list: don't show usage when we see empty ref patternsJeff King2017-08-022-4/+5
| | | | | | | | | | | | If the user gives us no starting point for a traversal, we want to complain with our normal usage message. But if they tried to do so with "--all" or "--glob", but that happened not to match any refs, the usage message isn't helpful. We should just give them the empty output they asked for instead. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* revision: add rev_input_given flagJeff King2017-08-022-0/+8
| | | | | | | | | | | | | | | | | | | | | | | Normally a caller that invokes setup_revisions() has to check rev.pending to see if anything was actually queued for the traversal. But they can't tell the difference between two cases: 1. The user gave us no tip from which to start a traversal. 2. The user tried to give us tips via --glob, --all, etc, but their patterns ended up being empty. Let's set a flag in the rev_info struct that callers can use to tell the difference. We can set this from the init_all_refs_cb() function. That's a little funny because it's not exactly about initializing the "cb" struct itself. But that function is the common setup place for doing pattern traversals that is used by --glob, --all, etc. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* t6018: flesh out empty input/output rev-list testsJeff King2017-08-021-11/+9
| | | | | | | | | | | | | | | | | | | | In 751a2ac6e (rev-list --exclude: tests, 2013-11-01), we added a few tests for handling "empty" inputs with rev-list (i.e., where the user gave us some pattern but it turned out not to queue any objects for traversal), all of which were marked as failing. In preparation for working on this area of the code, let's give each test a more descriptive name. Let's also include one more case which we should cover: feeding a --glob pattern that doesn't match anything. We can also drop the explanatory comment; we'll be converting these to expect_success in the next few patches, so the discussion isn't necessary. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2017-08-029-15801/+17022
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n for Git 2.14.0 round 2 * tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po: l10n: zh_CN: review for git v2.14.0 l10n l10n: ko.po: Update Korean translation l10n: zh_CN: for git v2.14.0 l10n round 2 l10n: de.po: various fixes in German translation l10n: ru.po: update Russian translation l10n: fr.po v2.14.0 rnd 2 l10n: fr.po Fix some french typos l10n: fr.po Fix typo l10n: fr.po Fix some translations l10n: de.po: update German translation l10n: vi.po (3213t): Updated 9 new strings l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3213t)
| * l10n: zh_CN: review for git v2.14.0 l10nJiang Xin2017-08-022-8/+10
| | | | | | | | | | Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * l10n: ko.po: Update Korean translationChangwoo Ryu2017-08-011-13/+56
| | | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| * l10n: zh_CN: for git v2.14.0 l10n round 2Jiang Xin2017-08-011-3165/+3147
| | | | | | | | | | | | | | Translate new l10n messages for git 2.14.0, and update translations on "stash". Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * l10n: de.po: various fixes in German translationHartmut Henkel2017-07-301-27/+25
| | | | | | | | | | | | | | Signed-off-by: Hartmut Henkel <henkel@vh-s.de> Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
| * Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2017-07-301-3027/+3137
| |\ | | | | | | | | | | | | * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
| | * l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-07-301-3027/+3137
| | | | | | | | | | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
| * | Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin2017-07-271-3010/+3181
| |\ \ | | | | | | | | | | | | | | | | * 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: update German translation
| | * | l10n: de.po: update German translationRalf Thielow2017-07-261-3010/+3181
| | | | | | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| * | | Merge branch 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/gitJiang Xin2017-07-271-3038/+3222
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/git: l10n: fr.po v2.14.0 rnd 2 l10n: fr.po Fix some french typos l10n: fr.po Fix typo l10n: fr.po Fix some translations
| | * | l10n: fr.po v2.14.0 rnd 2Jean-Noel Avila2017-07-271-3009/+3193
| | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr>
| | * | l10n: fr.po Fix some french typosSylvestre Ledru2017-07-271-17/+17
| | | | | | | | | | | | | | | | Signed-off-by: Sylvestre Ledru <sylvestre@debian.org>
| | * | l10n: fr.po Fix typoLouis2017-07-271-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Louis <spalax@gresille.org>
| | * | l10n: fr.po Fix some translationsHugues Peccatte2017-07-271-13/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Hugues Peccatte <hugues.peccatte@aareon.fr> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| * | | Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2017-07-261-3453/+4119
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation
| | * | | l10n: Update Catalan translationJordi Mas2017-07-241-3453/+4119
| | |/ / | | | | | | | | | | | | Signed-off-by: Jordi Mas <jmas@softcatala.org>
| * | | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2017-07-261-17/+67
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (3213t)
| | * | | l10n: bg.po: Updated Bulgarian translation (3213t)Alexander Shopov2017-07-241-17/+67
| | |/ / | | | | | | | | | | | | Signed-off-by: Alexander Shopov <ash@kambanaria.org>
| * | | l10n: vi.po (3213t): Updated 9 new stringsTran Ngoc Quan2017-07-251-50/+65
| |/ / | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
* | | Sync with v2.13.4Junio C Hamano2017-08-010-0/+0
|\ \ \
| * | | Git 2.13.4v2.13.4Junio C Hamano2017-08-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Sync with maintJunio C Hamano2017-07-311-0/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | * maint: Preparation for 2.13.4 continues
| * | | Preparation for 2.13.4 continuesJunio C Hamano2017-07-311-0/+18
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Merge branch 'ks/doc-fixes' into maintJunio C Hamano2017-07-312-10/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability
| * \ \ \ Merge branch 'jk/test-copy-bytes-fix' into maintJunio C Hamano2017-07-311-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A test fix. * jk/test-copy-bytes-fix: t: handle EOF in test_copy_bytes()
| * \ \ \ \ Merge branch 'pw/unquote-path-in-git-pm' into maintJunio C Hamano2017-07-313-43/+61
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code refactoring. * pw/unquote-path-in-git-pm: t9700: add tests for Git::unquote_path() Git::unquote_path(): throw an exception on bad path Git::unquote_path(): handle '\a' add -i: move unquote_path() to Git.pm
| * \ \ \ \ \ Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano2017-07-312-0/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We run an early part of "git gc" that deals with refs before daemonising (and not under lock) even when running a background auto-gc, which caused multiple gc processes attempting to run the early part at the same time. This is now prevented by running the early part also under the GC lock. * jk/gc-pre-detach-under-hook: gc: run pre-detach operations under lock
| * \ \ \ \ \ \ Merge branch 'jn/hooks-pre-rebase-sample-fix' into maintJunio C Hamano2017-07-311-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code clean-up, that makes us in sync with Debian by one patch. * jn/hooks-pre-rebase-sample-fix: pre-rebase hook: capture documentation in a <<here document
| * \ \ \ \ \ \ \ Merge branch 'rs/progress-overall-throughput-at-the-end' into maintJunio C Hamano2017-07-311-2/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The progress meter did not give a useful output when we haven't had 0.5 seconds to measure the throughput during the interval. Instead show the overall throughput rate at the end, which is a much more useful number. * rs/progress-overall-throughput-at-the-end: progress: show overall rate in last update
| * \ \ \ \ \ \ \ \ Merge branch 'tb/push-to-cygwin-unc-path' into maintJunio C Hamano2017-07-315-0/+27
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Cygwin, similar to Windows, "git push //server/share/repository" ought to mean a repository on a network share that can be accessed locally, but this did not work correctly due to stripping the double slashes at the beginning. This may need to be heavily tested before it gets unleashed to the wild, as the change is at a fairly low-level code and would affect not just the code to decide if the push destination is local. There may be unexpected fallouts in the path normalization. * tb/push-to-cygwin-unc-path: cygwin: allow pushing to UNC paths
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano2017-07-311-4/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code cleanup. * rs/apply-avoid-over-reading: apply: use strcmp(3) for comparing strings in gitdiff_verify_name() apply: use starts_with() in gitdiff_verify_name()
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'js/blame-lib'Junio C Hamano2017-07-311-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A hotfix to a topic already in 'master'. * js/blame-lib: blame: fix memory corruption scrambling revision name in error message
| * | | | | | | | | | | | blame: fix memory corruption scrambling revision name in error messagejs/blame-libSZEDER Gábor2017-07-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When attempting to blame a non-existing path, git should show an error message like this: $ git blame e83c51633 -- nonexisting-file fatal: no such path nonexisting-file in e83c51633 Since the recent commit 835c49f7d (blame: rework methods that determine 'final' commit, 2017-05-24) the revision name is either missing or some scrambled characters are shown instead. The reason is that the revision name must be duplicated, because it is invalidated when the pending objects array is cleared in the meantime, but this commit dropped the duplication. Restore the duplication of the revision name in the affected functions (find_single_final() and find_single_initial()). Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | | | Git 2.14-rc1v2.14.0-rc1Junio C Hamano2017-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | | | Merge https://github.com/git-l10n/git-poJunio C Hamano2017-07-247-18800/+20664
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * https://github.com/git-l10n/git-po: l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed) l10n: sv.po: Update Swedish translation (3206t0f0u) l10n: ko.po: Update Korean translation l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3206t) l10n: vi.po(3206t): Update Vietnamese translation l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed) l10n: ru.po: update Russian translation l10n: Fixes to Catalan translation
| * | | | | | | | | | | | l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)Jiang Xin2017-07-241-10/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.14.0-rc0-40-g5eada8987e for git v2.14.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2017-07-247-18830/+20644
| |\ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: l10n: sv.po: Update Swedish translation (3206t0f0u) l10n: ko.po: Update Korean translation l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3206t) l10n: vi.po(3206t): Update Vietnamese translation l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed) l10n: ru.po: update Russian translation l10n: Fixes to Catalan translation
| * | | | | | | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2017-07-221-3103/+3271
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3206t0f0u)
| | * | | | | | | | | | | l10n: sv.po: Update Swedish translation (3206t0f0u)Peter Krefting2017-07-201-3103/+3271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| * | | | | | | | | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2017-07-191-3228/+3585
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| * | | | | | | | | | | l10n: Update Catalan translationJordi Mas2017-07-181-1071/+602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jordi Mas <jmas@softcatala.org>
| * | | | | | | | | | | l10n: bg.po: Updated Bulgarian translation (3206t)Alexander Shopov2017-07-161-3048/+3111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Shopov <ash@kambanaria.org>
| * | | | | | | | | | | l10n: vi.po(3206t): Update Vietnamese translationTran Ngoc Quan2017-07-151-3013/+3180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| * | | | | | | | | | | l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed)Jiang Xin2017-07-151-2993/+3059
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.14.0-rc0 for git v2.14.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-poJiang Xin2017-07-152-2378/+3840
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'maint' of git://github.com/git-l10n/git-po: l10n: ru.po: update Russian translation l10n: Fixes to Catalan translation
| | * | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-06-111-2369/+3831
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>