Junio C Hamano [Tue, 14 Apr 2015 18:49:11 +0000 (11:49 -0700)]
Merge branch 'jk/pack-corruption-post-mortem'
Documentation update.
* jk/pack-corruption-post-mortem:
howto: document more tools for recovery corruption
Junio C Hamano [Tue, 14 Apr 2015 18:49:10 +0000 (11:49 -0700)]
Merge branch 'jc/update-instead-into-void'
A push into an unborn branch, with "receive.denyCurrentBranch" set
to "updateInstead", did not check out the working tree as expected.
* jc/update-instead-into-void:
push-to-deploy: allow pushing into an unborn branch and updating it
Junio C Hamano [Tue, 14 Apr 2015 18:49:09 +0000 (11:49 -0700)]
Merge branch 'sb/plug-streaming-leak'
* sb/plug-streaming-leak:
streaming.c: fix a memleak
Junio C Hamano [Tue, 14 Apr 2015 18:49:08 +0000 (11:49 -0700)]
Merge branch 'jn/doc-fast-import-no-16-octopus-limit'
Documentation update.
* jn/doc-fast-import-no-16-octopus-limit:
fast-import doc: remove suggested 16-parent limit
Junio C Hamano [Tue, 14 Apr 2015 18:49:07 +0000 (11:49 -0700)]
Merge branch 'sb/plug-wt-shortstatus-tracking-leak'
* sb/plug-wt-shortstatus-tracking-leak:
wt-status.c: fix a memleak
Junio C Hamano [Tue, 14 Apr 2015 17:34:05 +0000 (10:34 -0700)]
Merge branch 'pt/enter-repo-comment-fix'
* pt/enter-repo-comment-fix:
enter_repo(): fix docs to match code
Junio C Hamano [Tue, 14 Apr 2015 17:34:01 +0000 (10:34 -0700)]
Merge branch 'jz/gitweb-conf-doc-fix'
* jz/gitweb-conf-doc-fix:
gitweb.conf.txt: say "build-time", not "built-time"
Junio C Hamano [Tue, 14 Apr 2015 17:33:54 +0000 (10:33 -0700)]
Merge branch 'jk/cherry-pick-docfix'
* jk/cherry-pick-docfix:
cherry-pick: fix docs describing handling of empty commits
Junio C Hamano [Tue, 14 Apr 2015 17:33:45 +0000 (10:33 -0700)]
Merge branch 'iu/fix-parse-options-h-comment'
* iu/fix-parse-options-h-comment:
parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
Junio C Hamano [Tue, 14 Apr 2015 16:55:29 +0000 (09:55 -0700)]
Merge branch 'jg/cguide-we-cannot-count'
* jg/cguide-we-cannot-count:
CodingGuidelines: update 'rough' rule count
Julian Gindi [Mon, 13 Apr 2015 12:54:14 +0000 (08:54 -0400)]
CodingGuidelines: update 'rough' rule count
Changed inaccurate count of "rough rules" from three to the more
generic 'a few'.
Signed-off-by: Julian Gindi <juliangindi@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 9 Apr 2015 04:15:33 +0000 (21:15 -0700)]
Merge tag 'l10n-2.4.0-rnd2' of git://github.com/git-l10n/git-po
git l10n 2.4.0-rnd2
Jiang Xin [Thu, 9 Apr 2015 00:21:39 +0000 (08:21 +0800)]
Merge branch 'master' of git://github.com/alexhenrie/git-po
* 'master' of git://github.com/alexhenrie/git-po:
l10n: ca.po: update translation
Jiang Xin [Thu, 9 Apr 2015 00:00:10 +0000 (08:00 +0800)]
l10n: TEAMS: Change repository URL of zh_CN
Repository URL of zh_CN l10n for Git has been changed over 2 years,
update po/TEAMS for it.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Alex Henrie [Wed, 8 Apr 2015 00:07:47 +0000 (18:07 -0600)]
l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Alexander Shopov [Tue, 7 Apr 2015 08:22:47 +0000 (11:22 +0300)]
l10n: Updated Bulgarian translation of git (2305t,0f,0u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Peter Krefting [Tue, 7 Apr 2015 07:45:20 +0000 (08:45 +0100)]
l10n: sv.po: Update Swedish translation (2305t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Ralf Thielow [Sat, 4 Apr 2015 08:06:42 +0000 (10:06 +0200)]
l10n: de.po: translate one message
Translate one message came from git.pot update in
6eebb35
(l10n: git.pot: v2.4.0 round 2 (1 update)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Jean-Noel Avila [Sat, 4 Apr 2015 16:04:56 +0000 (18:04 +0200)]
l10n: fr.po v2.4.0 round 2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Dimitriy Ryazantcev [Fri, 3 Apr 2015 13:30:14 +0000 (16:30 +0300)]
l10n: ru: updated Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
Tran Ngoc Quan [Fri, 3 Apr 2015 01:54:35 +0000 (08:54 +0700)]
l10n: vi.po(2305t): Updated 1 new string
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Jiang Xin [Fri, 3 Apr 2015 00:39:57 +0000 (08:39 +0800)]
l10n: zh_CN: for git v2.4.0 l10n round 2
Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Fri, 3 Apr 2015 00:16:53 +0000 (08:16 +0800)]
l10n: git.pot: v2.4.0 round 2 (1 update)
Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Fri, 3 Apr 2015 00:13:24 +0000 (08:13 +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 'symbolic link' as 'symbolische Verknüpfung'
l10n: de.po: translate 99 new messages
l10n: de.po: fix messages with abbreviated hashs
l10n: de.po: add space before ellipsis
l10n: vi.po: Updated Vietnamese translation
l10n: zh_CN: translations for git v2.4.0-rc0
l10n: fr.po v2.4.0-rc0 round 1
l10n: ca.po: update translation
l10n: ru: updated Russian translation
l10n: sv.po: Update Swedish translation (2305t0f0u)
l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)
l10n: ru: added Russian translation
l10n: de.po: fix negation for commit -a with paths
Junio C Hamano [Thu, 2 Apr 2015 19:46:06 +0000 (12:46 -0700)]
Git 2.4.0-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 2 Apr 2015 19:34:43 +0000 (12:34 -0700)]
Merge branch 'sb/atomic-push'
* sb/atomic-push:
send-pack: unify error messages for unsupported capabilities
Ralf Thielow [Thu, 2 Apr 2015 17:28:48 +0000 (19:28 +0200)]
send-pack: unify error messages for unsupported capabilities
If --signed is not supported, the error message names the remote
"receiving end". If --atomic is not supported, the error message
names the remote "server". Unify the naming to "receiving end"
as we're in the context of "push".
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthias Rüster [Sun, 29 Mar 2015 01:46:32 +0000 (03:46 +0200)]
l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'
The use of 'symbolische Verknüpfung' for 'symbolic link' is more common
than 'symbolischer Verweis'.
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Ralf Thielow [Fri, 27 Mar 2015 15:58:26 +0000 (16:58 +0100)]
l10n: de.po: translate 99 new messages
Translate 99 messages came from git.pot update in
c2ea120
(l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Ralf Thielow [Tue, 24 Mar 2015 18:37:47 +0000 (19:37 +0100)]
l10n: de.po: fix messages with abbreviated hashs
The three dots in messages where the hash is abbreviated
were misinterpreted and are fixed with this commit.
Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Phillip Sz [Sat, 21 Mar 2015 12:52:37 +0000 (13:52 +0100)]
l10n: de.po: add space before ellipsis
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Jeff King [Wed, 1 Apr 2015 21:08:56 +0000 (17:08 -0400)]
howto: document more tools for recovery corruption
Long ago, I documented a corruption recovery I did and gave
some C code that I used to help find a flipped bit. I had
to fix a similar case recently, and I ended up writing a few
more tools. I hope nobody ever has to use these, but it
does not hurt to share them, just in case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 1 Apr 2015 06:15:45 +0000 (23:15 -0700)]
push-to-deploy: allow pushing into an unborn branch and updating it
Setting receive.denycurrentbranch to updateinstead and pushing into
the current branch, when the working tree and the index is truly
clean, is supposed to reset the working tree and the index to match
the tree of the pushed commit. This did not work when pushing into
an unborn branch.
The code that drives push-to-checkout hook needs no change, as the
interface is defined so that hook can decide what to do when the
push is coming to an unborn branch and take an appropriate action
since the beginning.
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Tue, 31 Mar 2015 23:18:07 +0000 (16:18 -0700)]
fast-import doc: remove suggested 16-parent limit
Merges with an absurd number of parents are still a bad idea because
they do not render well in tools like gitk, but if they are present
in the repository being imported into git then there's no need to
avoid reproducing them faithfully.
In olden times, before v1.6.0-rc0~194 (2008-06-27), git commit-tree
and higher-level tools built on top of it were limited to writing 16
parents for a commit. Nowadays normal git operations are happy to
write more parents when asked, so the motivation for this note in the
fast-import documentation is gone and we can remove it.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 31 Mar 2015 21:58:38 +0000 (14:58 -0700)]
Sync with 2.3.5
* maint:
Git 2.3.5
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
Junio C Hamano [Tue, 31 Mar 2015 21:57:10 +0000 (14:57 -0700)]
Git 2.3.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 31 Mar 2015 21:54:11 +0000 (14:54 -0700)]
Merge branch 'ss/pull-rebase-preserve' into maint
* ss/pull-rebase-preserve:
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
docs: clarify "preserve" option wording for git-pull
Junio C Hamano [Tue, 31 Mar 2015 21:53:08 +0000 (14:53 -0700)]
Merge branch 'jc/report-path-error-to-dir' into maint
Code clean-up.
* jc/report-path-error-to-dir:
report_path_error(): move to dir.c
Junio C Hamano [Tue, 31 Mar 2015 21:52:23 +0000 (14:52 -0700)]
Merge branch 'ph/push-doc-cas' into maint
* ph/push-doc-cas:
git-push.txt: clean up force-with-lease wording
Jérôme Zago [Thu, 3 Apr 2014 20:49:47 +0000 (22:49 +0200)]
gitweb.conf.txt: say "build-time", not "built-time"
"build-time" is used everywhere else.
Signed-off-by: Jérôme Zago <git-patch@agt-the-walker.net>
Reviewed-by: Jakub Narębski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping [Tue, 31 Mar 2015 01:22:11 +0000 (18:22 -0700)]
streaming.c: fix a memleak
When stream_blob_to_fd() opens an input stream with a filter, the
filter gets discarded upon calling close_istream() before the
function returns in the normal case. However, when we fail to open
the stream, we failed to discard the filter.
By discarding the filter in the failure case, give a consistent
life-time rule of the filter to the callers; otherwise the callers
need to conditionally discard the filter themselves, and this
function does not give enough hint for the caller to do so
correctly.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Paul Tan [Tue, 31 Mar 2015 13:39:27 +0000 (21:39 +0800)]
enter_repo(): fix docs to match code
In
b3256eb (standardize and improve lookup rules for external local
repos), enter_repo() was modified to use a different precedence
ordering of suffixes for DWIM of the repository path, and to ensure
that the repository path is actually valid instead of just testing
for existence.
However, the documentation was not modified to reflect these
changes. Fix the documentation to match the code.
Documentation contributed by Jeff King.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller [Tue, 31 Mar 2015 01:22:09 +0000 (18:22 -0700)]
wt-status.c: fix a memleak
wt_shortstatus_print_tracking() calls shorten_unambiguous_ref(),
which returns a newly allocated memory the caller takes ownership
of; it is necessary to free `base` when the function is done with
it.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Tue, 31 Mar 2015 01:08:54 +0000 (21:08 -0400)]
cherry-pick: fix docs describing handling of empty commits
Commit
b27cfb0 (git-cherry-pick: Add keep-redundant-commits
option, 2012-04-20), added the --keep-redundant-commits
option, and switched the default behavior (without that
option) to silently ignore empty commits. Later, the second
half of that commit was reverted in
ac2b0e8 (cherry-pick:
regression fix for empty commits, 2012-05-29), but the
documentation added for --keep-redundant-commits was never
updated to match. Let's do so now.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tran Ngoc Quan [Fri, 27 Mar 2015 09:04:44 +0000 (16:04 +0700)]
l10n: vi.po: Updated Vietnamese translation
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Jiang Xin [Mon, 16 Feb 2015 13:34:19 +0000 (21:34 +0800)]
l10n: zh_CN: translations for git v2.4.0-rc0
Translate 99 updated messages (2305t0f0u) for git v2.4.0-rc0.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Tue, 31 Mar 2015 01:38:47 +0000 (09:38 +0800)]
Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/git
* 'fr-v2.4.0-rc0' of git://github.com/jnavila/git:
l10n: fr.po v2.4.0-rc0 round 1
Sebastian Schuberth [Mon, 30 Mar 2015 09:29:46 +0000 (11:29 +0200)]
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
Ignoring a merge can be read as ignoring the changes a merge commit
introduces altogether, as if the entire side branch the merge commit
merged was removed from the history. But that is not what happens
if "-p" is not specified. What happens is that the individual
commits a merge commit introduces are replayed in order, and only
any possible merge conflict resolutions or manual amendments to the
merge commit are ignored.
Get this straight in the docs.
Also, do not say that merge commits are *tried* to be recreated. As that is
true almost everywhere it is better left unsaid.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jean-Noel Avila [Sun, 29 Mar 2015 07:54:56 +0000 (09:54 +0200)]
l10n: fr.po v2.4.0-rc0 round 1
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Ivan Ukhov [Sun, 29 Mar 2015 08:32:55 +0000 (10:32 +0200)]
parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
When
20d1c652 (parse-options: remove unused OPT_SET_PTR, 2014-03-30)
removed OPT_SET_PTR, the comment in the header that describes what
the option did to defval field was left behind by mistake. Remove
it.
Signed-off-by: Ivan Ukhov <ivan.ukhov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alex Henrie [Sat, 28 Mar 2015 21:07:36 +0000 (15:07 -0600)]
l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Junio C Hamano [Sat, 28 Mar 2015 16:42:49 +0000 (09:42 -0700)]
Sync with maint
* maint:
Prepare for 2.3.5
2.3.2 release notes: typofix
Junio C Hamano [Sat, 28 Mar 2015 16:41:51 +0000 (09:41 -0700)]
RelNotes: minor doc updates
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 28 Mar 2015 16:37:53 +0000 (09:37 -0700)]
Merge branch 'ph/push-doc-cas'
* ph/push-doc-cas:
git-push.txt: clean up force-with-lease wording
Junio C Hamano [Sat, 28 Mar 2015 16:37:51 +0000 (09:37 -0700)]
Merge branch 'ss/pull-rebase-preserve'
* ss/pull-rebase-preserve:
docs: clarify "preserve" option wording for git-pull
Junio C Hamano [Sat, 28 Mar 2015 16:36:30 +0000 (09:36 -0700)]
Prepare for 2.3.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 28 Mar 2015 16:33:15 +0000 (09:33 -0700)]
Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint
Code clean-up.
* sg/completion-gitcomp-nl-for-refs:
completion: use __gitcomp_nl() for completing refs
Junio C Hamano [Sat, 28 Mar 2015 16:33:15 +0000 (09:33 -0700)]
Merge branch 'jk/simplify-csum-file-sha1fd-check' into maint
Code simplification.
* jk/simplify-csum-file-sha1fd-check:
sha1fd_check: die when we cannot open the file
Junio C Hamano [Sat, 28 Mar 2015 16:33:14 +0000 (09:33 -0700)]
Merge branch 'tg/test-index-v4' into maint
A test fix.
* tg/test-index-v4:
t1700: make test pass with index-v4
Junio C Hamano [Sat, 28 Mar 2015 16:33:13 +0000 (09:33 -0700)]
Merge branch 'nd/doc-git-index-version' into maint
Doc clean-up.
* nd/doc-git-index-version:
git.txt: list index versions in plain English
Junio C Hamano [Sat, 28 Mar 2015 16:33:12 +0000 (09:33 -0700)]
Merge branch 'ct/prompt-untracked-fix' into maint
The prompt script (in contrib/) did not show the untracked sign
when working in a subdirectory without any untracked files.
* ct/prompt-untracked-fix:
git prompt: use toplevel to find untracked files
Junio C Hamano [Sat, 28 Mar 2015 16:33:11 +0000 (09:33 -0700)]
Merge branch 'ws/grep-quiet-no-pager' into maint
Even though "git grep --quiet" is run merely to ask for the exit
status, we spawned the pager regardless. Stop doing that.
* ws/grep-quiet-no-pager:
grep: fix "--quiet" overwriting current output
Junio C Hamano [Sat, 28 Mar 2015 16:33:10 +0000 (09:33 -0700)]
Merge branch 'jc/submitting-patches-mention-send-email' into maint
Recommend format-patch and send-email for those who want to submit
patches to this project.
* jc/submitting-patches-mention-send-email:
SubmittingPatches: encourage users to use format-patch and send-email
Junio C Hamano [Sat, 28 Mar 2015 16:33:09 +0000 (09:33 -0700)]
Merge branch 'jk/cleanup-failed-clone' into maint
An failure early in the "git clone" that started creating the
working tree and repository could have resulted in some directories
and files left without getting cleaned up.
* jk/cleanup-failed-clone:
clone: drop period from end of die_errno message
clone: initialize atexit cleanup handler earlier
Junio C Hamano [Sat, 28 Mar 2015 16:33:08 +0000 (09:33 -0700)]
Merge branch 'jk/fetch-pack' into maint
"git fetch" that fetches a commit using the allow-tip-sha1-in-want
extension could have failed to fetch all the requested refs.
* jk/fetch-pack:
fetch-pack: remove dead assignment to ref->new_sha1
fetch_refs_via_pack: free extra copy of refs
filter_ref: make a copy of extra "sought" entries
filter_ref: avoid overwriting ref->old_sha1 with garbage
Junio C Hamano [Sat, 28 Mar 2015 16:33:07 +0000 (09:33 -0700)]
Merge branch 'tg/fix-check-order-with-split-index' into maint
The split-index mode introduced at v2.3.0-rc0~41 was broken in the
codepath to protect us against a broken reimplementation of Git
that writes an invalid index with duplicated index entries, etc.
* tg/fix-check-order-with-split-index:
read-cache: fix reading of split index
Junio C Hamano [Sat, 28 Mar 2015 16:33:06 +0000 (09:33 -0700)]
Merge branch 'jk/prune-with-corrupt-refs' into maint
"git prune" used to largely ignore broken refs when deciding which
objects are still being used, which could spread an existing small
damage and make it a larger one.
* jk/prune-with-corrupt-refs:
refs.c: drop curate_packed_refs
repack: turn on "ref paranoia" when doing a destructive repack
prune: turn on ref_paranoia flag
refs: introduce a "ref paranoia" flag
t5312: test object deletion code paths in a corrupted repository
Thomas Ackermann [Thu, 26 Mar 2015 20:29:47 +0000 (21:29 +0100)]
2.3.2 release notes: typofix
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 28 Mar 2015 16:26:18 +0000 (09:26 -0700)]
Merge branch 'jn/doc-api-errors'
* jn/doc-api-errors:
api-error-handling doc: typofix
Thomas Ackermann [Thu, 26 Mar 2015 20:29:47 +0000 (21:29 +0100)]
api-error-handling doc: typofix
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 27 Mar 2015 20:02:55 +0000 (13:02 -0700)]
Sync with maint
* maint:
Update mailmap to spell out "Alexander Kuleshov"
Junio C Hamano [Fri, 27 Mar 2015 20:02:32 +0000 (13:02 -0700)]
Merge branch 'sb/leaks'
* sb/leaks:
http: release the memory of a http pack request as well
read-cache: fix memleak
add_to_index(): free unused cache-entry
commit.c: fix a memory leak
http-push: remove unneeded cleanup
merge-recursive: fix memleaks
merge-blobs.c: fix a memleak
builtin/apply.c: fix a memleak
update-index: fix a memleak
read-cache: free cache entry in add_to_index in case of early return
Junio C Hamano [Fri, 27 Mar 2015 20:00:23 +0000 (13:00 -0700)]
Merge branch 'jk/tag-h-column-is-a-listing-option' into maint
"git tag -h" used to show the "--column" and "--sort" options
that are about listing in a wrong section.
* jk/tag-h-column-is-a-listing-option:
tag: fix some mis-organized options in "-h" listing
Junio C Hamano [Fri, 27 Mar 2015 20:00:20 +0000 (13:00 -0700)]
Merge branch 'jk/smart-http-hide-refs' into maint
The transfer.hiderefs support did not quite work for smart-http
transport.
* jk/smart-http-hide-refs:
upload-pack: do not check NULL return of lookup_unknown_object
upload-pack: fix transfer.hiderefs over smart-http
Junio C Hamano [Fri, 27 Mar 2015 20:00:17 +0000 (13:00 -0700)]
Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint
The code that reads from the ctags file in the completion script
(in contrib/) did not spell ${param/pattern/string} substitution
correctly, which happened to work with bash but not with zsh.
* js/completion-ctags-pattern-substitution-fix:
contrib/completion: escape the forward slash in __git_match_ctag
Junio C Hamano [Fri, 27 Mar 2015 19:58:04 +0000 (12:58 -0700)]
Update mailmap to spell out "Alexander Kuleshov"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dimitriy Ryazantcev [Fri, 27 Mar 2015 10:54:35 +0000 (12:54 +0200)]
l10n: ru: updated Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
Peter Krefting [Fri, 27 Mar 2015 08:57:48 +0000 (09:57 +0100)]
l10n: sv.po: Update Swedish translation (2305t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Jiang Xin [Fri, 27 Mar 2015 06:02:01 +0000 (14:02 +0800)]
Merge branch 'maint'
* maint:
l10n: de.po: fix negation for commit -a with paths
Jiang Xin [Fri, 27 Mar 2015 05:35:23 +0000 (13:35 +0800)]
l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)
Generate po/git.pot from v2.4.0-rc0 for git v2.4.0 l10n round 1.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin [Fri, 27 Mar 2015 05:31:02 +0000 (13:31 +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: added Russian translation
Sebastian Schuberth [Thu, 26 Mar 2015 20:11:21 +0000 (21:11 +0100)]
docs: clarify "preserve" option wording for git-pull
The "also" sounds as if "preserve" does a rebase as an additional
step that "true" would not do, but that is not the case. Clarify
this by omitting "also", and rewording the sentence a bit.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 26 Mar 2015 18:59:05 +0000 (11:59 -0700)]
Git 2.4.0-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 26 Mar 2015 18:57:13 +0000 (11:57 -0700)]
Merge branch 'jk/test-chain-lint'
People often forget to chain the commands in their test together
with &&, leaving a failure from an earlier command in the test go
unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to
catch such a mistake more easily.
* jk/test-chain-lint: (36 commits)
t9001: drop save_confirm helper
t0020: use test_* helpers instead of hand-rolled messages
t: simplify loop exit-code status variables
t: fix some trivial cases of ignored exit codes in loops
t7701: fix ignored exit code inside loop
t3305: fix ignored exit code inside loop
t0020: fix ignored exit code inside loops
perf-lib: fix ignored exit code inside loop
t6039: fix broken && chain
t9158, t9161: fix broken &&-chain in git-svn tests
t9104: fix test for following larger parents
t4104: drop hand-rolled error reporting
t0005: fix broken &&-chains
t7004: fix embedded single-quotes
t0050: appease --chain-lint
t9001: use test_when_finished
t4117: use modern test_* helpers
t6034: use modern test_* helpers
t1301: use modern test_* helpers
t0020: use modern test_* helpers
...
Junio C Hamano [Thu, 26 Mar 2015 18:57:13 +0000 (11:57 -0700)]
Merge branch 'sg/completion-gitcomp-nl-for-refs'
Code clean-up.
* sg/completion-gitcomp-nl-for-refs:
completion: use __gitcomp_nl() for completing refs
Junio C Hamano [Thu, 26 Mar 2015 18:57:12 +0000 (11:57 -0700)]
Merge branch 'jc/report-path-error-to-dir'
Code clean-up.
* jc/report-path-error-to-dir:
report_path_error(): move to dir.c
Phil Hord [Thu, 26 Mar 2015 15:15:09 +0000 (11:15 -0400)]
git-push.txt: clean up force-with-lease wording
The help text for the --force-with-lease option to git-push
does not parse cleanly. Clean up the wording and syntax to
be more sensible. Also remove redundant information in the
"--force-with-lease alone" description.
Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 25 Mar 2015 20:01:07 +0000 (13:01 -0700)]
Getting ready for -rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 25 Mar 2015 19:54:28 +0000 (12:54 -0700)]
Merge branch 'nd/doc-git-index-version'
Doc clean-up.
* nd/doc-git-index-version:
git.txt: list index versions in plain English
Junio C Hamano [Wed, 25 Mar 2015 19:54:27 +0000 (12:54 -0700)]
Merge branch 'jk/run-command-capture'
The run-command interface was easy to abuse and make a pipe for us
to read from the process, wait for the process to finish and then
attempt to read its output, which is a pattern that lead to a
deadlock. Fix such uses by introducing a helper to do this
correctly (i.e. we need to read first and then wait the process to
finish) and also add code to prevent such abuse in the run-command
helper.
* jk/run-command-capture:
run-command: forbid using run_command with piped output
trailer: use capture_command
submodule: use capture_command
wt-status: use capture_command
run-command: introduce capture_command helper
wt_status: fix signedness mismatch in strbuf_read call
wt-status: don't flush before running "submodule status"
Junio C Hamano [Wed, 25 Mar 2015 19:54:27 +0000 (12:54 -0700)]
Merge branch 'tg/test-index-v4'
A test fix.
* tg/test-index-v4:
t1700: make test pass with index-v4
Junio C Hamano [Wed, 25 Mar 2015 19:54:26 +0000 (12:54 -0700)]
Merge branch 'jk/prune-with-corrupt-refs'
"git prune" used to largely ignore broken refs when deciding which
objects are still being used, which could spread an existing small
damage and make it a larger one.
* jk/prune-with-corrupt-refs:
refs.c: drop curate_packed_refs
repack: turn on "ref paranoia" when doing a destructive repack
prune: turn on ref_paranoia flag
refs: introduce a "ref paranoia" flag
t5312: test object deletion code paths in a corrupted repository
Junio C Hamano [Wed, 25 Mar 2015 19:54:26 +0000 (12:54 -0700)]
Merge branch 'tg/fix-check-order-with-split-index'
The split-index mode introduced at v2.3.0-rc0~41 was broken in the
codepath to protect us against a broken reimplementation of Git
that writes an invalid index with duplicated index entries, etc.
* tg/fix-check-order-with-split-index:
read-cache: fix reading of split index
Junio C Hamano [Wed, 25 Mar 2015 19:54:25 +0000 (12:54 -0700)]
Merge branch 'jk/fetch-pack'
"git fetch" that fetches a commit using the allow-tip-sha1-in-want
extension could have failed to fetch all the requested refs.
* jk/fetch-pack:
fetch-pack: remove dead assignment to ref->new_sha1
fetch_refs_via_pack: free extra copy of refs
filter_ref: make a copy of extra "sought" entries
filter_ref: avoid overwriting ref->old_sha1 with garbage
Junio C Hamano [Wed, 25 Mar 2015 19:54:24 +0000 (12:54 -0700)]
Merge branch 'jk/cleanup-failed-clone'
An failure early in the "git clone" that started creating the
working tree and repository could have resulted in some directories
and files left without getting cleaned up.
* jk/cleanup-failed-clone:
clone: drop period from end of die_errno message
clone: initialize atexit cleanup handler earlier
Junio C Hamano [Wed, 25 Mar 2015 19:54:23 +0000 (12:54 -0700)]
Merge branch 'jc/submitting-patches-mention-send-email'
Recommend format-patch and send-email for those who want to submit
patches to this project.
* jc/submitting-patches-mention-send-email:
SubmittingPatches: encourage users to use format-patch and send-email
Junio C Hamano [Wed, 25 Mar 2015 19:54:22 +0000 (12:54 -0700)]
Merge branch 'dj/log-graph-with-no-walk'
"git log --graph --no-walk A B..." is a otcnflicting request that
asks nonsense; no-walk tells us show discrete points in the
history, while graph asks to draw connections between these
discrete points. Forbid the combination.
* dj/log-graph-with-no-walk:
revision: forbid combining --graph and --no-walk
Junio C Hamano [Wed, 25 Mar 2015 19:54:21 +0000 (12:54 -0700)]
Merge branch 'kd/rev-list-bisect-first-parent'
"git rev-list --bisect --first-parent" does not work (yet) and can
even cause SEGV; forbid it. "git log --bisect --first-parent"
would not be useful until "git bisect --first-parent" materializes,
so it is also forbidden for now.
* kd/rev-list-bisect-first-parent:
rev-list: refuse --first-parent combined with --bisect
Junio C Hamano [Wed, 25 Mar 2015 19:54:20 +0000 (12:54 -0700)]
Merge branch 'ws/grep-quiet-no-pager'
Even though "git grep --quiet" is run merely to ask for the exit
status, we spawned the pager regardless. Stop doing that.
* ws/grep-quiet-no-pager:
grep: fix "--quiet" overwriting current output
Junio C Hamano [Wed, 25 Mar 2015 19:54:19 +0000 (12:54 -0700)]
Merge branch 'jk/simplify-csum-file-sha1fd-check'
Code simplification.
* jk/simplify-csum-file-sha1fd-check:
sha1fd_check: die when we cannot open the file