git/git.git
6 years agoMerge branch 'sb/hex-object-name-is-at-most-41-bytes-long'
Junio C Hamano [Wed, 25 Feb 2015 23:40:16 +0000 (15:40 -0800)]
Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long'

Code clean-up.

* sb/hex-object-name-is-at-most-41-bytes-long:
  hex.c: reduce memory footprint of sha1_to_hex static buffers

6 years agoMerge branch 'jk/fast-import-die-nicely-fix'
Junio C Hamano [Wed, 25 Feb 2015 23:40:15 +0000 (15:40 -0800)]
Merge branch 'jk/fast-import-die-nicely-fix'

"git fast-import" used to crash when it could not close and
conclude the resulting packfile cleanly.

* jk/fast-import-die-nicely-fix:
  fast-import: avoid running end_packfile recursively

6 years agoMerge branch 'dp/remove-duplicated-header-inclusion'
Junio C Hamano [Wed, 25 Feb 2015 23:40:14 +0000 (15:40 -0800)]
Merge branch 'dp/remove-duplicated-header-inclusion'

Code clean-up.

* dp/remove-duplicated-header-inclusion:
  do not include the same header twice

6 years agoMerge branch 'jc/max-io-size-and-ssize-max'
Junio C Hamano [Wed, 25 Feb 2015 23:40:13 +0000 (15:40 -0800)]
Merge branch 'jc/max-io-size-and-ssize-max'

Our default I/O size (8 MiB) for large files was too large for some
platforms with smaller SSIZE_MAX, leading to read(2)/write(2)
failures.

* jc/max-io-size-and-ssize-max:
  xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX

6 years agoMerge branch 'tc/missing-http-proxyauth'
Junio C Hamano [Wed, 25 Feb 2015 23:40:12 +0000 (15:40 -0800)]
Merge branch 'tc/missing-http-proxyauth'

We did not check the curl library version before using
CURLOPT_PROXYAUTH feature that may not exist.

* tc/missing-http-proxyauth:
  http: support curl < 7.10.7

6 years agoMerge branch 'jk/strbuf-doc-to-header'
Junio C Hamano [Wed, 25 Feb 2015 23:40:10 +0000 (15:40 -0800)]
Merge branch 'jk/strbuf-doc-to-header'

The strbuf API was explained between the API documentation and in
the header file.  Move missing bits to strbuf.h so that programmers
can check only one place for all necessary information.

* jk/strbuf-doc-to-header:
  strbuf.h: group documentation for trim functions
  strbuf.h: drop boilerplate descriptions of strbuf_split_*
  strbuf.h: reorganize api function grouping headers
  strbuf.h: format asciidoc code blocks as 4-space indent
  strbuf.h: drop asciidoc list formatting from API docs
  strbuf.h: unify documentation comments beginnings
  strbuf.h: integrate api-strbuf.txt documentation

6 years agoMerge branch 'nd/attr-optim'
Junio C Hamano [Wed, 25 Feb 2015 23:40:10 +0000 (15:40 -0800)]
Merge branch 'nd/attr-optim'

Optimize attribute look-up, mostly useful in "git grep" on a
project that does not use many attributes, by avoiding it when we
(should) know that the attributes are not defined in the first
place.

* nd/attr-optim:
  attr: avoid heavy work when we know the specified attr is not defined
  attr: do not attempt to expand when we know it's not a macro
  attr.c: rename arg name attr_nr to avoid shadowing the global one

6 years agoMerge branch 'jn/doc-api-errors'
Junio C Hamano [Wed, 25 Feb 2015 23:40:09 +0000 (15:40 -0800)]
Merge branch 'jn/doc-api-errors'

The error handling functions and conventions are now documented in
the API manual.

* jn/doc-api-errors:
  doc: document error handling functions and conventions

6 years agoSync with 2.3.1
Junio C Hamano [Wed, 25 Feb 2015 06:15:49 +0000 (22:15 -0800)]
Sync with 2.3.1

6 years agoGit 2.3.1 v2.3.1
Junio C Hamano [Wed, 25 Feb 2015 06:14:42 +0000 (22:14 -0800)]
Git 2.3.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'ak/add-i-empty-candidates' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:42 +0000 (22:10 -0800)]
Merge branch 'ak/add-i-empty-candidates' into maint

The interactive "show a list and let the user choose from it"
interface "add -i" used showed and prompted to the user even when
the candidate list was empty, against which the only "choice" the
user could have made was to choose nothing.

* ak/add-i-empty-candidates:
  add -i: return from list_and_choose if there is no candidate

6 years agoMerge branch 'jc/apply-ws-fix-expands' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:41 +0000 (22:10 -0800)]
Merge branch 'jc/apply-ws-fix-expands' into maint

"git apply --whitespace=fix" used to under-allocate the memory
when the fix resulted in a longer text than the original patch.

* jc/apply-ws-fix-expands:
  apply: count the size of postimage correctly
  apply: make update_pre_post_images() sanity check the given postlen
  apply.c: typofix

6 years agoMerge branch 'jc/doc-log-rev-list-options' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:39 +0000 (22:10 -0800)]
Merge branch 'jc/doc-log-rev-list-options' into maint

"git log --help" used to show rev-list options that are irrelevant
to the "log" command.

* jc/doc-log-rev-list-options:
  Documentation: what does "git log --indexed-objects" even mean?

6 years agoMerge branch 'mg/commit-author-no-match-malformed-message' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:38 +0000 (22:10 -0800)]
Merge branch 'mg/commit-author-no-match-malformed-message' into maint

The error message from "git commit", when a non-existing author
name was given as value to the "--author=" parameter, has been
reworded to avoid misunderstanding.

* mg/commit-author-no-match-malformed-message:
  commit: reword --author error message

6 years agoMerge branch 'jk/dumb-http-idx-fetch-fix' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:37 +0000 (22:10 -0800)]
Merge branch 'jk/dumb-http-idx-fetch-fix' into maint

A broken pack .idx file in the receiving repository prevented the
dumb http transport from fetching a good copy of it from the other
side.

* jk/dumb-http-idx-fetch-fix:
  dumb-http: do not pass NULL path to parse_pack_index

6 years agoMerge branch 'jc/diff-format-doc' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:36 +0000 (22:10 -0800)]
Merge branch 'jc/diff-format-doc' into maint

The documentation incorrectly said that C(opy) and R(ename) are the
only ones that can be followed by the score number in the output in
the --raw format.

* jc/diff-format-doc:
  diff-format doc: a score can follow M for rewrite

6 years agoMerge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:35 +0000 (22:10 -0800)]
Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint

Fix a misspelled conditional that is always true.

* jk/remote-curl-an-array-in-struct-cannot-be-null:
  do not check truth value of flex arrays

6 years agoMerge branch 'jk/status-read-branch-name-fix' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:21 +0000 (22:10 -0800)]
Merge branch 'jk/status-read-branch-name-fix' into maint

Code to read branch name from various files in .git/ directory
would have misbehaved if the code to write them left an empty file.

* jk/status-read-branch-name-fix:
  read_and_strip_branch: fix typo'd address-of operator

6 years agoMerge branch 'mg/push-repo-option-doc' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:19 +0000 (22:10 -0800)]
Merge branch 'mg/push-repo-option-doc' into maint

The "git push" documentation made the "--repo=<there>" option
easily misunderstood.

* mg/push-repo-option-doc:
  git-push.txt: document the behavior of --repo

6 years agoMerge branch 'bc/http-fallback-to-password-after-krb-fails' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:17 +0000 (22:10 -0800)]
Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint

After attempting and failing a password-less authentication
(e.g. kerberos), libcURL refuses to fall back to password based
Basic authentication without a bit of help/encouragement.

* bc/http-fallback-to-password-after-krb-fails:
  remote-curl: fall back to Basic auth if Negotiate fails

6 years agoMerge branch 'dk/format-patch-ignore-diff-submodule' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:15 +0000 (22:10 -0800)]
Merge branch 'dk/format-patch-ignore-diff-submodule' into maint

Setting diff.submodule to 'log' made "git format-patch" produce
broken patches.

* dk/format-patch-ignore-diff-submodule:
  format-patch: ignore diff.submodule setting
  t4255: test am submodule with diff.submodule

6 years agoMerge branch 'jn/rerere-fail-on-auto-update-failure' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:10:13 +0000 (22:10 -0800)]
Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint

"git rerere" (invoked internally from many mergy operations) did
not correctly signal errors when told to update the working tree
files and failed to do so for whatever reason.

* jn/rerere-fail-on-auto-update-failure:
  rerere: error out on autoupdate failure

6 years agoMerge branch 'jk/blame-commit-label' into maint
Junio C Hamano [Wed, 25 Feb 2015 06:09:54 +0000 (22:09 -0800)]
Merge branch 'jk/blame-commit-label' into maint

"git blame HEAD -- missing" failed to correctly say "HEAD" when it
tried to say "No such path 'missing' in HEAD".

* jk/blame-commit-label:
  blame.c: fix garbled error message
  use xstrdup_or_null to replace ternary conditionals
  builtin/commit.c: use xstrdup_or_null instead of envdup
  builtin/apply.c: use xstrdup_or_null instead of null_strdup
  git-compat-util: add xstrdup_or_null helper

6 years agoPost 2.3 cycle (batch #4)
Junio C Hamano [Sun, 22 Feb 2015 20:29:36 +0000 (12:29 -0800)]
Post 2.3 cycle (batch #4)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'jc/conf-var-doc'
Junio C Hamano [Sun, 22 Feb 2015 20:28:31 +0000 (12:28 -0800)]
Merge branch 'jc/conf-var-doc'

Longstanding configuration variable naming rules has been added to
the documentation.

* jc/conf-var-doc:
  CodingGuidelines: describe naming rules for configuration variables
  config.txt: mark deprecated variables more prominently
  config.txt: clarify that add.ignore-errors is deprecated

6 years agoMerge branch 'es/squelch-openssl-warnings-on-macosx'
Junio C Hamano [Sun, 22 Feb 2015 20:28:30 +0000 (12:28 -0800)]
Merge branch 'es/squelch-openssl-warnings-on-macosx'

An earlier workaround to squelch unhelpful deprecation warnings
from the complier on Mac OSX unnecessarily set minimum required
version of the OS, which the user might want to raise (or lower)
for other reasons.

* es/squelch-openssl-warnings-on-macosx:
  git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED

6 years agoMerge branch 'tc/curl-vernum-output-broken-in-7.11'
Junio C Hamano [Sun, 22 Feb 2015 20:28:29 +0000 (12:28 -0800)]
Merge branch 'tc/curl-vernum-output-broken-in-7.11'

Certain older vintages of cURL give irregular output from
"curl-config --vernum", which confused our build system.

* tc/curl-vernum-output-broken-in-7.11:
  Makefile: handle broken curl version number in version check

6 years agoMerge branch 'jk/prune-mtime'
Junio C Hamano [Sun, 22 Feb 2015 20:28:28 +0000 (12:28 -0800)]
Merge branch 'jk/prune-mtime'

In v2.2.0, we broke "git prune" that runs in a repository that
borrows from an alternate object store.

* jk/prune-mtime:
  sha1_file: fix iterating loose alternate objects
  for_each_loose_file_in_objdir: take an optional strbuf path

6 years agoMerge branch 'jc/diff-files-ita'
Junio C Hamano [Sun, 22 Feb 2015 20:28:27 +0000 (12:28 -0800)]
Merge branch 'jc/diff-files-ita'

Code cleanup.

* jc/diff-files-ita:
  run_diff_files(): clarify computation of sha1 validity

6 years agoMerge branch 'ps/submodule-sanitize-path-upon-add'
Junio C Hamano [Sun, 22 Feb 2015 20:28:26 +0000 (12:28 -0800)]
Merge branch 'ps/submodule-sanitize-path-upon-add'

"git submodule add" failed to squash "path/to/././submodule" to
"path/to/submodule".

* ps/submodule-sanitize-path-upon-add:
  git-submodule.sh: fix '/././' path normalization

6 years agoMerge branch 'ab/merge-file-prefix'
Junio C Hamano [Sun, 22 Feb 2015 20:28:25 +0000 (12:28 -0800)]
Merge branch 'ab/merge-file-prefix'

"git merge-file" did not work correctly in a subdirectory.

* ab/merge-file-prefix:
  merge-file: correctly open files when in a subdir

6 years agoMerge branch 'es/blame-commit-info-fix'
Junio C Hamano [Sun, 22 Feb 2015 20:28:24 +0000 (12:28 -0800)]
Merge branch 'es/blame-commit-info-fix'

"git blame" died, trying to free an uninitialized piece of memory.

* es/blame-commit-info-fix:
  builtin/blame: destroy initialized commit_info only

6 years agoMerge branch 'ss/check-builtins-on-windows'
Junio C Hamano [Sun, 22 Feb 2015 20:28:23 +0000 (12:28 -0800)]
Merge branch 'ss/check-builtins-on-windows'

* ss/check-builtins-on-windows:
  check-builtins: strip executable suffix $X when enumerating builtins

6 years agoPost 2.3 cycle (batch #3)
Junio C Hamano [Wed, 18 Feb 2015 19:53:17 +0000 (11:53 -0800)]
Post 2.3 cycle (batch #3)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'jc/push-cert'
Junio C Hamano [Wed, 18 Feb 2015 19:45:03 +0000 (11:45 -0800)]
Merge branch 'jc/push-cert'

"git push --signed" gave an incorrectly worded error message when
the other side did not support the capability.

* jc/push-cert:
  transport-helper: fix typo in error message when --signed is not supported

6 years agoMerge branch 'jk/decimal-width-for-uintmax'
Junio C Hamano [Wed, 18 Feb 2015 19:45:02 +0000 (11:45 -0800)]
Merge branch 'jk/decimal-width-for-uintmax'

We didn't format an integer that wouldn't fit in "int" but in
"uintmax_t" correctly.

* jk/decimal-width-for-uintmax:
  decimal_width: avoid integer overflow

6 years agoMerge branch 'jk/config-no-ungetc-eof'
Junio C Hamano [Wed, 18 Feb 2015 19:45:01 +0000 (11:45 -0800)]
Merge branch 'jk/config-no-ungetc-eof'

Reading configuration from a blob object, when it ends with a lone
CR, use to confuse the configuration parser.

* jk/config-no-ungetc-eof:
  config_buf_ungetc: warn when pushing back a random character
  config: do not ungetc EOF

6 years agoMerge branch 'jk/pack-bitmap'
Junio C Hamano [Wed, 18 Feb 2015 19:45:00 +0000 (11:45 -0800)]
Merge branch 'jk/pack-bitmap'

The pack bitmap support did not build with older versions of GCC.

* jk/pack-bitmap:
  ewah: fix building with gcc < 3.4.0

6 years agoMerge branch 'jc/remote-set-url-doc'
Junio C Hamano [Wed, 18 Feb 2015 19:44:59 +0000 (11:44 -0800)]
Merge branch 'jc/remote-set-url-doc'

Clarify in the documentation that "remote.<nick>.pushURL" and
"remote.<nick>.URL" are there to name the same repository accessed
via different transports, not two separate repositories.

* jc/remote-set-url-doc:
  Documentation/git-remote.txt: stress that set-url is not for triangular

6 years agoMerge branch 'ch/new-gpg-drops-rfc-1991'
Junio C Hamano [Wed, 18 Feb 2015 19:44:58 +0000 (11:44 -0800)]
Merge branch 'ch/new-gpg-drops-rfc-1991'

Older GnuPG implementations may not correctly import the keyring
material we prepare for the tests to use.

* ch/new-gpg-drops-rfc-1991:
  t/lib-gpg: sanity-check that we can actually sign
  t/lib-gpg: include separate public keys in keyring.gpg

6 years agoMerge branch 'ye/http-accept-language'
Junio C Hamano [Wed, 18 Feb 2015 19:44:57 +0000 (11:44 -0800)]
Merge branch 'ye/http-accept-language'

Using environment variable LANGUAGE and friends on the client side,
HTTP-based transports now send Accept-Language when making requests.

* ye/http-accept-language:
  http: add Accept-Language header if possible

6 years agoMerge branch 'av/wincred-with-at-in-username-fix'
Junio C Hamano [Wed, 18 Feb 2015 19:44:56 +0000 (11:44 -0800)]
Merge branch 'av/wincred-with-at-in-username-fix'

The credential helper for Windows (in contrib/) used to mishandle
a user name with an at-sign in it.

* av/wincred-with-at-in-username-fix:
  wincred: fix get credential if username has "@"

6 years agoPost 2.3 cycle (batch #2)
Junio C Hamano [Tue, 17 Feb 2015 18:22:17 +0000 (10:22 -0800)]
Post 2.3 cycle (batch #2)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'mg/push-repo-option-doc'
Junio C Hamano [Tue, 17 Feb 2015 18:15:30 +0000 (10:15 -0800)]
Merge branch 'mg/push-repo-option-doc'

The "git push" documentation made the "--repo=<there>" option
easily misunderstood.

* mg/push-repo-option-doc:
  git-push.txt: document the behavior of --repo

6 years agoMerge branch 'jc/t4122-use-test-write-lines'
Junio C Hamano [Tue, 17 Feb 2015 18:15:29 +0000 (10:15 -0800)]
Merge branch 'jc/t4122-use-test-write-lines'

* jc/t4122-use-test-write-lines:
  t4122: use test_write_lines from test-lib-functions

6 years agoMerge branch 'jk/status-read-branch-name-fix'
Junio C Hamano [Tue, 17 Feb 2015 18:15:28 +0000 (10:15 -0800)]
Merge branch 'jk/status-read-branch-name-fix'

Code to read branch name from various files in .git/ directory
would have misbehaved if the code to write them left an empty file.

* jk/status-read-branch-name-fix:
  read_and_strip_branch: fix typo'd address-of operator

6 years agoMerge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null'
Junio C Hamano [Tue, 17 Feb 2015 18:15:27 +0000 (10:15 -0800)]
Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null'

Fix a misspelled conditional that is always true.

* jk/remote-curl-an-array-in-struct-cannot-be-null:
  do not check truth value of flex arrays

6 years agoMerge branch 'jc/diff-format-doc'
Junio C Hamano [Tue, 17 Feb 2015 18:15:25 +0000 (10:15 -0800)]
Merge branch 'jc/diff-format-doc'

The documentation incorrectly said that C(opy) and R(ename) are the
only ones that can be followed by the score number in the output in
the --raw format.

* jc/diff-format-doc:
  diff-format doc: a score can follow M for rewrite

6 years agoMerge branch 'jk/dumb-http-idx-fetch-fix'
Junio C Hamano [Tue, 17 Feb 2015 18:15:24 +0000 (10:15 -0800)]
Merge branch 'jk/dumb-http-idx-fetch-fix'

A broken pack .idx file in the receiving repository prevented the
dumb http transport from fetching a good copy of it from the other
side.

* jk/dumb-http-idx-fetch-fix:
  dumb-http: do not pass NULL path to parse_pack_index

6 years agoMerge branch 'mg/commit-author-no-match-malformed-message'
Junio C Hamano [Tue, 17 Feb 2015 18:15:23 +0000 (10:15 -0800)]
Merge branch 'mg/commit-author-no-match-malformed-message'

The error message from "git commit", when a non-existing author
name was given as value to the "--author=" parameter, has been
reworded to avoid misunderstanding.

* mg/commit-author-no-match-malformed-message:
  commit: reword --author error message

6 years agoMerge branch 'jc/doc-log-rev-list-options'
Junio C Hamano [Tue, 17 Feb 2015 18:15:22 +0000 (10:15 -0800)]
Merge branch 'jc/doc-log-rev-list-options'

"git log --help" used to show rev-list options that are irrelevant
to the "log" command.

* jc/doc-log-rev-list-options:
  Documentation: what does "git log --indexed-objects" even mean?

6 years agoMerge branch 'jc/apply-ws-fix-expands'
Junio C Hamano [Tue, 17 Feb 2015 18:15:20 +0000 (10:15 -0800)]
Merge branch 'jc/apply-ws-fix-expands'

"git apply --whitespace=fix" used to under-allocate the memory
when the fix resulted in a longer text than the original patch.

* jc/apply-ws-fix-expands:
  apply: count the size of postimage correctly
  apply: make update_pre_post_images() sanity check the given postlen
  apply.c: typofix

6 years agoMerge branch 'ak/add-i-empty-candidates'
Junio C Hamano [Tue, 17 Feb 2015 18:15:19 +0000 (10:15 -0800)]
Merge branch 'ak/add-i-empty-candidates'

The interactive "show a list and let the user choose from it"
interface "add -i" used showed and prompted to the user even when
the candidate list was empty, against which the only "choice" the
user could have made was to choose nothing.

* ak/add-i-empty-candidates:
  add -i: return from list_and_choose if there is no candidate

6 years agoMerge branch 'ks/rebase-i-abbrev'
Junio C Hamano [Tue, 17 Feb 2015 18:15:18 +0000 (10:15 -0800)]
Merge branch 'ks/rebase-i-abbrev'

The insn sheet "git rebase -i" creates did not fully honor
core.abbrev settings.

* ks/rebase-i-abbrev:
  rebase -i: use full object name internally throughout the script

6 years agoMerge branch 'mh/deref-symref-over-helper-transport'
Junio C Hamano [Tue, 17 Feb 2015 18:15:17 +0000 (10:15 -0800)]
Merge branch 'mh/deref-symref-over-helper-transport'

"git fetch" over a remote-helper that cannot respond to "list"
command could not fetch from a symbolic reference e.g. HEAD.

* mh/deref-symref-over-helper-transport:
  transport-helper: do not request symbolic refs to remote helpers

6 years agohex.c: reduce memory footprint of sha1_to_hex static buffers
Stefan Beller [Fri, 13 Feb 2015 21:18:49 +0000 (13:18 -0800)]
hex.c: reduce memory footprint of sha1_to_hex static buffers

41 bytes is the exact number of bytes needed for having the returned
hex string represented. 50 seems to be an arbitrary number, such
that there are no benefits from alignment to certain address boundaries.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agodo not include the same header twice
Дилян Палаузов [Fri, 13 Feb 2015 14:47:39 +0000 (14:47 +0000)]
do not include the same header twice

A few files include the same header file directly more than once.

As all these headers protect themselves against repeated inclusion
by the "#ifndef FOO_H / #define FOO_H / ... / #endif" idiom, leave
only the first inclusion and remove the later inclusion as a no-op
clean-up.

Signed-off-by: Дилян Палаузов <git-dpa@aegee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agotransport-helper: fix typo in error message when --signed is not supported
Mike Hommey [Thu, 12 Feb 2015 10:10:01 +0000 (19:10 +0900)]
transport-helper: fix typo in error message when --signed is not supported

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoxread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX
Junio C Hamano [Wed, 11 Feb 2015 21:13:10 +0000 (13:13 -0800)]
xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX

Since 0b6806b9 (xread, xwrite: limit size of IO to 8MB, 2013-08-20),
we chomp our calls to read(2) and write(2) into chunks of
MAX_IO_SIZE bytes (8 MiB), because a large IO results in a bad
latency when the program needs to be killed.  This also brought our
IO below SSIZE_MAX, which is a limit POSIX allows read(2) and
write(2) to fail when the IO size exceeds it, for OS X, where a
problem was originally reported.

However, there are other systems that define SSIZE_MAX smaller than
our default, and feeding 8 MiB to underlying read(2)/write(2) would
fail.  Make sure we clip our calls to the lower limit as well.

Reported-by: Joachim Schmitz <jojo@schmitz-digital.de>
Helped-by: Torsten Bögershausen <tboegi@web.de>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoPost 2.3 cycle (batch #1)
Junio C Hamano [Wed, 11 Feb 2015 21:54:03 +0000 (13:54 -0800)]
Post 2.3 cycle (batch #1)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'ah/usage-strings'
Junio C Hamano [Wed, 11 Feb 2015 21:44:19 +0000 (13:44 -0800)]
Merge branch 'ah/usage-strings'

* ah/usage-strings:
  standardize usage info string format

6 years agoMerge branch 'jc/pretty-format-doc'
Junio C Hamano [Wed, 11 Feb 2015 21:44:16 +0000 (13:44 -0800)]
Merge branch 'jc/pretty-format-doc'

* jc/pretty-format-doc:
  "log --pretty" documentation: do not forget "tformat:"

6 years agoMerge branch 'jc/unused-symbols'
Junio C Hamano [Wed, 11 Feb 2015 21:44:07 +0000 (13:44 -0800)]
Merge branch 'jc/unused-symbols'

Mark file-local symbols as "static", and drop functions that nobody
uses.

* jc/unused-symbols:
  shallow.c: make check_shallow_file_for_update() static
  remote.c: make clear_cas_option() static
  urlmatch.c: make match_urls() static
  revision.c: make save_parents() and free_saved_parents() static
  line-log.c: make line_log_data_init() static
  pack-bitmap.c: make pack_bitmap_filename() static
  prompt.c: remove git_getpass() nobody uses
  http.c: make finish_active_slot() and handle_curl_result() static

6 years agoMerge branch 'jc/push-to-checkout'
Junio C Hamano [Wed, 11 Feb 2015 21:43:56 +0000 (13:43 -0800)]
Merge branch 'jc/push-to-checkout'

Extending the js/push-to-deploy topic, the behaviour of "git push"
when updating the working tree and the index with an update to the
branch that is checked out can be tweaked by push-to-checkout hook.

* jc/push-to-checkout:
  receive-pack: support push-to-checkout hook
  receive-pack: refactor updateInstead codepath

6 years agoMerge branch 'sb/atomic-push'
Junio C Hamano [Wed, 11 Feb 2015 21:43:50 +0000 (13:43 -0800)]
Merge branch 'sb/atomic-push'

"git push" has been taught a "--atomic" option that makes push to
update more than one ref an "all-or-none" affair.

* sb/atomic-push:
  Document receive.advertiseatomic
  t5543-atomic-push.sh: add basic tests for atomic pushes
  push.c: add an --atomic argument
  send-pack.c: add --atomic command line argument
  send-pack: rename ref_update_to_be_sent to check_to_send_update
  receive-pack.c: negotiate atomic push support
  receive-pack.c: add execute_commands_atomic function
  receive-pack.c: move transaction handling in a central place
  receive-pack.c: move iterating over all commands outside execute_commands
  receive-pack.c: die instead of error in case of possible future bug
  receive-pack.c: shorten the execute_commands loop over all commands

6 years agoMerge branch 'mh/reflog-expire'
Junio C Hamano [Wed, 11 Feb 2015 21:43:38 +0000 (13:43 -0800)]
Merge branch 'mh/reflog-expire'

Restructure "reflog expire" to fit the reflogs better with the
recently updated ref API.

Looked reasonable (except that some shortlog entries stood out like
a sore thumb).

* mh/reflog-expire: (24 commits)
  refs.c: let fprintf handle the formatting
  refs.c: don't expose the internal struct ref_lock in the header file
  lock_any_ref_for_update(): inline function
  refs.c: remove unlock_ref/close_ref/commit_ref from the refs api
  reflog_expire(): new function in the reference API
  expire_reflog(): treat the policy callback data as opaque
  Move newlog and last_kept_sha1 to "struct expire_reflog_cb"
  expire_reflog(): move rewrite to flags argument
  expire_reflog(): move verbose to flags argument
  expire_reflog(): pass flags through to expire_reflog_ent()
  struct expire_reflog_cb: a new callback data type
  Rename expire_reflog_cb to expire_reflog_policy_cb
  expire_reflog(): move updateref to flags argument
  expire_reflog(): move dry_run to flags argument
  expire_reflog(): add a "flags" argument
  expire_reflog(): extract two policy-related functions
  Extract function should_expire_reflog_ent()
  expire_reflog(): use a lock_file for rewriting the reflog file
  expire_reflog(): return early if the reference has no reflog
  expire_reflog(): rename "ref" parameter to "refname"
  ...

6 years agoMerge branch 'cj/log-invert-grep'
Junio C Hamano [Wed, 11 Feb 2015 21:42:39 +0000 (13:42 -0800)]
Merge branch 'cj/log-invert-grep'

"git log --invert-grep --grep=WIP" will show only commits that do
not have the string "WIP" in their messages.

* cj/log-invert-grep:
  log: teach --invert-grep option

6 years agoMerge branch 'km/gettext-n'
Junio C Hamano [Wed, 11 Feb 2015 21:42:00 +0000 (13:42 -0800)]
Merge branch 'km/gettext-n'

* km/gettext-n:
  gettext.h: add parentheses around N_ expansion if supported

6 years agoMerge branch 'bc/http-fallback-to-password-after-krb-fails'
Junio C Hamano [Wed, 11 Feb 2015 21:41:55 +0000 (13:41 -0800)]
Merge branch 'bc/http-fallback-to-password-after-krb-fails'

After attempting and failing a password-less authentication
(e.g. kerberos), libcURL refuses to fall back to password based
Basic authentication without a bit of help/encouragement.

* bc/http-fallback-to-password-after-krb-fails:
  remote-curl: fall back to Basic auth if Negotiate fails

6 years agoMerge branch 'dk/format-patch-ignore-diff-submodule'
Junio C Hamano [Wed, 11 Feb 2015 21:41:51 +0000 (13:41 -0800)]
Merge branch 'dk/format-patch-ignore-diff-submodule'

Setting diff.submodule to 'log' made "git format-patch" produce
broken patches.

* dk/format-patch-ignore-diff-submodule:
  format-patch: ignore diff.submodule setting
  t4255: test am submodule with diff.submodule

6 years agoMerge branch 'jn/rerere-fail-on-auto-update-failure'
Junio C Hamano [Wed, 11 Feb 2015 21:41:44 +0000 (13:41 -0800)]
Merge branch 'jn/rerere-fail-on-auto-update-failure'

"git rerere" (invoked internally from many mergy operations) did
not correctly signal errors when told to update the working tree
files and failed to do so for whatever reason.

* jn/rerere-fail-on-auto-update-failure:
  rerere: error out on autoupdate failure

6 years agoMerge branch 'jk/blame-commit-label'
Junio C Hamano [Wed, 11 Feb 2015 21:39:50 +0000 (13:39 -0800)]
Merge branch 'jk/blame-commit-label'

"git blame HEAD -- missing" failed to correctly say "HEAD" when it
tried to say "No such path 'missing' in HEAD".

* jk/blame-commit-label:
  blame.c: fix garbled error message
  use xstrdup_or_null to replace ternary conditionals
  builtin/commit.c: use xstrdup_or_null instead of envdup
  builtin/apply.c: use xstrdup_or_null instead of null_strdup
  git-compat-util: add xstrdup_or_null helper

6 years agoMerge branch 'ld/p4-submit-hint'
Junio C Hamano [Wed, 11 Feb 2015 21:39:44 +0000 (13:39 -0800)]
Merge branch 'ld/p4-submit-hint'

* ld/p4-submit-hint:
  git-p4: correct --prepare-p4-only instructions

6 years agoMerge branch 'ld/p4-exclude-in-sync'
Junio C Hamano [Wed, 11 Feb 2015 21:38:41 +0000 (13:38 -0800)]
Merge branch 'ld/p4-exclude-in-sync'

Like the "clone" subcommand, allow excluding subdirectories in the
"sync" subcommand.

* ld/p4-exclude-in-sync:
  git-p4: support excluding paths on sync

6 years agogit-p4: support excluding paths on sync
Luke Diamand [Sat, 17 Jan 2015 20:56:38 +0000 (20:56 +0000)]
git-p4: support excluding paths on sync

The clone subcommand has long had support for excluding
subdirectories, but sync has not. This is a nuisance,
since as soon as you do a sync, any changed files that
were initially excluded start showing up.

Move the "exclude" command-line option into the parent
class; the actual behavior was already present there so
it simply had to be exposed.

Signed-off-by: Luke Diamand <luke@diamand.org>
Reviewed-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'jc/coding-guidelines'
Junio C Hamano [Wed, 11 Feb 2015 21:37:42 +0000 (13:37 -0800)]
Merge branch 'jc/coding-guidelines'

* jc/coding-guidelines:
  CodingGuidelines: clarify C #include rules

6 years agoMerge branch 'ak/typofixes'
Junio C Hamano [Wed, 11 Feb 2015 21:37:38 +0000 (13:37 -0800)]
Merge branch 'ak/typofixes'

* ak/typofixes:
  t/lib-terminal.sh: fix typo
  pack-bitmap: fix typo

6 years agomerge-file: correctly open files when in a subdir
Aleksander Boruch-Gruszecki [Sun, 8 Feb 2015 16:53:53 +0000 (17:53 +0100)]
merge-file: correctly open files when in a subdir

run_setup_gently() is called before merge-file. This may result in changing
current working directory, which wasn't taken into account when opening a file
for writing.

Fix by prepending the passed prefix. Previous var is left so that error
messages keep referring to the file from the user's working directory
perspective.

Signed-off-by: Aleksander Boruch-Gruszecki <aleksander.boruchgruszecki@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agofast-import: avoid running end_packfile recursively
Jeff King [Tue, 10 Feb 2015 01:07:19 +0000 (20:07 -0500)]
fast-import: avoid running end_packfile recursively

When an import has finished, we run end_packfile() to
finalize the data and move the packfile into place. If this
process fails, we call die() and end up in our die_nicely()
handler.  Which unfortunately includes running end_packfile
to save any progress we made. We enter the function again,
and start operating on the pack_data struct while it is in
an inconsistent state, leading to a segfault.

One way to trigger this is to simply start two identical
fast-imports at the same time. They will both create the
same packfiles, which will then try to create identically
named ".keep" files. One will win the race, and the other
will die(), and end up with the segfault.

Since 3c078b9, we already reset the pack_data pointer to
NULL at the end of end_packfile. That covers the case of us
calling die() right after end_packfile, before we have
reinitialized the pack_data pointer. This new problem is
quite similar, except that we are worried about calling
die() _during_ end_packfile, not right after. Ideally we
would simply set pack_data to NULL as soon as we enter the
function, and operate on a copy of the pointer.

Unfortunately, it is not so easy. pack_data is a global, and
end_packfile calls into other functions which operate on the
global directly. We would have to teach each of these to
take an argument, and there is no guarantee that we would
catch all of the spots.

Instead, we can simply use a static flag to avoid
recursively entering the function. This is a little less
elegant, but it's short and fool-proof.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agobuiltin/blame: destroy initialized commit_info only
Eric Sunshine [Mon, 9 Feb 2015 21:28:07 +0000 (16:28 -0500)]
builtin/blame: destroy initialized commit_info only

Since ea02ffa3 (mailmap: simplify map_user() interface, 2013-01-05),
find_alignment() has been invoking commit_info_destroy() on an
uninitialized auto 'struct commit_info' (when METAINFO_SHOWN is not
set). commit_info_destroy() calls strbuf_release() for each
'commit_info' strbuf member, which randomly invokes free() on
whatever random stack value happens to reside in strbuf.buf, thus
leading to periodic crashes.

Reported-by: Dilyan Palauzov <dilyan.palauzov@aegee.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agosha1_file: fix iterating loose alternate objects
Jonathon Mah [Mon, 9 Feb 2015 01:15:39 +0000 (20:15 -0500)]
sha1_file: fix iterating loose alternate objects

The string in 'base' contains a path suffix to a specific object;
when its value is used, the suffix must either be filled (as in
stat_sha1_file, open_sha1_file, check_and_freshen_nonlocal) or
cleared (as in prepare_packed_git) to avoid junk at the end.

660c889e (sha1_file: add for_each iterators for loose and packed
objects, 2014-10-15) introduced loose_from_alt_odb(), but this did
neither and treated 'base' as a complete path to the "base" object
directory, instead of a pointer to the "base" of the full path
string.

The trailing path after 'base' is still initialized to NUL, hiding
the bug in some common cases.  Additionally the descendent
for_each_file_in_obj_subdir() function swallows ENOENT, so an error
only shows if the alternate's path was last filled with a valid
object (where statting /path/to/existing/00/0bjectfile/00 fails).

Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Helped-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agofor_each_loose_file_in_objdir: take an optional strbuf path
Jeff King [Mon, 9 Feb 2015 01:13:22 +0000 (20:13 -0500)]
for_each_loose_file_in_objdir: take an optional strbuf path

We feed a root "objdir" path to this iterator function,
which then copies the result into a strbuf, so that it can
repeatedly append the object sub-directories to it. Let's
make it easy for callers to just pass us a strbuf in the
first place.

We leave the original interface as a convenience for callers
who want to just pass a const string like the result of
get_object_directory().

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agogit-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED
Kyle J. McKay [Fri, 6 Feb 2015 09:35:31 +0000 (01:35 -0800)]
git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED

MAC_OS_X_VERSION_MIN_REQUIRED may be defined by the builder to a
specific version in order to produce compatible binaries for a
particular system.  Blindly defining it to MAC_OS_X_VERSION_10_6
is bad.

Additionally MAC_OS_X_VERSION_10_6 will not be defined on older
systems and should AvailabilityMacros.h be included on such as
system an error will result.  However, using the explicit value
of 1060 (which is what MAC_OS_X_VERSION_10_6 is defined to) does
not solve the problem.

The changes that introduced stepping on MAC_OS_X_VERSION_MIN were
made in b195aa00 (git-compat-util: suppress unavoidable
Apple-specific deprecation warnings) to avoid deprecation
warnings.

Instead of blindly setting MAC_OS_X_VERSION_MIN to 1060 change
the definition of DEPRECATED_ATTRIBUTE to empty to avoid the
warnings.  This preserves any MAC_OS_X_VERSION_MIN_REQUIRED
setting while avoiding the warnings as intended by b195aa00.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoGit 2.3 v2.3.0
Junio C Hamano [Thu, 5 Feb 2015 21:23:56 +0000 (13:23 -0800)]
Git 2.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoconfig_buf_ungetc: warn when pushing back a random character
Jeff King [Thu, 5 Feb 2015 21:00:24 +0000 (16:00 -0500)]
config_buf_ungetc: warn when pushing back a random character

Our config code simulates a stdio stream around a buffer,
but our fake ungetc() does not behave quite like the real
one. In particular, we only rewind the position by one
character, but do _not_ actually put the character from the
caller into position.

It turns out that this does not matter, because we only ever
push back the character we just read. In other words, such
an assignment would be a noop. But because the function is
called ungetc, and because it takes a character parameter,
it is a mistake waiting to happen.

Actually assigning the character into the buffer would be
ideal, but our pointer is actually a "const" copy of the
buffer. We do not know who the real owner of the buffer is
in this code, and would not want to munge their contents.

Instead, we can simply add an assertion that matches what
the current caller does, and will let us know if new callers
are added that violate the contract.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agodecimal_width: avoid integer overflow
Jeff King [Thu, 5 Feb 2015 08:14:19 +0000 (03:14 -0500)]
decimal_width: avoid integer overflow

The decimal_width function originally appeared in blame.c as
"lineno_width", and was designed for calculating the
print-width of small-ish integer values (line numbers in
text files). In ec7ff5b, it was made into a reusable
function, and in dc801e7, we started using it to align
diffstats.

Binary files in a diffstat show byte counts rather than line
numbers, meaning they can be quite large (e.g., consider
adding or removing a 2GB file). decimal_width is not up to
the challenge for two reasons:

  1. It takes the value as an "int", whereas large files may
     easily surpass this. The value may be truncated, in
     which case we will produce an incorrect value.

  2. It counts "up" by repeatedly multiplying another
     integer by 10 until it surpasses the value.  This can
     cause an infinite loop when the value is close to the
     largest representable integer.

     For example, consider using a 32-bit signed integer,
     and a value of 2,140,000,000 (just shy of 2^31-1).
     We will count up and eventually see that 1,000,000,000
     is smaller than our value. The next step would be to
     multiply by 10 and see that 10,000,000,000 is too
     large, ending the loop. But we can't represent that
     value, and we have signed overflow.

     This is technically undefined behavior, but a common
     behavior is to lose the high bits, in which case our
     iterator will certainly be less than the number. So
     we'll keep multiplying, overflow again, and so on.

This patch changes the argument to a uintmax_t (the same
type we use to store the diffstat information for binary
filese), and counts "down" by repeatedly dividing our value
by 10.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoconfig: do not ungetc EOF
Jeff King [Thu, 5 Feb 2015 06:53:28 +0000 (01:53 -0500)]
config: do not ungetc EOF

When we are parsing a config value, if we see a carriage
return, we fgetc the next character to see if it is a
line feed (in which case we silently drop the CR). If it
isn't, we then ungetc the character, and take the literal
CR.

But we never check whether we in fact got a character at
all. If the config file ends in CR, we will get EOF here,
and try to ungetc EOF. This works OK for a real stdio
stream. The ungetc returns an error, and the next fgetc will
then return EOF again.

However, our custom buffer-based stream is not so fortunate.
It happily rewinds the position of the stream by one
character, ignoring the fact that we fed it EOF. The next
fgetc call returns the final CR again, over and over, and we
end up in an infinite loop.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agocheck-builtins: strip executable suffix $X when enumerating builtins
Sebastian Schuberth [Thu, 5 Feb 2015 13:28:04 +0000 (14:28 +0100)]
check-builtins: strip executable suffix $X when enumerating builtins

On Windows, the builtin executable names are suffixed with $X.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agorun_diff_files(): clarify computation of sha1 validity
Junio C Hamano [Thu, 11 Dec 2014 21:11:06 +0000 (13:11 -0800)]
run_diff_files(): clarify computation of sha1 validity

Remove the need to have duplicated "if there is a change then feed
null_sha1 and otherwise sha1 from the cache entry" for the "new"
side of the diff by introducing two temporary variables to point
at the object name of the old and the new side of the blobs.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoewah: fix building with gcc < 3.4.0
Tom G. Christensen [Wed, 4 Feb 2015 08:23:16 +0000 (09:23 +0100)]
ewah: fix building with gcc < 3.4.0

The __builtin_ctzll function was added in gcc 3.4.0.
This extends the check for gcc so that use of __builtin_ctzll is only
enabled if gcc >= 3.4.0.

Signed-off-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMakefile: handle broken curl version number in version check
Tom G. Christensen [Fri, 30 Jan 2015 09:52:34 +0000 (10:52 +0100)]
Makefile: handle broken curl version number in version check

curl 7.11.0 through 7.12.2 when built from their official release
archives will present a 5 digit version number instead of the documented
6 digits which breaks the version check in the Makefile.
Correct these broken version numbers on the fly when extracting them to
ensure the comparison works correctly.

[jc: shortened the new sed scripts a bit]

Signed-off-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agohttp: support curl < 7.10.7
Tom G. Christensen [Tue, 3 Feb 2015 17:30:08 +0000 (18:30 +0100)]
http: support curl < 7.10.7

Commit dd61399 introduced support for http proxies that require
authentication but it relies on the CURL_PROXYAUTH option which was
added in curl 7.10.7.
This makes sure proxy authentication is only enabled if libcurl can
support it.

Signed-off-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agogit-submodule.sh: fix '/././' path normalization
Patrick Steinhardt [Fri, 30 Jan 2015 15:14:03 +0000 (16:14 +0100)]
git-submodule.sh: fix '/././' path normalization

When we add a new submodule the path of the submodule is being
normalized. We fail to normalize multiple adjacent '/./', though.
Thus 'path/to/././submodule' will become 'path/to/./submodule' where
it should be 'path/to/submodule' instead.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge git://github.com/git-l10n/git-po
Junio C Hamano [Mon, 2 Feb 2015 20:05:56 +0000 (12:05 -0800)]
Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: ca.po: Fix trailing whitespace

6 years agoCodingGuidelines: describe naming rules for configuration variables
Junio C Hamano [Tue, 27 Jan 2015 20:26:03 +0000 (12:26 -0800)]
CodingGuidelines: describe naming rules for configuration variables

We may want to say something about command line option names in the
new section as well, but for now, let's make sure everybody is clear
on how to structure and name their configuration variables.

The text for the rules are partly taken from the log message of
Jonathan's 6b3020a2 (add: introduce add.ignoreerrors synonym for
add.ignore-errors, 2010-12-01).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agol10n: ca.po: Fix trailing whitespace
Alex Henrie [Fri, 30 Jan 2015 22:02:34 +0000 (15:02 -0700)]
l10n: ca.po: Fix trailing whitespace

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
6 years agoDocumentation/git-remote.txt: stress that set-url is not for triangular
Junio C Hamano [Thu, 29 Jan 2015 20:26:09 +0000 (12:26 -0800)]
Documentation/git-remote.txt: stress that set-url is not for triangular

It seems to be a common mistake to try using a single remote
(e.g. 'origin') to fetch from one place (i.e. upstream) while
pushing to another (i.e. your publishing point).

That will never work satisfactorily, and it is easy to understand
why if you think about what refs/remotes/origin/* would mean in such
a world.  It fundamentally cannot reflect the reality.  If it
follows the state of your upstream, it cannot match what you have
published, and vice versa.

It may be that misinformation is spread by some people.  Let's
counter them by adding a few words to our documentation.

 - The description was referring to <oldurl> and <newurl>, but never
   mentioned <name> argument you give from the command line.  By
   mentioning "remote <name>", stress the fact that it is configuring
   a single remote.

 - Add a reminder that explicitly states that this is about a single
   remote, which the triangular workflow is not about.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot/lib-gpg: sanity-check that we can actually sign
Jeff King [Thu, 29 Jan 2015 15:51:11 +0000 (10:51 -0500)]
t/lib-gpg: sanity-check that we can actually sign

Some older versions of gpg (reportedly v1.2.6 from RHEL4) cannot
import the keyrings found in our test suite, and thus cannot even
make a signature.  The previous change works it around, but we
cannot anticipate breakages update to GPG would cause in the future.

Do a test-sign before declaring the GPG prerequisite fulfilled
to future-proof our tests.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot/lib-gpg: include separate public keys in keyring.gpg
Jeff King [Thu, 29 Jan 2015 15:43:20 +0000 (10:43 -0500)]
t/lib-gpg: include separate public keys in keyring.gpg

Since 1e3eefb (tests: replace binary GPG keyrings with
ASCII-armored keys, 2014-12-12), we import our test GPG keys
from a single file. Each keypair in the import stream
contains both the secret and public keys. However, older
versions of gpg reportedly fail to import the public half of
the key. We can solve this by including duplicates of the
public keys separately. The duplicates are ignored by modern
gpg, and this makes older versions work.

Reported by Tom G. Christensen <tgc@statsbiblioteket.dk> on
gpg 1.2.6 (from RHEL4).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot4122: use test_write_lines from test-lib-functions
Junio C Hamano [Thu, 29 Jan 2015 05:15:24 +0000 (21:15 -0800)]
t4122: use test_write_lines from test-lib-functions

Instead of using a custom lecho function, just use what the test
framework already gives us.

Signed-off-by: Junio C Hamano <gitster@pobox.com>