OSDN Git Service
Ronnie Sahlberg [Fri, 12 Dec 2014 08:56:42 +0000 (09:56 +0100)]
refs.c: add a function to append a reflog entry to a fd
Break out the code to create the string and writing it to the file
descriptor from log_ref_write and add it into a dedicated function
log_ref_write_fd. It is a nice unit of work.
For now this is only used from log_ref_write, but in the future it
might have other callers.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ronnie Sahlberg [Thu, 4 Dec 2014 23:08:14 +0000 (00:08 +0100)]
refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ronnie Sahlberg [Thu, 4 Dec 2014 23:08:13 +0000 (00:08 +0100)]
refs.c: make ref_transaction_create a wrapper for ref_transaction_update
The ref_transaction_update function can already be used to create refs by
passing null_sha1 as the old_sha1 parameter. Simplify by replacing
transaction_create with a thin wrapper.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 26 Nov 2014 21:18:34 +0000 (13:18 -0800)]
Git 2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Marc Branchaud [Fri, 21 Nov 2014 23:10:04 +0000 (18:10 -0500)]
RelNotes: spelling & grammar tweaks
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 21 Nov 2014 20:10:56 +0000 (12:10 -0800)]
Git 2.2.0-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin [Thu, 20 Nov 2014 08:12:34 +0000 (16:12 +0800)]
l10n: remove a superfluous translation for push.c
Ralf reported that '--recurse-submodules' option in push.c should not be
translated [1]. Before his commit is merged, remove superfluous
translations for push.c.
[1] http://www.spinics.net/lists/git/msg241964.html
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Ralf Thielow [Thu, 20 Nov 2014 06:15:15 +0000 (07:15 +0100)]
l10n: de.po: translate 2 messages
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Ralf Thielow [Tue, 18 Nov 2014 18:06:51 +0000 (19:06 +0100)]
l10n: de.po: translate 2 new messages
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Jiang Xin [Thu, 20 Nov 2014 02:53:48 +0000 (10:53 +0800)]
l10n: batch updates for one trivial change
In order to catch up with the release of Git 2.2.0 final, make a batch
l10n update for the new l10n change brought by commit
d52adf1 (trailer:
display a trailer without its trailing newline).
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Thu, 20 Nov 2014 02:03:10 +0000 (10:03 +0800)]
l10n: git.pot: v2.2.0 round 2 (1 updated)
Generate po/git.pot from
v2.2.0-rc2-23-gca0107e for git v2.2.0 l10n
round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano [Wed, 19 Nov 2014 21:48:01 +0000 (13:48 -0800)]
Merge branch 'sv/submitting-final-patch'
* sv/submitting-final-patch:
SubmittingPatches: final submission is To: maintainer and CC: list
Junio C Hamano [Wed, 19 Nov 2014 21:47:59 +0000 (13:47 -0800)]
Merge branch 'sn/tutorial-status-output-example'
* sn/tutorial-status-output-example:
gittutorial: fix output of 'git status'
Junio C Hamano [Wed, 19 Nov 2014 21:47:55 +0000 (13:47 -0800)]
Merge branch 'mh/doc-remote-helper-xref'
* mh/doc-remote-helper-xref:
doc: add some crossrefs between manual pages
Junio C Hamano [Wed, 19 Nov 2014 21:47:53 +0000 (13:47 -0800)]
Merge branch 'tb/no-relative-file-url'
* tb/no-relative-file-url:
t5705: the file:// URL should be absolute
Junio C Hamano [Wed, 19 Nov 2014 21:47:49 +0000 (13:47 -0800)]
Merge branch 'cc/interpret-trailers'
Small fixes to a new experimental command already in 'master'.
* cc/interpret-trailers:
trailer: display a trailer without its trailing newline
trailer: ignore comment lines inside the trailers
Junio C Hamano [Tue, 18 Nov 2014 18:27:46 +0000 (10:27 -0800)]
Merge git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: Update Catalan translation
Junio C Hamano [Tue, 18 Nov 2014 18:19:38 +0000 (10:19 -0800)]
Merge branch 'jc/doc-commit-only'
* jc/doc-commit-only:
Documentation/git-commit: clarify that --only/--include records the working tree contents
Junio C Hamano [Tue, 18 Nov 2014 18:18:28 +0000 (10:18 -0800)]
Merge branch 'ta/tutorial-modernize'
* ta/tutorial-modernize:
gittutorial.txt: remove reference to ancient Git version
Junio C Hamano [Tue, 18 Nov 2014 18:16:54 +0000 (10:16 -0800)]
Merge branch 'da/difftool'
Fix-up to a new feature in 'master'.
* da/difftool:
difftool: honor --trust-exit-code for builtin tools
Alex Henrie [Tue, 18 Nov 2014 03:22:48 +0000 (20:22 -0700)]
l10n: Update Catalan translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Junio C Hamano [Mon, 17 Nov 2014 17:28:23 +0000 (09:28 -0800)]
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: de.po: translate 62 new messages
l10n: de.po: Fixup one translation
l10n: de.po: use imperative form for command options
Ralf Thielow [Thu, 30 Oct 2014 08:00:47 +0000 (09:00 +0100)]
l10n: de.po: translate 62 new messages
Translate 62 new messages came from git.pot update in
16742b0
(l10n: git.pot: proposed updates for v2.2.0 (+62)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Stefan Beller [Tue, 23 Sep 2014 12:54:46 +0000 (14:54 +0200)]
l10n: de.po: Fixup one translation
English grammar with German words doesn't make it a German translation. ;)
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
David Aguilar [Fri, 14 Nov 2014 21:33:55 +0000 (13:33 -0800)]
difftool: honor --trust-exit-code for builtin tools
run_merge_tool() was not setting $status, which prevented the
exit code for builtin tools from being forwarded to the caller.
Capture the exit status and add a test to guarantee the behavior.
Reported-by: Adria Farres <14farresa@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 14 Nov 2014 21:31:15 +0000 (13:31 -0800)]
Git 2.2.0-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow [Fri, 19 Sep 2014 16:38:13 +0000 (18:38 +0200)]
l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Stefan Naewe [Thu, 13 Nov 2014 10:40:07 +0000 (10:40 +0000)]
gittutorial: fix output of 'git status'
'git status' doesn't output leading '#'s these days.
Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Torsten Bögershausen [Thu, 13 Nov 2014 07:36:07 +0000 (08:36 +0100)]
t5705: the file:// URL should be absolute
The test misused a URL "file://." to mean "relative to here",
which we no longer accept.
In a file:// URL, typically there is no host, and RFC1738 says that
file:///<path> should be used.
Update t5705 to use a working URL.
Reported-by: Michael Blume <blume.mike@gmail.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Slavomir Vlcek [Wed, 12 Nov 2014 23:18:39 +0000 (00:18 +0100)]
SubmittingPatches: final submission is To: maintainer and CC: list
In an earlier part there is:
"re-send it with "To:" set to the maintainer [*1*] and "cc:" the list [*2*]"
for the final submission, but later we see
"Send it to the list and cc the maintainer."
Fix the later one to match the previous.
Signed-off-by: Slavomir Vlcek <svlc@inventati.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 12 Nov 2014 20:12:50 +0000 (12:12 -0800)]
Update draft release notes to 2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 12 Nov 2014 20:13:25 +0000 (12:13 -0800)]
Sync with 'maint'
Junio C Hamano [Wed, 12 Nov 2014 20:13:11 +0000 (12:13 -0800)]
Merge branch 'nd/gitignore-trailing-whitespace' into maint
* nd/gitignore-trailing-whitespace:
gitignore.txt: fix spelling of "backslash"
Junio C Hamano [Wed, 12 Nov 2014 19:59:58 +0000 (11:59 -0800)]
Merge branch 'jk/fetch-reflog-df-conflict'
Fix-up a test for portability.
* jk/fetch-reflog-df-conflict:
t1410: fix breakage on case-insensitive filesystems
Max Horn [Tue, 11 Nov 2014 20:17:07 +0000 (21:17 +0100)]
doc: add some crossrefs between manual pages
In particular, git-fast-import and -export link to each
other, and gitremote-helpers links to existing remote
helpers, and vice versa. Also link to fast-import from the
remote helper spec, as this is relevant for remote helpers
using the fast-import format.
Signed-off-by: Max Horn <max@quendi.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann [Tue, 11 Nov 2014 19:13:36 +0000 (20:13 +0100)]
gittutorial.txt: remove reference to ancient Git version
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 11 Nov 2014 20:45:48 +0000 (12:45 -0800)]
Sync with maint
* maint:
Junio C Hamano [Tue, 11 Nov 2014 18:20:13 +0000 (10:20 -0800)]
Merge branch 'rs/clean-menu-item-defn' into maint
* rs/clean-menu-item-defn:
clean: use f(void) instead of f() to declare a pointer to a function without arguments
René Scharfe [Mon, 10 Nov 2014 21:17:00 +0000 (22:17 +0100)]
run-command: use void to declare that functions take no parameters
Explicitly declare that git_atexit_dispatch() and git_atexit_clear()
take no parameters instead of leaving their parameter list empty and
thus unspecified.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 10 Nov 2014 19:59:30 +0000 (11:59 -0800)]
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: Updated Bulgarian translation of git (2296t,0f,0u)
l10n: zh_CN: translations for git v2.2.0-rc0
l10n: sv.po: Update Swedish translation (2296t0f0u)
l10n: fr.po (2296t) update for version 2.2.0
l10n: vi.po: Update new message strings
l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)
Junio C Hamano [Mon, 10 Nov 2014 19:26:18 +0000 (11:26 -0800)]
Sync with maint
* maint:
Documentation/config.txt: fix minor typo
config.txt: fix typo
Junio C Hamano [Mon, 10 Nov 2014 19:26:09 +0000 (11:26 -0800)]
Merge branch 'js/diff-highlight-avoid-sigpipe'
* js/diff-highlight-avoid-sigpipe:
diff-highlight: exit when a pipe is broken
Thomas Quinot [Sat, 8 Nov 2014 10:45:39 +0000 (11:45 +0100)]
Documentation/config.txt: fix minor typo
Add a missing article at the beginning of a sentence, and rephrase
slightly.
Signed-off-by: Thomas Quinot <thomas@quinot.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Dermine [Sun, 9 Nov 2014 16:19:33 +0000 (17:19 +0100)]
config.txt: fix typo
Signed-off-by: Nicolas Dermine <nicolas.dermine@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe [Sun, 9 Nov 2014 13:49:58 +0000 (14:49 +0100)]
trailer: use CHILD_PROCESS_INIT in apply_command()
Initialize the struct child_process variable cp at declaration time.
This is shorter, saves a function call and prevents using the variable
before initialization by mistake.
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder [Sun, 9 Nov 2014 09:23:40 +0000 (10:23 +0100)]
trailer: display a trailer without its trailing newline
Trailers passed to the parse_trailer() function often have
a trailing newline. When erroring out, we should display
the invalid trailer properly, that means without any
trailing newline.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder [Sun, 9 Nov 2014 09:23:39 +0000 (10:23 +0100)]
trailer: ignore comment lines inside the trailers
Otherwise trailers that are commented out might be
processed. We would also error out if the comment line
char is also a separator.
This means that comments inside a trailer block will
disappear, but that was already the case anyway.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Sun, 9 Nov 2014 01:59:18 +0000 (20:59 -0500)]
t1410: fix breakage on case-insensitive filesystems
Two tests recently added to t1410 create branches "a" and
"a/b" to test d/f conflicts on reflogs. Earlier, unrelated
tests in that script create the path "A/B" in the working
tree. There's no conflict on a case-sensitive filesystem,
but on a case-insensitive one, "git log" will complain that
"a/b" is both a revision and a working tree path.
We could fix this by using a "--" to disambiguate, but we
are probably better off using names that are less confusing
to make it more clear that they are unrelated to the working
tree files. This patch turns "a/b" into "one/two".
Reported-by: Michael Blume <blume.mike@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 7 Nov 2014 20:01:01 +0000 (12:01 -0800)]
Git 2.2.0-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 7 Nov 2014 19:55:40 +0000 (11:55 -0800)]
Documentation/git-commit: clarify that --only/--include records the working tree contents
With the original phrasing, it is possible to misunderstand as if
the contents in the index for only the specified paths are made into
the new commit.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 6 Nov 2014 18:52:51 +0000 (10:52 -0800)]
Merge branch 'maint'
* maint:
docs/credential-store: s/--store/--file/
Junio C Hamano [Thu, 6 Nov 2014 18:52:40 +0000 (10:52 -0800)]
Merge branch 'nd/gitignore-trailing-whitespace'
Documentation update.
* nd/gitignore-trailing-whitespace:
gitignore.txt: fix spelling of "backslash"
Junio C Hamano [Thu, 6 Nov 2014 18:52:36 +0000 (10:52 -0800)]
Merge branch 'tm/line-log-first-parent'
"git log --first-parent -L..." used to crash.
* tm/line-log-first-parent:
line-log: fix crash when --first-parent is used
Junio C Hamano [Thu, 6 Nov 2014 18:52:31 +0000 (10:52 -0800)]
Merge branch 'jk/fetch-reflog-df-conflict'
Corner-case bugfixes for "git fetch" around reflog handling.
* jk/fetch-reflog-df-conflict:
ignore stale directories when checking reflog existence
fetch: load all default config at startup
Junio C Hamano [Thu, 6 Nov 2014 18:52:23 +0000 (10:52 -0800)]
Merge branch 'rs/use-child-process-init-more'
* rs/use-child-process-init-more:
bundle: split out ref writing from bundle_create
bundle: split out a helper function to compute and write prerequisites
bundle: split out a helper function to create pack data
use child_process_init() to initialize struct child_process variables
Junio C Hamano [Thu, 6 Nov 2014 18:51:35 +0000 (10:51 -0800)]
Merge branch 'jk/cache-tree-protect-from-broken-libgit2'
The code to use cache-tree trusted the on-disk data too much
and fell into an infinite loop.
* jk/cache-tree-protect-from-broken-libgit2:
cache-tree: avoid infinite loop on zero-entry tree
Jeff King [Thu, 6 Nov 2014 07:40:32 +0000 (02:40 -0500)]
docs/credential-store: s/--store/--file/
The option name "--store" was used early in development, but
never even made it into an applied patch, let alone a
released version of git. I forgot to update the matching
documentation at the time, though.
Noticed-by: Jesse Hopkins <jesse.hopkins@lmco.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben North [Tue, 4 Nov 2014 22:18:33 +0000 (22:18 +0000)]
gitignore.txt: fix spelling of "backslash"
Signed-off-by: Ben North <ben@redfrontdoor.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Szakmeister [Tue, 4 Nov 2014 20:01:12 +0000 (15:01 -0500)]
diff-highlight: exit when a pipe is broken
While using diff-highlight with other tools, I have discovered that Python
ignores SIGPIPE by default. Unfortunately, this also means that tools
attempting to launch a pager under Python--and don't realize this is
happening--means that the subprocess inherits this setting. In this case, it
means diff-highlight will be launched with SIGPIPE being ignored. Let's work
with those broken scripts by restoring the default SIGPIPE handler.
Signed-off-by: John Szakmeister <john@szakmeister.net>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann [Mon, 3 Nov 2014 20:37:07 +0000 (21:37 +0100)]
Documentation: typofixes
In addition to fixing trivial and obvious typos, be careful about
the following points:
- Spell ASCII, URL and CRC in ALL CAPS;
- Spell Linux as Capitalized;
- Do not omit periods in "i.e." and "e.g.".
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tzvetan Mikov [Tue, 4 Nov 2014 20:33:37 +0000 (12:33 -0800)]
line-log: fix crash when --first-parent is used
line-log tries to access all parents of a commit, but only the first
parent has been loaded if "--first-parent" is specified, resulting
in a crash.
Limit the number of parents to one if "--first-parent" is specified.
Reported-by: Eric N. Vander Weele <ericvw@gmail.com>
Signed-off-by: Tzvetan Mikov <tmikov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Tue, 4 Nov 2014 13:24:53 +0000 (08:24 -0500)]
ignore stale directories when checking reflog existence
When we update a ref, we have two rules for whether or not
we actually update the reflog:
1. If the reflog already exists, we will always append to
it.
2. If log_all_ref_updates is set, we will create a new
reflog file if necessary.
We do the existence check by trying to open the reflog file,
either with or without O_CREAT (depending on log_all_ref_updates).
If it fails, then we check errno to see what happened.
If we were not using O_CREAT and we got ENOENT, the file
doesn't exist, and we return success (there isn't a reflog
already, and we were not told to make a new one).
If we get EISDIR, then there is likely a stale directory
that needs to be removed (e.g., there used to be "foo/bar",
it was deleted, and the directory "foo" was left. Now we
want to create the ref "foo"). If O_CREAT is set, then we
catch this case, try to remove the directory, and retry our
open. So far so good.
But if we get EISDIR and O_CREAT is not set, then we treat
this as any other error, which is not right. Like ENOENT,
EISDIR is an indication that we do not have a reflog, and we
should silently return success (we were not told to create
it). Instead, the current code reports this as an error, and
we fail to update the ref at all.
Note that this is relatively unlikely to happen, as you
would have to have had reflogs turned on, and then later
turned them off (it could also happen due to a bug in fetch,
but that was fixed in the previous commit). However, it's
quite easy to fix: we just need to treat EISDIR like ENOENT
for the non-O_CREAT case, and silently return (note that
this early return means we can also simplify the O_CREAT
case).
Our new tests cover both cases (O_CREAT and non-O_CREAT).
The first one already worked, of course.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Tue, 4 Nov 2014 13:11:19 +0000 (08:11 -0500)]
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy [Mon, 3 Nov 2014 15:12:00 +0000 (16:12 +0100)]
RelNotes/2.2.0.txt: fix minor typos
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alexander Shopov [Fri, 17 Oct 2014 19:39:45 +0000 (22:39 +0300)]
l10n: Updated Bulgarian translation of git (2296t,0f,0u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Jiang Xin [Wed, 8 Oct 2014 02:55:14 +0000 (10:55 +0800)]
l10n: zh_CN: translations for git v2.2.0-rc0
Translate 62 new messages (2296t0f0u) for git v2.2.0-rc0. Also changed
the translation of bare (repository).
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Sun, 2 Nov 2014 02:12:29 +0000 (10:12 +0800)]
Merge branch 'fr_2.2.0' of git://github.com/jnavila/git
* 'fr_2.2.0' of git://github.com/jnavila/git:
l10n: fr.po (2296t) update for version 2.2.0
Jiang Xin [Sun, 2 Nov 2014 02:11:27 +0000 (10:11 +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 (2296t0f0u)
Peter Krefting [Sat, 1 Nov 2014 19:17:37 +0000 (20:17 +0100)]
l10n: sv.po: Update Swedish translation (2296t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Jean-Noel Avila [Sat, 1 Nov 2014 15:29:19 +0000 (16:29 +0100)]
l10n: fr.po (2296t) update for version 2.2.0
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Grégoire Paris <gparis@universcine.com>
Tran Ngoc Quan [Sat, 1 Nov 2014 02:07:24 +0000 (09:07 +0700)]
l10n: vi.po: Update new message strings
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Jiang Xin [Fri, 31 Oct 2014 23:47:46 +0000 (07:47 +0800)]
l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)
Generate po/git.pot from v2.2.0-rc0 for git v2.2.0 l10n round 1.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano [Fri, 31 Oct 2014 18:57:23 +0000 (11:57 -0700)]
Git 2.2.0-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 31 Oct 2014 18:50:20 +0000 (11:50 -0700)]
Merge branch 'for-junio' of git://bogomips.org/git-svn
* 'for-junio' of git://bogomips.org/git-svn:
git-svn: use SVN::Ra::get_dir2 when possible
git-svn: add space after "W:" prefix in warning
git-svn: (cleanup) remove editor param passing
git-svn: prepare SVN::Ra config pieces once
Git.pm: add specified name to tempfile template
git-svn: disable _rev_list memoization
git-svn: save a little memory as fetch progresses
git-svn: remove unnecessary DESTROY override
git-svn: reload RA every log-window-size
git-svn.txt: advertise pushurl with dcommit
git-svn: remove mergeinfo rev caching
git-svn: cache only mergeinfo revisions
git-svn: reduce check_cherry_pick cache overhead
git-svn: only look at the root path for svn:mergeinfo
git-svn: only look at the new parts of svn:mergeinfo
Junio C Hamano [Fri, 31 Oct 2014 18:49:53 +0000 (11:49 -0700)]
Merge branch 'jc/push-cert'
* jc/push-cert:
receive-pack: avoid minor leak in case start_async() fails
Junio C Hamano [Fri, 31 Oct 2014 18:49:48 +0000 (11:49 -0700)]
Merge branch 'rs/child-process-init'
* rs/child-process-init:
api-run-command: add missing list item marker
Junio C Hamano [Fri, 31 Oct 2014 18:49:37 +0000 (11:49 -0700)]
Merge branch 'rs/grep-color-words'
Allow painting or not painting (partial) matches in context lines
when showing "grep -C<num>" output in color.
* rs/grep-color-words:
grep: add color.grep.matchcontext and color.grep.matchselected
Eric Wong [Fri, 31 Oct 2014 10:34:03 +0000 (10:34 +0000)]
git-svn: use SVN::Ra::get_dir2 when possible
This avoids the following failure with normal "get_dir" on newer
versions of SVN (tested with SVN 1.8.8-1ubuntu3.1):
Incorrect parameters given: Could not convert '%ld' into a number
get_dir2 also has the potential to be more efficient by requesting
less data.
ref: <
1414636504.45506.YahooMailBasic@web172304.mail.ir2.yahoo.com>
ref: <
1414722617.89476.YahooMailBasic@web172305.mail.ir2.yahoo.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Cc: Hin-Tak Leung <htl10@users.sourceforge.net>
Jeff King [Thu, 30 Oct 2014 21:35:24 +0000 (17:35 -0400)]
bundle: split out ref writing from bundle_create
The bundle_create() function has a number of logical steps:
process the input, write the refs, and write the packfile.
Recent commits split the first and third into separate
sub-functions. It's worth splitting the middle step out,
too, if only because it makes the progression of the steps
more obvious.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 30 Oct 2014 18:01:37 +0000 (11:01 -0700)]
bundle: split out a helper function to compute and write prerequisites
The new helper compute_and_write_prerequistes() is ugly, but it
cannot be avoided. Ideally we should avoid a function that computes
and does I/O at the same time, but the prerequisites lines in the
output needs the human readable title only to help the recipient of
the bundle. The code copies them straight from the rev-list output
and immediately discards as no other internal computation needs that
information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 30 Oct 2014 17:45:41 +0000 (10:45 -0700)]
bundle: split out a helper function to create pack data
The create_bundle() function, while it does one single logical
thing, takes a rather large implementation to do so.
Let's start separating what it does into smaller steps to make it
easier to see what is going on. This is a first step to separate
out the actual pack-data generation, after the earlier part of the
function figures out which part of the history to place in the
bundle.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Wed, 29 Oct 2014 17:11:58 +0000 (13:11 -0400)]
cache-tree: avoid infinite loop on zero-entry tree
The loop in cache-tree's update_one iterates over all the
entries in the index. For each one, we find the cache-tree
subtree which represents our path (creating it if
necessary), and then recurse into update_one again. The
return value we get is the number of index entries that
belonged in that subtree. So for example, with entries:
a/one
a/two
b/one
We start by processing the first entry, "a/one". We would
find the subtree for "a" and recurse into update_one. That
would then handle "a/one" and "a/two", and return the value
2. The parent function then skips past the 2 handled
entries, and we continue by processing "b/one".
If the recursed-into update_one ever returns 0, then we make
no forward progress in our loop. We would process "a/one"
over and over, infinitely.
This should not happen normally. Any subtree we create must
have at least one path in it (the one that we are
processing!). However, we may also reuse a cache-tree entry
we found in the on-disk index. For the same reason, this
should also never have zero entries. However, certain buggy
versions of libgit2 could produce such bogus cache-tree
records. The libgit2 bug has since been fixed, but it does
not hurt to protect ourselves against bogus input coming
from the on-disk data structures.
Note that this is not a die("BUG") or assert, because it is
not an internal bug, but rather a corrupted on-disk
structure. It's possible that we could even recover from it
(by throwing out the bogus cache-tree entry), but it is not
worth the effort; the important thing is that we report an
error instead of looping infinitely.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 30 Oct 2014 17:07:33 +0000 (10:07 -0700)]
Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk:
gitk: Remove boilerplate for configuration variables
gitk: Show detached HEAD if --all is specified
gitk: Do not depend on Cygwin's "kill" command on Windows
Eric Wong [Thu, 30 Oct 2014 08:31:28 +0000 (08:31 +0000)]
git-svn: add space after "W:" prefix in warning
And minor reformatting while we're in the area.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong [Wed, 29 Oct 2014 20:10:29 +0000 (20:10 +0000)]
git-svn: (cleanup) remove editor param passing
Neither find_extra_svk_parents or find_extra_svn_parents ever
used the `$ed' parameter.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Max Kirillov [Sun, 14 Sep 2014 20:35:57 +0000 (23:35 +0300)]
gitk: Remove boilerplate for configuration variables
Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Max Kirillov [Tue, 9 Sep 2014 07:29:16 +0000 (10:29 +0300)]
gitk: Show detached HEAD if --all is specified
If HEAD is detached, 'gitk --all' does not show it. This is inconvenient
for frontend program, and for example git log does show the detached HEAD.
gitk uses git rev-parse to find a list of branches to show.
Apparently, the command does not include detached HEAD to output if
--all argument is specified. This has been discussed in [1] and stated
as expected behavior. So rev-parse's parameters should be tuned in gitk.
[1] http://thread.gmane.org/gmane.comp.version-control.git/255996
Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Sebastian Schuberth [Thu, 23 Oct 2014 19:30:54 +0000 (21:30 +0200)]
gitk: Do not depend on Cygwin's "kill" command on Windows
Windows does not necessarily mean Cygwin, it could also be MSYS. The
latter ships with a version of "kill" that does not understand "-f".
In msysgit this was addressed by shipping Cygwin's version of kill.
Properly fix this by using the stock Windows "taskkill" command instead,
which is available since Windows XP Professional.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Eric Wong [Wed, 29 Oct 2014 19:55:02 +0000 (19:55 +0000)]
git-svn: prepare SVN::Ra config pieces once
Memoizing these initialization functions saves some memory for
long fetches which require scanning many unwanted revisions
before any wanted revisions happen.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong [Wed, 29 Oct 2014 19:31:55 +0000 (19:31 +0000)]
Git.pm: add specified name to tempfile template
This should help me track down errors in git-svn more easily:
write .git/Git_XXXXXX: Bad file descriptor
at /usr/lib/perl5/SVN/Ra.pm line 623
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Junio C Hamano [Wed, 29 Oct 2014 17:49:54 +0000 (10:49 -0700)]
Sync with Git 2.1.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 29 Oct 2014 17:48:38 +0000 (10:48 -0700)]
Git 2.1.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 29 Oct 2014 17:35:17 +0000 (10:35 -0700)]
Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint
* jk/pack-objects-no-bitmap-when-splitting:
pack-objects: turn off bitmaps when we split packs
Junio C Hamano [Wed, 29 Oct 2014 17:35:16 +0000 (10:35 -0700)]
Merge branch 'da/mergetool-meld' into maint
* da/mergetool-meld:
mergetools/meld: make usage of `--output` configurable and more robust
Junio C Hamano [Wed, 29 Oct 2014 17:35:16 +0000 (10:35 -0700)]
Merge branch 'rm/gitweb-start-form' into maint
* rm/gitweb-start-form:
gitweb: use start_form, not startform that was removed in CGI.pm 4.04
Junio C Hamano [Wed, 29 Oct 2014 17:35:10 +0000 (10:35 -0700)]
Merge branch 'bc/asciidoc-pretty-formats-fix' into maint
* bc/asciidoc-pretty-formats-fix:
Documentation: fix misrender of pretty-formats in Asciidoctor
Junio C Hamano [Wed, 29 Oct 2014 17:35:09 +0000 (10:35 -0700)]
Merge branch 'rs/daemon-fixes' into maint
* rs/daemon-fixes:
daemon: remove write-only variable maxfd
daemon: fix error message after bind()
daemon: handle gethostbyname() error
Junio C Hamano [Wed, 29 Oct 2014 17:18:31 +0000 (10:18 -0700)]
Update draft release notes to 2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 29 Oct 2014 17:09:35 +0000 (10:09 -0700)]
Merge branch 'da/difftool'
Allow diff tool backend to stop early by exiting with a non-zero
status.
* da/difftool:
difftool: add support for --trust-exit-code
difftool--helper: exit when reading a prompt answer fails
Junio C Hamano [Wed, 29 Oct 2014 17:09:31 +0000 (10:09 -0700)]
Merge branch 'rb/pack-window-memory-config-doc'
* rb/pack-window-memory-config-doc:
config.txt: pack.windowmemory limit applies per-thread