| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
* 'svn-glob' of git://bogomips.org/git-svn:
git-svn: shorten glob error message
git-svn: loosen config globs limitations
|
|
l10n-2.8.0-rnd2
* tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits)
l10n: zh_CN: for git v2.8.0 l10n round 3
l10n: git.pot: Add one new message for Git 2.8.0
l10n: zh_CN: for git v2.8.0 l10n round 2
l10n: fr.po v2.8.0 round 2
l10n: ru.po: update Russian translation
l10n: ko: Update Korean translation
l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)
l10n: zh_CN: for git v2.8.0 l10n round 1
l10n: de.po: translate 48 new messages
l10n: de.po: translate "command" as "Befehl"
l10n: de.po: fix interactive rebase message
l10n: de.po: add space to abbreviation "z. B."
l10n: de.po: fix typo
l10n: TEAMS: update Ralf Thielow's email address
l10n: sv.po: Update Swedish translation (2509t0f0u)
l10n: sv.po: Fix inconsistent translation of "progress meter"
l10n: ko.po: Update Korean translation
l10n: ru.po: update Russian translation
l10n: vi.po (2509t): Updated Vietnamese translation
l10n: fr.po v2.8.0 round 1 2509t
...
|
|
Update 1 new translations (2530t0f0u) for git v2.8.0-rc2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
|
|
Add one new message came from this commit:
* df22724 wt-status: allow "ahead " to be picked up by l10n
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
|
|
* 'master' of git://github.com/git-l10n/git-po:
l10n: zh_CN: for git v2.8.0 l10n round 2
l10n: fr.po v2.8.0 round 2
l10n: ru.po: update Russian translation
l10n: ko: Update Korean translation
l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)
l10n: zh_CN: for git v2.8.0 l10n round 1
l10n: de.po: translate 48 new messages
l10n: de.po: translate "command" as "Befehl"
l10n: de.po: fix interactive rebase message
l10n: de.po: add space to abbreviation "z. B."
l10n: de.po: fix typo
l10n: TEAMS: update Ralf Thielow's email address
l10n: sv.po: Update Swedish translation (2509t0f0u)
l10n: sv.po: Fix inconsistent translation of "progress meter"
l10n: ko.po: Update Korean translation
l10n: ru.po: update Russian translation
l10n: vi.po (2509t): Updated Vietnamese translation
l10n: fr.po v2.8.0 round 1 2509t
l10n: fr.po: Correct case in sentence
l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)
|
|
Update 21 new translations (2529t0f0u) for git v2.8.0-rc2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
|
|
Error messages should attempt to fit within the confines of
an 80-column terminal to avoid compatibility and accessibility
problems. Furthermore the word "directories" can be misleading
when used in the context of git refnames.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
|
|
Expand the area of globs applicability for branches and tags
in git-svn. It is now possible to use globs like 'a*e', or 'release_*'.
This allows users to avoid long lines in config like:
branches = branches/{release_20,release_21,release_22,...}
In favor of:
branches = branches/release_*
[ew: amended commit message, minor formatting and style fixes]
Signed-off-by: Victor Leschuk <vleschuk@accesssoftek.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
|
|
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
|
|
* mg/wt-status-mismarked-i18n:
wt-status: allow "ahead " to be picked up by l10n
|
|
The extra pair of parentheses keeps the l10n engine from picking up the
string. Remove them so that "ahead " ends up in git.pot.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
l10n: ru.po: update Russian translation
|
|
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
|
|
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
|
|
Generate po/git.pot from v2.8.0-rc2 for git v2.8.0 l10n round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
|
|
* 'master' of git://github.com/git-l10n/git-po:
l10n: zh_CN: for git v2.8.0 l10n round 1
l10n: de.po: translate 48 new messages
l10n: de.po: translate "command" as "Befehl"
l10n: de.po: fix interactive rebase message
l10n: de.po: add space to abbreviation "z. B."
l10n: de.po: fix typo
l10n: TEAMS: update Ralf Thielow's email address
l10n: sv.po: Update Swedish translation (2509t0f0u)
l10n: sv.po: Fix inconsistent translation of "progress meter"
l10n: ko.po: Update Korean translation
l10n: ru.po: update Russian translation
l10n: vi.po (2509t): Updated Vietnamese translation
l10n: fr.po v2.8.0 round 1 2509t
l10n: fr.po: Correct case in sentence
l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)
|
|
Update 48 new translations (2509t0f0u) for git v2.8.0-rc0.
Reviewed-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
l10n: zh_CN: review for git v2.8.0 l10n round 1
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* ma/update-hooks-sample-typofix:
templates/hooks: fix minor typo in the sample update-hook
|
|
* dt/initial-ref-xn-commit-doc:
refs: document transaction semantics
|
|
* ps/plug-xdl-merge-leak:
xdiff/xmerge: fix memory leak in xdl_merge
|
|
Code simplification.
* ak/git-strip-extension-from-dashed-command:
git.c: simplify stripping extension of a file in handle_builtin()
|
|
Code simplification.
* ak/extract-argv0-last-dir-sep:
exec_cmd.c: use find_last_dir_sep() for code simplification
|
|
The code to read the pack data using the offsets stored in the pack
idx file has been made more carefully check the validity of the
data in the idx.
* jk/pack-idx-corruption-safety:
sha1_file.c: mark strings for translation
use_pack: handle signed off_t overflow
nth_packed_object_offset: bounds-check extended offset
t5313: test bounds-checks of corrupted/malicious pack/idx files
|
|
"git config section.var value" to set a value in per-repository
configuration file failed when it was run outside any repository,
but didn't say the reason correctly.
* js/config-set-in-non-repository:
git config: report when trying to modify a non-existing repo config
|
|
A helper function "git submodule" uses since v2.7.0 to list the
modules that match the pathspec argument given to its subcommands
(e.g. "submodule add <repo> <path>") has been fixed.
* sb/submodule-module-list-fix:
submodule helper list: respect correct path prefix
|
|
Recent versions of GNU grep are pickier when their input contains
arbitrary binary data, which some of our tests uses. Rewrite the
tests to sidestep the problem.
* jk/grep-binary-workaround-in-test:
t9200: avoid grep on non-ASCII data
t8005: avoid grep on non-ASCII data
|
|
The documentation did not clearly state that the 'simple' mode is
now the default for "git push" when push.default configuration is
not set.
* mm/push-simple-doc:
Documentation/git-push: document that 'simple' is the default
|
|
* jk/tighten-alloc: (23 commits)
compat/mingw: brown paper bag fix for 50a6c8e
ewah: convert to REALLOC_ARRAY, etc
convert ewah/bitmap code to use xmalloc
diff_populate_gitlink: use a strbuf
transport_anonymize_url: use xstrfmt
git-compat-util: drop mempcpy compat code
sequencer: simplify memory allocation of get_message
test-path-utils: fix normalize_path_copy output buffer size
fetch-pack: simplify add_sought_entry
fast-import: simplify allocation in start_packfile
write_untracked_extension: use FLEX_ALLOC helper
prepare_{git,shell}_cmd: use argv_array
use st_add and st_mult for allocation size computation
convert trivial cases to FLEX_ARRAY macros
use xmallocz to avoid size arithmetic
convert trivial cases to ALLOC_ARRAY
convert manual allocations to argv_array
argv-array: add detach function
add helpers for allocating flex-array structs
harden REALLOC_ARRAY and xcalloc against size_t overflow
...
|
|
The memory ownership rule of fill_textconv() API, which was a bit
tricky, has been documented a bit better.
* jk/more-comments-on-textconv:
diff: clarify textconv interface
|
|
"git merge-tree" used to mishandle "both sides added" conflict with
its own "create a fake ancestor file that has the common parts of
what both sides have added and do a 3-way merge" logic; this has
been updated to use the usual "3-way merge with an empty blob as
the fake common ancestor file" approach used in the rest of the
system.
* jk/no-diff-emit-common:
xdiff: drop XDL_EMIT_COMMON
merge-tree: drop generate_common strategy
merge-one-file: use empty blob for add/add base
|
|
The "v(iew)" subcommand of the interactive "git am -i" command was
broken in 2.6.0 timeframe when the command was rewritten in C.
* jc/am-i-v-fix:
am -i: fix "v"iew
pager: factor out a helper to prepare a child process to run the pager
pager: lose a separate argv[]
|
|
"git rev-parse --git-common-dir" used in the worktree feature
misbehaved when run from a subdirectory.
* nd/git-common-dir-fix:
rev-parse: take prefix into account in --git-common-dir
|
|
"git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
rev, i.e. the object named by the the pathname with wildcard
characters in a tree object.
* nd/dwim-wildcards-as-pathspecs:
get_sha1: don't die() on bogus search strings
check_filename: tighten dwim-wildcard ambiguity
checkout: reorder check_filename conditional
|
|
Handling of errors while writing into our internal asynchronous
process has been made more robust, which reduces flakiness in our
tests.
* jk/epipe-in-async:
t5504: handle expected output from SIGPIPE death
test_must_fail: report number of unexpected signal
fetch-pack: ignore SIGPIPE in sideband demuxer
write_or_die: handle EPIPE in async threads
|
|
Many codepaths forget to check return value from git_config_set();
the function is made to die() to make sure we do not proceed when
setting a configuration variable failed.
* ps/config-error:
config: rename git_config_set_or_die to git_config_set
config: rename git_config_set to git_config_set_gently
compat: die when unable to set core.precomposeunicode
sequencer: die on config error when saving replay opts
init-db: die on config errors when initializing empty repo
clone: die on config error in cmd_clone
remote: die on config error when manipulating remotes
remote: die on config error when setting/adding branches
remote: die on config error when setting URL
submodule--helper: die on config error when cloning module
submodule: die on config error when linking modules
branch: die on config error when editing branch description
branch: die on config error when unsetting upstream
branch: report errors in tracking branch setup
config: introduce set_or_die wrappers
|
|
Traditionally, the tests that try commands that work on the
contents in the working tree were named with "worktree" in their
filenames, but with the recent addition of "git worktree"
subcommand, whose tests are also named similarly, it has become
harder to tell them apart. The traditional tests have been renamed
to use "work-tree" instead in an attempt to differentiate them.
* mg/work-tree-tests:
tests: rename work-tree tests to *work-tree*
|
|
Help those who debug http(s) part of the system.
* sp/remote-curl-ssl-strerror:
remote-curl: include curl_errorstr on SSL setup failures
|
|
* jx/http-no-proxy:
http: honor no_http env variable to bypass proxy
|
|
* jc/exclusion-doc:
gitignore: document that unignoring a directory unignores everything in it
|
|
A small future-proofing of a test added recently.
* js/close-packs-before-gc:
t5510: do not leave changed cwd
|
|
* sb/rebase-summary:
Documentation: reword rebase summary
|
|
Also document another limitation coming from a bug in handling the
basename match with a directory for 're-inclusion'.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Translate 48 new messages came from git.pot update in
9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
|
|
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
|
|
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
|
|
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
|
|
Signed-off-by: Christoph Hoopmann <christophhoopmann@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
|
Junio C Hamano
Jiang Xin
Eric Wong
Victor Leschuk
Jean-Noel Avila
Michael J Gruber
Dimitriy Ryazantcev
Changwoo Ryu
Ralf Thielow
Christoph Hoopmann