Felipe Contreras [Sat, 7 Dec 2013 13:01:57 +0000 (07:01 -0600)]
General updates
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 7 Dec 2013 12:49:33 +0000 (06:49 -0600)]
Merge tag 'v1.8.5' into fc/master
Git 1.8.5
* tag 'v1.8.5': (510 commits)
Git 1.8.5
remote-hg: don't decode UTF-8 paths into Unicode objects
Git 1.8.5-rc3
Git 1.8.4.4
RelNotes: spelling & grammar fixes
remote-hg: don't decode UTF-8 paths into Unicode objects
branch: fix --verbose output column alignment
Revert "upload-pack: send non-HEAD symbolic refs"
Git 1.8.5-rc2
Correct word usage of "timezone" in "Documentation" directory
l10n: de.po: improve error message when pushing to unknown upstream
l10n: de.po: translate 68 new messages
po/TEAMS: update Thomas Rast's email address
l10n: Update Swedish translation (2194t0f0u)
l10n: fr.po 2194/1294 messages translated
Git 1.8.4.3
Start preparing for 1.8.4.3
gitignore.txt: fix documentation of "**" patterns
Git 1.8.5-rc1
Update draft release notes to 1.8.5
...
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Conflicts:
Documentation/git-push.txt
Documentation/gitremote-helpers.txt
GIT-VERSION-GEN
builtin/apply.c
builtin/branch.c
builtin/fast-export.c
builtin/fetch.c
builtin/reset.c
builtin/rm.c
fast-import.c
git-pull.sh
git-remote-bzr.py
git-remote-hg.py
git-remote-testgit.sh
remote.c
t/remote-helpers/bzr.t
t/remote-helpers/hg-bidi.t
t/remote-helpers/hg-hg-git.t
t/remote-helpers/hg.t
t/t6040-tracking-info.sh
t/t9300-fast-import.sh
transport-helper.c
Felipe Contreras [Sat, 7 Dec 2013 11:17:59 +0000 (05:17 -0600)]
transport: general updates
Based on upstream feedback.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Junio C Hamano [Wed, 27 Nov 2013 20:14:45 +0000 (12:14 -0800)]
Git 1.8.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 27 Nov 2013 20:13:29 +0000 (12:13 -0800)]
Sync with maint
* maint:
remote-hg: don't decode UTF-8 paths into Unicode objects
Richard Hansen [Mon, 18 Nov 2013 04:12:42 +0000 (23:12 -0500)]
remote-hg: don't decode UTF-8 paths into Unicode objects
The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects. With this change, the test-hg.sh unit tests
pass again.
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 25 Nov 2013 16:20:02 +0000 (08:20 -0800)]
Merge branch 'rh/remote-hg-bzr-updates' (early part)
Unbreaks a recent breakage due to use of unquote-c-style.
This may need to be cherry-picked down to 1.8.4.x series.
* 'rh/remote-hg-bzr-updates' (early part):
remote-hg: don't decode UTF-8 paths into Unicode objects
Junio C Hamano [Wed, 20 Nov 2013 19:18:25 +0000 (11:18 -0800)]
Git 1.8.5-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 20 Nov 2013 19:26:59 +0000 (11:26 -0800)]
Sync with 1.8.4.4
Junio C Hamano [Wed, 20 Nov 2013 19:26:08 +0000 (11:26 -0800)]
Git 1.8.4.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 20 Nov 2013 19:15:25 +0000 (11:15 -0800)]
Merge branch 'mb/relnotes-1.8.5-fix'
* mb/relnotes-1.8.5-fix:
RelNotes: spelling & grammar fixes
Marc Branchaud [Thu, 14 Nov 2013 17:01:13 +0000 (12:01 -0500)]
RelNotes: spelling & grammar fixes
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 18 Nov 2013 22:31:29 +0000 (14:31 -0800)]
Merge branch 'nd/literal-pathspecs'
Fixes a regression on 'master' since v1.8.4.
* nd/literal-pathspecs:
pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses
Richard Hansen [Mon, 18 Nov 2013 04:12:42 +0000 (23:12 -0500)]
remote-hg: don't decode UTF-8 paths into Unicode objects
The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects. With this change, the test-hg.sh unit tests
pass again.
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 18 Nov 2013 20:25:28 +0000 (12:25 -0800)]
Merge branch 'maint'
Hotfix for recent regression while talking to upload-pack
in a repository with many symbolic refs.
* maint:
Revert "upload-pack: send non-HEAD symbolic refs"
Junio C Hamano [Mon, 18 Nov 2013 20:24:49 +0000 (12:24 -0800)]
Merge branch 'jx/branch-vv-always-compare-with-upstream'
Hot-fix for a regression.
* jx/branch-vv-always-compare-with-upstream:
branch: fix --verbose output column alignment
Torstein Hegge [Thu, 14 Nov 2013 18:18:01 +0000 (19:18 +0100)]
branch: fix --verbose output column alignment
Commit
f2e0873 (branch: report invalid tracking branch as gone) removed
an early return from fill_tracking_info() in the path taken when 'git
branch -v' lists a branch in sync with its upstream. This resulted in an
unconditionally added space in front of the subject line:
$ git branch -v
* master
f5eb3da commit pushed to upstream
topic
f935eb6 unpublished topic
Instead, only add the trailing space if a decoration have been added.
To catch this kind of whitespace breakage in the tests, be a bit less
smart when filtering the output through sed.
Signed-off-by: Torstein Hegge <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 18 Nov 2013 18:15:45 +0000 (10:15 -0800)]
Revert "upload-pack: send non-HEAD symbolic refs"
This reverts commit
5e7dcad771cb873e278a0571b46910d7c32e2f6c; there
may be unbounded number of symbolic refs in the repository, but the
capability header line in the on-wire protocol has a rather low
length limit.
Junio C Hamano [Wed, 13 Nov 2013 20:59:31 +0000 (12:59 -0800)]
Git 1.8.5-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 12 Nov 2013 19:26:11 +0000 (11:26 -0800)]
Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po:
l10n: de.po: improve error message when pushing to unknown upstream
l10n: de.po: translate 68 new messages
po/TEAMS: update Thomas Rast's email address
l10n: Update Swedish translation (2194t0f0u)
l10n: fr.po 2194/1294 messages translated
l10n: zh_CN.po: translate 68 messages (2194t0f0u)
l10n: vi.po (2194t): Update and minor fix
l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)
Jason St. John [Sat, 9 Nov 2013 00:48:52 +0000 (19:48 -0500)]
Correct word usage of "timezone" in "Documentation" directory
"timezone" is two words, not one (i.e. "time zone" is correct).
Correct this in these files:
-- date-formats.txt
-- git-blame.txt
-- git-cvsimport.txt
-- git-fast-import.txt
-- git-svn.txt
-- gitweb.conf.txt
-- rev-list-options.txt
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow [Fri, 8 Nov 2013 19:34:35 +0000 (20:34 +0100)]
l10n: de.po: improve error message when pushing to unknown upstream
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
Ralf Thielow [Sat, 2 Nov 2013 17:58:52 +0000 (18:58 +0100)]
l10n: de.po: translate 68 new messages
Translate 68 new messages came from git.pot update in
727b957
(l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
Ralf Thielow [Sat, 2 Nov 2013 17:56:14 +0000 (18:56 +0100)]
po/TEAMS: update Thomas Rast's email address
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
Richard Hansen [Sun, 8 Sep 2013 05:47:49 +0000 (01:47 -0400)]
remote-bzr: reuse bzrlib transports when possible
Pass a list of open bzrlib.transport.Transport objects to each bzrlib
function that might create a transport. This enables bzrlib to reuse
existing transports when possible, avoiding multiple concurrent
connections to the same remote server.
If the remote server is accessed via ssh, this fixes a couple of
problems:
* If the user does not have keys loaded into an ssh agent, the user
may be prompted for a password multiple times.
* If the user is using OpenSSH and the ControlMaster setting is set
to auto, git-remote-bzr might hang. This is because bzrlib closes
the multiple ssh sessions in an undefined order and might try to
close the master ssh session before the other sessions. The
master ssh process will not exit until the other sessions have
exited, causing a deadlock. (The ssh sessions are closed in an
undefined order because bzrlib relies on the Python garbage
collector to trigger ssh session termination.)
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Mon, 11 Nov 2013 20:07:28 +0000 (14:07 -0600)]
remote-hg: add tests for special filenames
So that we check that UTF-8 and spaces work fine.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Antoine Pelisse [Wed, 23 Oct 2013 15:44:11 +0000 (08:44 -0700)]
remote-hg: fix paths with spaces
git-fast-import expects paths to be C-style quoted, so let's do that the
same way git-remote-bzr does.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Improved-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Jiang Xin [Sun, 10 Nov 2013 00:48:23 +0000 (08:48 +0800)]
Merge remote-tracking branch 'sv/nafmo/master'
* sv/nafmo/master:
l10n: Update Swedish translation (2194t0f0u)
Peter Krefting [Tue, 2 Jul 2013 12:09:37 +0000 (13:09 +0100)]
l10n: Update Swedish translation (2194t0f0u)
And fix a typo.
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Jean-Noel Avila [Fri, 1 Nov 2013 14:35:08 +0000 (15:35 +0100)]
l10n: fr.po 2194/1294 messages translated
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Sebastien Helleu <flashcode@flashtux.org>
Junio C Hamano [Fri, 8 Nov 2013 20:08:43 +0000 (12:08 -0800)]
Sync with 1.8.4.3
Junio C Hamano [Fri, 8 Nov 2013 20:06:19 +0000 (12:06 -0800)]
Git 1.8.4.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 8 Nov 2013 20:01:58 +0000 (12:01 -0800)]
Merge branch 'jn/test-prereq-perl-doc' into maint
The interaction between use of Perl in our test suite and NO_PERL
has been clarified a bit.
* jn/test-prereq-perl-doc:
t/README: tests can use perl even with NO_PERL
Junio C Hamano [Fri, 8 Nov 2013 20:01:13 +0000 (12:01 -0800)]
Merge branch 'ap/remote-hg-unquote-cquote' into maint
A fast-import stream expresses a pathname with funny characters by
quoting them in C style; remote-hg remote helper (in contrib/)
forgot to unquote such a path.
* ap/remote-hg-unquote-cquote:
remote-hg: unquote C-style paths when exporting
Junio C Hamano [Fri, 8 Nov 2013 19:38:00 +0000 (11:38 -0800)]
Merge branch 'jc/upload-pack-send-symref' into maint
One long-standing flaw in the pack transfer protocol used by "git
clone" was that there was no way to tell the other end which branch
"HEAD" points at, and the receiving end needed to guess. A new
capability has been defined in the pack protocol to convey this
information so that cloning from a repository with more than one
branches pointing at the same commit where the HEAD is at now
reliably sets the initial branch in the resulting repository.
* jc/upload-pack-send-symref:
t5570: Update for clone-progress-to-stderr branch
t5570: Update for symref capability
clone: test the new HEAD detection logic
connect: annotate refs with their symref information in get_remote_head()
connect.c: make parse_feature_value() static
upload-pack: send non-HEAD symbolic refs
upload-pack: send symbolic ref information as capability
upload-pack.c: do not pass confusing cb_data to mark_our_ref()
t5505: fix "set-head --auto with ambiguous HEAD" test
Junio C Hamano [Fri, 8 Nov 2013 19:37:25 +0000 (11:37 -0800)]
Merge branch 'jk/http-auth-redirects' into maint
We did not handle cases where http transport gets redirected during
the authorization request (e.g. from http:// to https://).
* jk/http-auth-redirects:
http.c: Spell the null pointer as NULL
remote-curl: rewrite base url from info/refs redirects
remote-curl: store url as a strbuf
remote-curl: make refs_url a strbuf
http: update base URLs when we see redirects
http: provide effective url to callers
http: hoist credential request out of handle_curl_result
http: refactor options to http_get_*
http_request: factor out curlinfo_strbuf
http_get_file: style fixes
Junio C Hamano [Thu, 7 Nov 2013 22:41:25 +0000 (14:41 -0800)]
Sync with maint
* maint:
Start preparing for 1.8.4.3
gitignore.txt: fix documentation of "**" patterns
Junio C Hamano [Thu, 7 Nov 2013 22:39:47 +0000 (14:39 -0800)]
Start preparing for 1.8.4.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 7 Nov 2013 22:37:39 +0000 (14:37 -0800)]
Merge branch 'sc/doc-howto-dumb-http' into maint
An ancient How-To on serving Git repositories on an HTTP server
lacked a warning that it has been mostly superseded with more
modern way.
* sc/doc-howto-dumb-http:
doc/howto: warn about (dumb)http server document being too old
Junio C Hamano [Thu, 7 Nov 2013 22:37:35 +0000 (14:37 -0800)]
Merge branch 'vd/doc-unpack-objects' into maint
The synopsis section of "git unpack-objects" documentation has been
clarified a bit.
* vd/doc-unpack-objects:
Documentation: "pack-file" is not literal in unpack-objects
Documentation: restore a space in unpack-objects usage
Junio C Hamano [Thu, 7 Nov 2013 22:37:17 +0000 (14:37 -0800)]
Merge branch 'jk/subtree-install-fix' into maint
We did not generate HTML version of documentation to "git subtree"
in contrib/.
* jk/subtree-install-fix:
subtree: add makefile target for html docs
Junio C Hamano [Thu, 7 Nov 2013 22:37:11 +0000 (14:37 -0800)]
Merge branch 'hn/log-graph-color-octopus' into maint
Coloring around octopus merges in "log --graph" output was screwy.
* hn/log-graph-color-octopus:
graph: fix coloring around octopus merges
Junio C Hamano [Thu, 7 Nov 2013 22:36:59 +0000 (14:36 -0800)]
Merge branch 'mm/checkout-auto-track-fix' into maint
"git checkout topic", when there is not yet a local "topic" branch
but there is a unique remote-tracking branch for a remote "topic"
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
(for that unique remote $r) was run. This hack however was not
implemented for "git checkout topic --".
* mm/checkout-auto-track-fix:
checkout: proper error message on 'git checkout foo bar --'
checkout: allow dwim for branch creation for "git checkout $branch --"
Junio C Hamano [Thu, 7 Nov 2013 22:36:45 +0000 (14:36 -0800)]
Merge branch 'sg/prompt-svn-remote-fix' into maint
Bash prompting code to deal with an SVN remote as an upstream
were coded in a way not supported by older Bash versions (3.x).
* sg/prompt-svn-remote-fix:
bash prompt: don't use '+=' operator in show upstream code path
Junio C Hamano [Thu, 7 Nov 2013 22:34:51 +0000 (14:34 -0800)]
Merge branch 'jk/split-broken-ident' into maint
The fall-back parsing of commit objects with broken author or
committer lines were less robust than ideal in picking up the
timestamps.
* jk/split-broken-ident:
split_ident: parse timestamp from end of line
Junio C Hamano [Thu, 7 Nov 2013 22:34:14 +0000 (14:34 -0800)]
Merge branch 'jc/revision-range-unpeel' into maint
"git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the
output, but "git rev-list --objects v1.0^..v1.0" did not.
* jc/revision-range-unpeel:
revision: do not peel tags used in range notation
Karsten Blees [Thu, 7 Nov 2013 16:30:47 +0000 (17:30 +0100)]
gitignore.txt: fix documentation of "**" patterns
"**" means bold in ASCIIDOC, so we need to escape it.
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 6 Nov 2013 22:35:19 +0000 (14:35 -0800)]
Git 1.8.5-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 6 Nov 2013 22:34:43 +0000 (14:34 -0800)]
Merge branch 'fc/trivial'
A random collection of style fixes and minor doc updates.
* fc/trivial:
setup: trivial style fixes
run-command: trivial style fixes
diff: trivial style fix
revision: trivial style fixes
pretty: trivial style fix
describe: trivial style fixes
transport-helper: trivial style fix
sha1-name: trivial style cleanup
branch: trivial style fix
revision: add missing include
doc/pull: clarify the illustrations
t: replace pulls with merges
merge: simplify ff-only option
Felipe Contreras [Tue, 5 Nov 2013 13:27:08 +0000 (07:27 -0600)]
completion: fix completion of certain aliases
Some commands need the first word to determine the actual action that is
being executed, however, the command is wrong when we use an alias, for
example 'alias.p=push', if we try to complete 'git p origin ', the
result would be wrong because __git_complete_remote_or_refspec() doesn't
know where it come from.
So let's override words[1], so the alias 'p' is override by the actual
command, 'push'.
Reported-by: Aymeric Beaumet <aymeric.beaumet@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Junio C Hamano [Mon, 4 Nov 2013 23:05:08 +0000 (15:05 -0800)]
Update draft release notes to 1.8.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 4 Nov 2013 22:58:19 +0000 (14:58 -0800)]
Merge branch 'bw/solaris-sed-tr-test-portability'
* bw/solaris-sed-tr-test-portability:
t4015: simplify sed command that is not even seen by sed
Avoid difference in tr semantics between System V and BSD
Change sed i\ usage to something Solaris' sed can handle
Junio C Hamano [Mon, 4 Nov 2013 22:58:15 +0000 (14:58 -0800)]
Merge branch 'vd/doc-unpack-objects'
* vd/doc-unpack-objects:
Documentation: "pack-file" is not literal in unpack-objects
Documentation: restore a space in unpack-objects usage
Junio C Hamano [Mon, 4 Nov 2013 22:58:10 +0000 (14:58 -0800)]
Merge branch 'jk/duplicate-objects-in-packs'
Test fixup to a topic recently graduated.
* jk/duplicate-objects-in-packs:
Fix '\%o' for printf from coreutils
Junio C Hamano [Mon, 4 Nov 2013 22:58:08 +0000 (14:58 -0800)]
Merge branch 'jk/subtree-install-fix'
* jk/subtree-install-fix:
subtree: add makefile target for html docs
Junio C Hamano [Mon, 4 Nov 2013 22:58:05 +0000 (14:58 -0800)]
Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
* ak/cvsserver-stabilize-use-of-hash-keys:
cvsserver: Determinize output to combat Perl 5.18 hash randomization
Junio C Hamano [Mon, 4 Nov 2013 22:58:01 +0000 (14:58 -0800)]
Merge branch 'jk/wrap-perl-used-in-tests'
* jk/wrap-perl-used-in-tests:
t: use perl instead of "$PERL_PATH" where applicable
t: provide a perl() function which uses $PERL_PATH
Junio C Hamano [Mon, 4 Nov 2013 22:57:57 +0000 (14:57 -0800)]
Merge branch 'sc/doc-howto-dumb-http'
* sc/doc-howto-dumb-http:
doc/howto: warn about (dumb)http server document being too old
Junio C Hamano [Mon, 4 Nov 2013 22:57:53 +0000 (14:57 -0800)]
Merge branch 'jn/test-prereq-perl-doc'
* jn/test-prereq-perl-doc:
t/README: tests can use perl even with NO_PERL
Junio C Hamano [Mon, 4 Nov 2013 18:11:15 +0000 (10:11 -0800)]
t4015: simplify sed command that is not even seen by sed
Noticed by Andreas Schwab; \<LF> inside a double quotes pair is
eaten by the shell to become an empty string and is not doing
anything.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin [Tue, 17 Sep 2013 15:37:05 +0000 (23:37 +0800)]
l10n: zh_CN.po: translate 68 messages (2194t0f0u)
Translate 68 new messages came from git.pot update in
727b957
(l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)).
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Tran Ngoc Quan [Sat, 2 Nov 2013 06:21:55 +0000 (13:21 +0700)]
l10n: vi.po (2194t): Update and minor fix
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Jiang Xin [Sat, 2 Nov 2013 00:08:26 +0000 (08:08 +0800)]
l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)
Generate po/git.pot from
v1.8.5-rc0-23-gaa27064 for git v1.8.5
l10n round 1.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Vivien Didelot [Fri, 1 Nov 2013 15:42:43 +0000 (11:42 -0400)]
Documentation: "pack-file" is not literal in unpack-objects
Make it clear that "pack-file" is not to be spelled as is in the
unpack-objects usage.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 1 Nov 2013 15:14:52 +0000 (08:14 -0700)]
Update draft release notes to 1.8.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 1 Nov 2013 14:38:58 +0000 (07:38 -0700)]
Merge branch 'sb/refs-code-cleanup'
* sb/refs-code-cleanup:
cache: remove unused function 'have_git_dir'
refs: remove unused function invalidate_ref_cache
Junio C Hamano [Fri, 1 Nov 2013 14:38:56 +0000 (07:38 -0700)]
Merge branch 'rs/web-browse-xdg-open'
* rs/web-browse-xdg-open:
web--browse: Add support for xdg-open
Junio C Hamano [Fri, 1 Nov 2013 14:38:54 +0000 (07:38 -0700)]
Merge branch 'js/tests-windows-port-fix'
* js/tests-windows-port-fix:
tests: undo special treatment of CRLF for Windows
Windows: a test_cmp that is agnostic to random LF <> CRLF conversions
t5300-pack-object: do not compare binary data using test_cmp
Junio C Hamano [Fri, 1 Nov 2013 14:38:51 +0000 (07:38 -0700)]
Merge branch 'js/test-help-format-windows-port-fix'
* js/test-help-format-windows-port-fix:
t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html
Junio C Hamano [Fri, 1 Nov 2013 14:38:49 +0000 (07:38 -0700)]
Merge branch 'jk/reset-p-current-head-fix'
"git reset -p HEAD" has codepath to special case it from resetting
to contents of other commits, but recent change broke it.
* jk/reset-p-current-head-fix:
reset: pass real rev name to add--interactive
add-interactive: handle unborn branch in patch mode
Junio C Hamano [Fri, 1 Nov 2013 14:38:46 +0000 (07:38 -0700)]
Merge branch 'jk/pack-corruption-post-mortem'
* jk/pack-corruption-post-mortem:
howto: add article on recovering a corrupted object
Junio C Hamano [Fri, 1 Nov 2013 14:38:41 +0000 (07:38 -0700)]
Merge branch 'jk/for-each-ref-skip-parsing'
* jk/for-each-ref-skip-parsing:
for-each-ref: avoid loading objects to print %(objectname)
Junio C Hamano [Fri, 1 Nov 2013 14:38:35 +0000 (07:38 -0700)]
Merge branch 'ap/remote-hg-unquote-cquote'
A fast-import stream expresses a pathname with funny characters by
quoting them in C style; remote-hg remote helper forgot to unquote
such a path.
* ap/remote-hg-unquote-cquote:
remote-hg: unquote C-style paths when exporting
Junio C Hamano [Fri, 1 Nov 2013 14:38:26 +0000 (07:38 -0700)]
Merge branch 'jl/submodule-mv'
Moving a regular file in a repository with a .gitmodules file was
producing a warning 'Could not find section in .gitmodules where
path=<filename>'.
* jl/submodule-mv:
mv: Fix spurious warning when moving a file in presence of submodules
Felipe Contreras [Thu, 31 Oct 2013 04:07:34 +0000 (22:07 -0600)]
ruby: fix make clean
We don't want to remove the non-generated Ruby scripts.
Reported-by: Peter Oberndorfer <kumbayo84@arcor.de>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Vivien Didelot [Thu, 31 Oct 2013 21:41:11 +0000 (17:41 -0400)]
Documentation: restore a space in unpack-objects usage
The commit
87b7b84 removed a space in the unpack-objects usage, which
makes the synopsis a bit confusing. This patch simply restores it.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:46 +0000 (03:25 -0600)]
setup: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:45 +0000 (03:25 -0600)]
run-command: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:44 +0000 (03:25 -0600)]
diff: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:43 +0000 (03:25 -0600)]
revision: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:42 +0000 (03:25 -0600)]
pretty: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:41 +0000 (03:25 -0600)]
describe: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:40 +0000 (03:25 -0600)]
transport-helper: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:39 +0000 (03:25 -0600)]
sha1-name: trivial style cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:38 +0000 (03:25 -0600)]
branch: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:36 +0000 (03:25 -0600)]
revision: add missing include
Otherwise we might not have 'struct diff_options'.
[jc: needs a matching follow-up patch to remove inclusion of diff.h
from *.c files that do not themselves use anything from diff.h]
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 31 Oct 2013 20:43:35 +0000 (13:43 -0700)]
doc/pull: clarify the illustrations
The second illustration that shows the history after "git pull"
spelled the remote-tracking branch with "remotes/" prefix, which
is not necessary. Drop it.
To match the assumption that a remote-tracking branch is used to
keep track of the advancement of the master at the origin, update
the first illustration that shows the history before "git pull"
to show the distinction between the master currently at origin and
the stale origin/master remote-tracking branch.
Noticed-by: Felipe Contreras <felipe.contreras@gmail.com>
Helped-by: Max Horn <max@quendi.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:33 +0000 (03:25 -0600)]
t: replace pulls with merges
This is what the code intended.
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 09:25:32 +0000 (03:25 -0600)]
merge: simplify ff-only option
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kacper Kornet [Thu, 31 Oct 2013 11:51:32 +0000 (12:51 +0100)]
Fix '\%o' for printf from coreutils
The printf utility provided by coreutils when interpreting '\%o' format
does not recognize %o as formatting directive. For example
printf '\%o 0 returns \%o and warning: ignoring excess arguments,
starting with ‘0’, which results in failed tests in
t5309-pack-delta-cycles.sh. In most shells the test ends with success as
the printf is a builtin utility.
Fix it by using '\\%o' which is interpreted consistently in all versions
of printf.
Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras [Thu, 31 Oct 2013 07:42:49 +0000 (01:42 -0600)]
remote-hg: fix 'shared path' path
If the repository is moved, the absolute path of the shared repository
would fail.
Make sure it's always up-to-date.
Reported-by: Michael Davis <mjmdavis@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Thu, 31 Oct 2013 03:22:11 +0000 (21:22 -0600)]
stage: fix documentation
A missing description causes errors.
Reported-by: Arthur Axel Schmidt <frioux@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Rüdiger Sonderfeld [Sat, 26 Oct 2013 17:43:54 +0000 (19:43 +0200)]
web--browse: Add support for xdg-open
xdg-open is a tool similar to git-web--browse. It opens a file or URL in the
user's preferred application. It could probably be made default at least on
Linux with a graphical environment.
Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt [Sat, 26 Oct 2013 18:48:46 +0000 (20:48 +0200)]
t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html
We have the build configuration option DEFAULT_MAN_FORMAT to choose a
format different from man pages to be used by 'git help' when no format
is requested explicitly. Since
65db0443 (Set the default help format to
html for msys builds, 2013-06-04) we use html on Windows by default.
There is one test in t3200-branch.sh that invokes a help page. The
intent of the redirections applied to the command invocation is to avoid
that the man page viewer interferes with the automated test. But when
the default format is not "man", this does not have the intended effect,
and the HTML manual page is opened during the test run. Request "man"
format explicitly to keep the test silent.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 30 Oct 2013 19:17:47 +0000 (12:17 -0700)]
Git 1.8.5-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 30 Oct 2013 19:11:22 +0000 (12:11 -0700)]
Merge branch 'maint'
* maint:
t5570: Update for clone-progress-to-stderr branch
Junio C Hamano [Wed, 30 Oct 2013 19:11:03 +0000 (12:11 -0700)]
Merge branch 'jk/refs-c-squelch-gcc'
* jk/refs-c-squelch-gcc:
silence gcc array-bounds warning
Junio C Hamano [Wed, 30 Oct 2013 19:11:01 +0000 (12:11 -0700)]
Merge branch 'jk/date-c-double-semicolon'
* jk/date-c-double-semicolon:
drop redundant semicolon in empty while
Junio C Hamano [Wed, 30 Oct 2013 19:10:56 +0000 (12:10 -0700)]
Merge branch 'nd/lift-path-max'
* nd/lift-path-max:
checkout_entry(): clarify the use of topath[] parameter
entry.c: convert checkout_entry to use strbuf
Junio C Hamano [Wed, 30 Oct 2013 19:10:52 +0000 (12:10 -0700)]
Merge branch 'tr/valgrind-test-fix'
* tr/valgrind-test-fix:
Revert "test-lib: allow prefixing a custom string before "ok N" etc."
Revert "test-lib: support running tests under valgrind in parallel"