OSDN Git Service
Junio C Hamano [Tue, 22 Mar 2016 21:41:08 +0000 (14:41 -0700)]
apply: remove unused call to free() in gitdiff_{old,new}name()
These two functions keep a copy of filename it was given, let
gitdiff_verify_name() to rewrite it to a new filename and then free
the original if they receive a newly minted filename.
However
(1) when the original name is NULL, gitdiff_verify_name() returns
either NULL or a newly minted value. Either case, we do not
have to worry about calling free() on the original NULL.
(2) when the original name is not NULL, gitdiff_verify_name()
either returns that as-is, or calls die() when it finds
inconsistency in the patch. When the function returns, we know
that "if ()" statement always is false.
Noticed by Christian Couder.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder [Tue, 22 Mar 2016 20:58:40 +0000 (21:58 +0100)]
builtin/apply: get rid of useless 'name' variable
While at it put an 'else' on the same line as the previous '}'.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 21 Mar 2016 20:41:37 +0000 (13:41 -0700)]
Git 2.8-rc4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 21 Mar 2016 20:32:42 +0000 (13:32 -0700)]
Sync with maint
* maint:
Documentation: fix broken linkgit to git-config
git-compat-util: st_add4: work around gcc 4.2.x compiler crash
Junio C Hamano [Mon, 21 Mar 2016 20:32:18 +0000 (13:32 -0700)]
Merge branch 'mm/doc-hooks-linkgit-fix' into maint
* mm/doc-hooks-linkgit-fix:
Documentation: fix broken linkgit to git-config
Matthieu Moy [Mon, 21 Mar 2016 18:38:34 +0000 (19:38 +0100)]
Documentation: fix broken linkgit to git-config
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 21 Mar 2016 16:20:13 +0000 (09:20 -0700)]
Merge branch 'tb/avoid-gcc-on-darwin-10-6'
* tb/avoid-gcc-on-darwin-10-6:
Revert "config.mak.uname: use clang for Mac OS X 10.6"
Eric Sunshine [Mon, 21 Mar 2016 04:35:58 +0000 (00:35 -0400)]
Revert "config.mak.uname: use clang for Mac OS X 10.6"
This reverts commit
7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb.
Now that st_add4() has been patched to work around the gcc 4.2.x
compiler crash, revert the sledge-hammer approach of forcing Mac OS X
10.6 to unconditionally use 'clang' rather than the default compiler
(gcc).
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 21 Mar 2016 16:19:27 +0000 (09:19 -0700)]
Merge branch 'es/st-add4-gcc-4.2-workaround' into maint
* es/st-add4-gcc-4.2-workaround:
git-compat-util: st_add4: work around gcc 4.2.x compiler crash
Eric Sunshine [Mon, 21 Mar 2016 04:35:57 +0000 (00:35 -0400)]
git-compat-util: st_add4: work around gcc 4.2.x compiler crash
Although changes by
5b442c4 (tree-diff: catch integer overflow in
combine_diff_path allocation, 2016-02-19) are perfectly valid, they
unfortunately trigger an internal compiler error in gcc 4.2.x:
combine-diff.c: In function 'diff_tree_combined':
combine-diff.c:1391: internal compiler error: Segmentation fault: 11
Experimentation reveals that changing st_add4()'s argument evaluation
order is sufficient to sidestep this problem.
Although st_add3() does not trigger the compiler bug, for style
consistency, change its argument evaluation order to match.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 21 Mar 2016 01:06:05 +0000 (18:06 -0700)]
Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po
l10n-2.8.0-rnd3
* tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po:
l10n: zh_CN: review for git v2.8.0 l10n round 2
l10n: de.po: add missing newlines
l10n: de.po: translate 22 new messages
l10n: ko.po: Update Korean translation
l10n: fr.po v2.8.0 round 3
l10n: sv.po: Update Swedish translation (2530t0f0u)
l10n: ru.po: update Russian translation
Junio C Hamano [Mon, 21 Mar 2016 01:05:10 +0000 (18:05 -0700)]
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
* 'master' of git://ozlabs.org/~paulus/gitk:
gitk: Follow themed bgcolor in help dialogs
gitk: fr.po: Sync translations with git
gitk: Update French translation (311t)
gitk: Update German translation
gitk: Update Bulgarian translation (311t)
Ray Chen [Wed, 16 Mar 2016 03:44:44 +0000 (11:44 +0800)]
l10n: zh_CN: review for git v2.8.0 l10n round 2
Signed-off-by: Ray Chen <oldsharp@gmail.com>
Guillermo S. Romero [Thu, 4 Feb 2016 02:32:19 +0000 (03:32 +0100)]
gitk: Follow themed bgcolor in help dialogs
Make Help > About & Key bindings dialogs readable if theme
has changed font color to something incompatible with white.
Signed-off-by: Guillermo S. Romero <gsromero@infernal-iceberg.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Jean-Noel Avila [Fri, 29 Jan 2016 20:21:35 +0000 (21:21 +0100)]
gitk: fr.po: Sync translations with git
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Jean-Noel Avila [Fri, 29 Jan 2016 20:21:34 +0000 (21:21 +0100)]
gitk: Update French translation (311t)
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Ralf Thielow [Fri, 12 Feb 2016 18:40:39 +0000 (19:40 +0100)]
gitk: Update German translation
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Alexander Shopov [Sat, 19 Dec 2015 22:36:09 +0000 (00:36 +0200)]
gitk: Update Bulgarian translation (311t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano [Fri, 18 Mar 2016 18:10:53 +0000 (11:10 -0700)]
RelNotes: remove the mention of !reinclusion
We will be postponing this to a later cycle.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 18 Mar 2016 18:06:15 +0000 (11:06 -0700)]
Revert "Merge branch 'nd/exclusion-regression-fix'"
This reverts commit
5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c, reversing
changes made to
e79112d21024beb997951381db21a70b087d459d.
We will be postponing nd/exclusion-regression-fix topic to later
cycle.
Junio C Hamano [Fri, 18 Mar 2016 18:05:23 +0000 (11:05 -0700)]
Revert "Merge branch 'jc/exclusion-doc'"
This reverts commit
e80aae51f2be908e37fca47ea0dff6d7861c8497, reversing
changes made to
68846a92eafa6b2bfae778d0a656443a9fa61e59.
We will be postponing nd/exclusion-regression-fix topic to later
cycle.
Junio C Hamano [Thu, 17 Mar 2016 19:54:17 +0000 (12:54 -0700)]
Sync with Git 2.7.4
* maint:
Git 2.7.4
Git 2.6.6
Git 2.5.5
Git 2.4.11
Junio C Hamano [Thu, 17 Mar 2016 18:32:13 +0000 (11:32 -0700)]
Git 2.7.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow [Thu, 17 Mar 2016 18:31:33 +0000 (19:31 +0100)]
l10n: de.po: add missing newlines
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Junio C Hamano [Thu, 17 Mar 2016 18:28:52 +0000 (11:28 -0700)]
Sync with Git 2.6.6
* maint-2.6:
Git 2.6.6
Git 2.5.5
Git 2.4.11
Junio C Hamano [Thu, 17 Mar 2016 17:56:06 +0000 (10:56 -0700)]
Git 2.6.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 17 Mar 2016 18:26:18 +0000 (11:26 -0700)]
Merge branch 'maint-2.5' into maint-2.6
* maint-2.5:
Git 2.5.5
Git 2.4.11
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Junio C Hamano [Thu, 17 Mar 2016 17:28:50 +0000 (10:28 -0700)]
Git 2.5.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 17 Mar 2016 18:24:14 +0000 (11:24 -0700)]
Merge branch 'maint-2.4' into maint-2.5
* maint-2.4:
Git 2.4.11
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Junio C Hamano [Thu, 17 Mar 2016 17:00:44 +0000 (10:00 -0700)]
Git 2.4.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 17 Mar 2016 16:55:54 +0000 (09:55 -0700)]
Merge branch 'jk/path-name-safety-2.4' into maint-2.4
Bugfix patches were backported from the 'master' front to plug heap
corruption holes, to catch integer overflow in the computation of
pathname lengths, and to get rid of the name_path API. Both of
these would have resulted in writing over an under-allocated buffer
when formulating pathnames while tree traversal.
* jk/path-name-safety-2.4:
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Ralf Thielow [Tue, 15 Mar 2016 17:09:23 +0000 (18:09 +0100)]
l10n: de.po: translate 22 new messages
Translate 22 new messages came from git.pot update in
f1522b2
(l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)) and
a5a4168
(l10n: git.pot: Add one new message for Git 2.8.0).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias RĂ¼ster <matthias.ruester@gmail.com>
Junio C Hamano [Wed, 16 Mar 2016 21:00:18 +0000 (14:00 -0700)]
Git 2.8-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 16 Mar 2016 21:13:25 +0000 (14:13 -0700)]
Merge branch 'master' of git://bogomips.org/git-svn
* 'master' of git://bogomips.org/git-svn:
git-svn: fix URL canonicalization during init w/ SVN 1.7+
t9117: test specifying full url to git svn init -T
Junio C Hamano [Wed, 16 Mar 2016 20:17:38 +0000 (13:17 -0700)]
Sync with maint
* maint:
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Junio C Hamano [Wed, 16 Mar 2016 20:16:54 +0000 (13:16 -0700)]
Merge branch 'jc/sane-grep'
Recent versions of GNU grep is pickier than before to decide if a
file is "binary" and refuse to give line-oriented hits when we
expect it to, unless explicitly told with "-a" option. As our
scripted Porcelains use sane_grep wrapper for line-oriented data,
even when the line may contain non-ASCII payload we took from
end-user data, use "grep -a" to implement sane_grep wrapper when
using an implementation of "grep" that takes the "-a" option.
* jc/sane-grep:
rebase-i: clarify "is this commit relevant?" test
sane_grep: pass "-a" if grep accepts it
Junio C Hamano [Wed, 16 Mar 2016 20:16:40 +0000 (13:16 -0700)]
Merge branch 'cn/deprecate-ssh-git-url'
The two alternative ways to spell "ssh://" transport have been
deprecated for a long time. The last mention of them has finally
removed from the documentation.
* cn/deprecate-ssh-git-url:
Disown ssh+git and git+ssh
Eric Wong [Wed, 16 Mar 2016 20:14:08 +0000 (20:14 +0000)]
git-svn: fix URL canonicalization during init w/ SVN 1.7+
URL canonicalization when full URLs are passed became broken
when using SVN::_Core::svn_dirent_canonicalize under SVN 1.7.
Ensure we canonicalize paths and URLs with appropriate functions
for each type from now on as the path/URL-agnostic
SVN::_Core::svn_path_canonicalize function is deprecated in SVN.
Tested with the following commands:
git svn init -T svn://svn.code.sf.net/p/squirrelmail/code/trunk
git svn init -b svn://svn.code.sf.net/p/squirrelmail/code/branches
Reported-by: Adam Dinwoodie <adam@dinwoodie.org>
http://mid.gmane.org/
20160315162344.GM29016@dinwoodie.org
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Junio C Hamano [Wed, 16 Mar 2016 20:15:04 +0000 (13:15 -0700)]
Merge branch 'jk/path-name-safety-2.7' into maint
* jk/path-name-safety-2.7:
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Adam Dinwoodie [Wed, 16 Mar 2016 19:09:54 +0000 (19:09 +0000)]
t9117: test specifying full url to git svn init -T
According to the documentation, full URLs can be specified in the `-T`
argument to `git svn init`. However, the canonicalization of such
arguments squashes together consecutive "/"s, which unsurprisingly
breaks http://, svn://, etc URLs. Add a failing test case to provide
evidence of that.
On systems where Subversion provides svn_path_canonicalize but not
svn_dirent_canonicalize (Subversion 1.6 and earlier?), this test passes,
as svn_path_canonicalize doesn't mangle the consecutive "/"s.
[ew: fixed whitespace]
Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Junio C Hamano [Wed, 16 Mar 2016 17:42:32 +0000 (10:42 -0700)]
Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7
* jk/path-name-safety-2.6:
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Junio C Hamano [Wed, 16 Mar 2016 17:42:02 +0000 (10:42 -0700)]
Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6
* jk/path-name-safety-2.5:
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Junio C Hamano [Wed, 16 Mar 2016 17:41:43 +0000 (10:41 -0700)]
Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5
* jk/path-name-safety-2.4:
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Jeff King [Thu, 11 Feb 2016 22:28:36 +0000 (17:28 -0500)]
list-objects: pass full pathname to callbacks
When we find a blob at "a/b/c", we currently pass this to
our show_object_fn callbacks as two components: "a/b/" and
"c". Callbacks which want the full value then call
path_name(), which concatenates the two. But this is an
inefficient interface; the path is a strbuf, and we could
simply append "c" to it temporarily, then roll back the
length, without creating a new copy.
So we could improve this by teaching the callsites of
path_name() this trick (and there are only 3). But we can
also notice that no callback actually cares about the
broken-down representation, and simply pass each callback
the full path "a/b/c" as a string. The callback code becomes
even simpler, then, as we do not have to worry about freeing
an allocated buffer, nor rolling back our modification to
the strbuf.
This is theoretically less efficient, as some callbacks
would not bother to format the final path component. But in
practice this is not measurable. Since we use the same
strbuf over and over, our work to grow it is amortized, and
we really only pay to memcpy a few bytes.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Thu, 11 Feb 2016 22:26:44 +0000 (17:26 -0500)]
list-objects: drop name_path entirely
In the previous commit, we left name_path as a thin wrapper
around a strbuf. This patch drops it entirely. As a result,
every show_object_fn callback needs to be adjusted. However,
none of their code needs to be changed at all, because the
only use was to pass it to path_name(), which now handles
the bare strbuf.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Thu, 11 Feb 2016 22:26:18 +0000 (17:26 -0500)]
list-objects: convert name_path to a strbuf
The "struct name_path" data is examined in only two places:
we generate it in process_tree(), and we convert it to a
single string in path_name(). Everyone else just passes it
through to those functions.
We can further note that process_tree() already keeps a
single strbuf with the leading tree path, for use with
tree_entry_interesting().
Instead of building a separate name_path linked list, let's
just use the one we already build in "base". This reduces
the amount of code (especially tricky code in path_name()
which did not check for integer overflows caused by deep
or large pathnames).
It is also more efficient in some instances. Any time we
were using tree_entry_interesting, we were building up the
strbuf anyway, so this is an immediate and obvious win
there. In cases where we were not, we trade off storing
"pathname/" in a strbuf on the heap for each level of the
path, instead of two pointers and an int on the stack (with
one pointer into the tree object). On a 64-bit system, the
latter is 20 bytes; so if path components are less than that
on average, this has lower peak memory usage. In practice
it probably doesn't matter either way; we are already
holding in memory all of the tree objects leading up to each
pathname, and for normal-depth pathnames, we are only
talking about hundreds of bytes.
This patch leaves "struct name_path" as a thin wrapper
around the strbuf, to avoid disrupting callbacks. We should
fix them, but leaving it out makes this diff easier to view.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Thu, 11 Feb 2016 22:24:18 +0000 (17:24 -0500)]
show_object_with_name: simplify by using path_name()
When "git rev-list" shows an object with its associated path
name, it does so by walking the name_path linked list and
printing each component (stopping at any embedded NULs or
newlines).
We'd like to eventually get rid of name_path entirely in
favor of a single buffer, and dropping this custom printing
code is part of that. As a first step, let's use path_name()
to format the list into a single buffer, and print that.
This is strictly less efficient than the original, but it's
a temporary step in the refactoring; our end game will be to
get the fully formatted name in the first place.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Fri, 19 Feb 2016 11:21:19 +0000 (06:21 -0500)]
add helpers for detecting size_t overflow
Performing computations on size_t variables that we feed to
xmalloc and friends can be dangerous, as an integer overflow
can cause us to allocate a much smaller chunk than we
realized.
We already have unsigned_add_overflows(), but let's add
unsigned_mult_overflows() to that. Furthermore, rather than
have each site manually check and die on overflow, we can
provide some helpers that will:
- promote the arguments to size_t, so that we know we are
doing our computation in the same size of integer that
will ultimately be fed to xmalloc
- check and die on overflow
- return the result so that computations can be done in
the parameter list of xmalloc.
These functions are a lot uglier to use than normal
arithmetic operators (you have to do "st_add(foo, bar)"
instead of "foo + bar"). To at least limit the damage, we
also provide multi-valued versions. So rather than:
st_add(st_add(a, b), st_add(c, d));
you can write:
st_add4(a, b, c, d);
This isn't nearly as elegant as a varargs function, but it's
a lot harder to get it wrong. You don't have to remember to
add a sentinel value at the end, and the compiler will
complain if you get the number of arguments wrong. This
patch adds only the numbered variants required to convert
the current code base; we can easily add more later if
needed.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Thu, 11 Feb 2016 22:23:48 +0000 (17:23 -0500)]
http-push: stop using name_path
The graph traversal code here passes along a name_path to
build up the pathname at which we find each blob. But we
never actually do anything with the resulting names, making
it a waste of code and memory.
This usage came in
aa1dbc9 (Update http-push functionality,
2006-03-07), and originally the result was passed to
"add_object" (which stored it, but didn't really use it,
either). But we stopped using that function in
1f1e895 (Add
"named object array" concept, 2006-06-19) in favor of
storing just the objects themselves.
Moreover, the generation of the name in process_tree() is
buggy. It sticks "name" onto the end of the name_path linked
list, and then passes it down again as it recurses (instead
of "entry.path"). So it's a good thing this was unused, as
the resulting path for "a/b/c/d" would end up as "a/a/a/a".
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Fri, 19 Feb 2016 11:21:30 +0000 (06:21 -0500)]
tree-diff: catch integer overflow in combine_diff_path allocation
A combine_diff_path struct has two "flex" members allocated
alongside the struct: a string to hold the pathname, and an
array of parent pointers. We use an "int" to compute this,
meaning we may easily overflow it if the pathname is
extremely long.
We can fix this by using size_t, and checking for overflow
with the st_add helper.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin [Wed, 16 Mar 2016 16:11:54 +0000 (00:11 +0800)]
Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git
* 'fr_v2.8.0_r3' of git://github.com/jnavila/git:
l10n: fr.po v2.8.0 round 3
Jiang Xin [Wed, 16 Mar 2016 16:11:13 +0000 (00:11 +0800)]
Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko
* 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko:
l10n: ko.po: Update Korean translation
Jiang Xin [Wed, 16 Mar 2016 16:10:23 +0000 (00:10 +0800)]
Merge branch 'master' of git://github.com/nafmo/git-l10n-sv
* 'master' of git://github.com/nafmo/git-l10n-sv:
l10n: sv.po: Update Swedish translation (2530t0f0u)
Changwoo Ryu [Wed, 16 Mar 2016 01:33:12 +0000 (10:33 +0900)]
l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
Jean-Noel Avila [Tue, 15 Mar 2016 22:01:59 +0000 (23:01 +0100)]
l10n: fr.po v2.8.0 round 3
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Peter Krefting [Tue, 15 Mar 2016 21:37:55 +0000 (22:37 +0100)]
l10n: sv.po: Update Swedish translation (2530t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Dimitriy Ryazantcev [Tue, 15 Mar 2016 18:55:36 +0000 (20:55 +0200)]
l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
Junio C Hamano [Mon, 14 Mar 2016 18:11:25 +0000 (11:11 -0700)]
RelNotes for 2.8.0: typofix
Helped-by: Max Horn
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 15 Mar 2016 17:32:20 +0000 (10:32 -0700)]
Merge branch 'svn-glob' of git://bogomips.org/git-svn
* 'svn-glob' of git://bogomips.org/git-svn:
git-svn: shorten glob error message
git-svn: loosen config globs limitations
Junio C Hamano [Tue, 15 Mar 2016 17:13:15 +0000 (10:13 -0700)]
Merge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po
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
...
Jiang Xin [Tue, 15 Mar 2016 16:27:40 +0000 (00:27 +0800)]
l10n: zh_CN: for git v2.8.0 l10n round 3
Update 1 new translations (2530t0f0u) for git v2.8.0-rc2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Tue, 15 Mar 2016 16:20:14 +0000 (00:20 +0800)]
l10n: git.pot: Add one new message for Git 2.8.0
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>
Jiang Xin [Tue, 15 Mar 2016 16:15:59 +0000 (00:15 +0800)]
Merge branch 'master' of git://github.com/git-l10n/git-po
* '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)
Jiang Xin [Sat, 12 Mar 2016 14:09:24 +0000 (22:09 +0800)]
l10n: zh_CN: for git v2.8.0 l10n round 2
Update 21 new translations (2529t0f0u) for git v2.8.0-rc2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Eric Wong [Thu, 14 Jan 2016 03:59:48 +0000 (03:59 +0000)]
git-svn: shorten glob error message
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>
Victor Leschuk [Mon, 11 Jan 2016 14:25:58 +0000 (17:25 +0300)]
git-svn: loosen config globs limitations
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>
Jean-Noel Avila [Mon, 14 Mar 2016 19:26:53 +0000 (20:26 +0100)]
l10n: fr.po v2.8.0 round 2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Junio C Hamano [Mon, 14 Mar 2016 17:46:17 +0000 (10:46 -0700)]
Merge branch 'mg/wt-status-mismarked-i18n'
* mg/wt-status-mismarked-i18n:
wt-status: allow "ahead " to be picked up by l10n
Michael J Gruber [Mon, 14 Mar 2016 15:30:33 +0000 (16:30 +0100)]
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>
Jiang Xin [Sun, 13 Mar 2016 13:41:46 +0000 (21:41 +0800)]
Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
l10n: ru.po: update Russian translation
Dimitriy Ryazantcev [Sun, 13 Mar 2016 00:07:09 +0000 (02:07 +0200)]
l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
Changwoo Ryu [Sat, 12 Mar 2016 17:32:52 +0000 (02:32 +0900)]
l10n: ko: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
Jiang Xin [Sat, 12 Mar 2016 14:05:35 +0000 (22:05 +0800)]
l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)
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>
Jiang Xin [Sat, 12 Mar 2016 14:04:39 +0000 (22:04 +0800)]
Merge branch 'master' of git://github.com/git-l10n/git-po
* '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)
Jiang Xin [Sun, 28 Feb 2016 12:35:55 +0000 (20:35 +0800)]
l10n: zh_CN: for git v2.8.0 l10n round 1
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
Junio C Hamano [Tue, 8 Mar 2016 23:51:36 +0000 (15:51 -0800)]
rebase-i: clarify "is this commit relevant?" test
While I was checking all the call sites of sane_grep and sane_egrep,
I noticed this one is somewhat strangely written. The lines in the
file sane_grep works on all begin with 40-hex object name, so there
is no real risk of confusing "test $(...) = ''" by finding something
that begins with a dash, but using the status from sane_grep makes
it a lot clearer what is going on.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 8 Mar 2016 23:47:57 +0000 (15:47 -0800)]
sane_grep: pass "-a" if grep accepts it
Newer versions of GNU grep is reported to be pickier when we feed a
non-ASCII input and break some Porcelain scripts. As we know we do
not feed random binary file to our own sane_grep wrapper, allow us
to always pass "-a" by setting SANE_TEXT_GREP=-a Makefile variable
to work it around.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 10 Mar 2016 19:16:23 +0000 (11:16 -0800)]
Git 2.8-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 10 Mar 2016 19:15:50 +0000 (11:15 -0800)]
Sync with 2.7.3
Junio C Hamano [Thu, 10 Mar 2016 19:13:13 +0000 (11:13 -0800)]
Git 2.7.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 10 Mar 2016 19:13:50 +0000 (11:13 -0800)]
Merge branch 'ma/update-hooks-sample-typofix' into maint
* ma/update-hooks-sample-typofix:
templates/hooks: fix minor typo in the sample update-hook
Junio C Hamano [Thu, 10 Mar 2016 19:13:49 +0000 (11:13 -0800)]
Merge branch 'dt/initial-ref-xn-commit-doc' into maint
* dt/initial-ref-xn-commit-doc:
refs: document transaction semantics
Junio C Hamano [Thu, 10 Mar 2016 19:13:49 +0000 (11:13 -0800)]
Merge branch 'ps/plug-xdl-merge-leak' into maint
* ps/plug-xdl-merge-leak:
xdiff/xmerge: fix memory leak in xdl_merge
Junio C Hamano [Thu, 10 Mar 2016 19:13:48 +0000 (11:13 -0800)]
Merge branch 'ak/git-strip-extension-from-dashed-command' into maint
Code simplification.
* ak/git-strip-extension-from-dashed-command:
git.c: simplify stripping extension of a file in handle_builtin()
Junio C Hamano [Thu, 10 Mar 2016 19:13:47 +0000 (11:13 -0800)]
Merge branch 'ak/extract-argv0-last-dir-sep' into maint
Code simplification.
* ak/extract-argv0-last-dir-sep:
exec_cmd.c: use find_last_dir_sep() for code simplification
Junio C Hamano [Thu, 10 Mar 2016 19:13:46 +0000 (11:13 -0800)]
Merge branch 'jk/pack-idx-corruption-safety' into maint
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
Junio C Hamano [Thu, 10 Mar 2016 19:13:45 +0000 (11:13 -0800)]
Merge branch 'js/config-set-in-non-repository' into maint
"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
Junio C Hamano [Thu, 10 Mar 2016 19:13:45 +0000 (11:13 -0800)]
Merge branch 'sb/submodule-module-list-fix' into maint
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
Junio C Hamano [Thu, 10 Mar 2016 19:13:45 +0000 (11:13 -0800)]
Merge branch 'jk/grep-binary-workaround-in-test' into maint
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
Junio C Hamano [Thu, 10 Mar 2016 19:13:44 +0000 (11:13 -0800)]
Merge branch 'mm/push-simple-doc' into maint
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
Junio C Hamano [Thu, 10 Mar 2016 19:13:43 +0000 (11:13 -0800)]
Merge branch 'jk/tighten-alloc' into maint
* 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
...
Junio C Hamano [Thu, 10 Mar 2016 19:13:42 +0000 (11:13 -0800)]
Merge branch 'jk/more-comments-on-textconv' into maint
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
Junio C Hamano [Thu, 10 Mar 2016 19:13:41 +0000 (11:13 -0800)]
Merge branch 'jk/no-diff-emit-common' into maint
"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
Junio C Hamano [Thu, 10 Mar 2016 19:13:40 +0000 (11:13 -0800)]
Merge branch 'jc/am-i-v-fix' into maint
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[]
Junio C Hamano [Thu, 10 Mar 2016 19:13:39 +0000 (11:13 -0800)]
Merge branch 'nd/git-common-dir-fix' into maint
"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
Junio C Hamano [Thu, 10 Mar 2016 19:13:39 +0000 (11:13 -0800)]
Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint
"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
Junio C Hamano [Thu, 10 Mar 2016 19:13:38 +0000 (11:13 -0800)]
Merge branch 'jk/epipe-in-async' into maint
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
Junio C Hamano [Thu, 10 Mar 2016 19:13:38 +0000 (11:13 -0800)]
Merge branch 'ps/config-error' into maint
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
Junio C Hamano [Thu, 10 Mar 2016 19:13:38 +0000 (11:13 -0800)]
Merge branch 'mg/work-tree-tests' into maint
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*
Junio C Hamano [Thu, 10 Mar 2016 19:13:37 +0000 (11:13 -0800)]
Merge branch 'sp/remote-curl-ssl-strerror' into maint
Help those who debug http(s) part of the system.
* sp/remote-curl-ssl-strerror:
remote-curl: include curl_errorstr on SSL setup failures