Use "SHA-1" instead of "SHA1" whenever we talk about the hash function.
When used as a programming symbol, we keep "SHA1".
Signed-off-by: NThomas Ackermann <th.acker@arcor.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The name of the hash function is "SHA-1", not "SHA1".

Also to people who look up "object name" in the glossary,
the details of which hash function is applied on what to
compute "object name" is not important but the fact that the
name is meant to be an unique identifier for the contents
stored in the object is.
Signed-off-by: NThomas Ackermann <th.acker@arcor.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NThomas Ackermann <th.acker@arcor.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* rr/test-3200-style:
  t3200 (branch): modernize style

Conflicts:
	t/t3200-branch.sh

* mg/texinfo-5:
  Documentation: Strip texinfo anchors to avoid duplicates

* jk/diffcore-break-divzero:
  diffcore-break: don't divide by zero

* cn/commit-amend-doc:
  Documentation/git-commit: reword the --amend explanation

* jk/bisect-prn-unsigned:
  bisect: avoid signed integer overflow

* jk/no-more-self-assignment:
  match-trees: simplify score_trees() using tree_entry()
  submodule: clarify logic in show_submodule_summary

* rr/send-email-perl-critique:
  send-email: use the three-arg form of open in recipients_cmd
  send-email: drop misleading function prototype
  send-email: use "return;" not "return undef;" on error codepaths

* jc/t5516-pushInsteadOf-vs-pushURL:
  t5516: test interaction between pushURL and pushInsteadOf correctly

Most of these were found using Lucas De Marchi's codespell tool.
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Correct spelling mistakes noticed using Lucas De Marchi's codespell
tool.
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Noticed using Lucas De Marchi's codespell tool.
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Correct some typos found using Lucas De Marchi's codespell tool.
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Some of these were found using Lucas De Marchi's codespell tool.
Others noticed by Eric Sunshine.
Helped-by: NEric Sunshine <sunshine@sunshineco.com>
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Noticed using Lucas De Marchi's codespell tool.
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Noticed with Lucas De Marchi's codespell tool.
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Most of these were found using Lucas De Marchi's codespell tool.
Others were pointed out by Eric Sunshine.
Helped-by: NEric Sunshine <sunshine@sunshineco.com>
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Most of these were found using Lucas De Marchi's codespell tool.
Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint-1.8.1:
  fast-export: fix argument name in error messages
  Documentation: distinguish between ref and offset deltas in pack-format

The --signed-tags argument is plural, while error messages referred
to --signed-tag (singular).  Tweak error messages to correspond to the
argument.
Signed-off-by: NPaul Price <price@astro.princeton.edu>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

eb32d236 introduced the OBJ_OFS_DELTA object that uses a relative offset to
identify the base object instead of the 20-byte SHA1 reference. The pack file
documentation only mentions the SHA1 based reference in its description of the
deltified object entry.

Update the pack format documentation to clarify that the deltified object
representation refers to its base using either a relative negative offset or
the absolute SHA1 identifier.
Signed-off-by: NStefan Saasen <ssaasen@atlassian.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* tb/document-status-u-tradeoff:
  i18n: make the translation of -u advice in one go

The advice (consider use of -u when read_directory takes too long) is
separated into 3 different status_printf_ln() calls, and which brings
trouble for translators.

Since status_vprintf() called by status_printf_ln() can handle eol in
buffer, we could simply join these lines into one paragraph.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
Reviewed-by: NEric Sunshine <sunshine@sunshineco.com>
Reviewed-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NBenoit Bourbie <benoit.bourbie@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The 'PIPE' test prerequisite was already defined identically by t9010
and t9300, therefore it makes sense to make it a predefined
prerequisite.
Signed-off-by: NAdam Spiers <git@adamspiers.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Make it a bit clearer that --worktree-attributes is about files in the
working tree (checked out files, possibly changed) and not the current
working directory ($PWD).  Link to the ATTRIBUTES section, which has
more details.
Reported-by: NAmit Bakshi <ambakshi@gmail.com>
Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NSimon Ruderich <simon@ruderich.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

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

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

A pattern "dir" (without trailing slash) in the attributes file
stopped matching a directory "dir" by mistake with an earlier change
that wanted to allow pattern "dir/" to also match.

* jc/directory-attrs-regression-fix:
  t: check that a pattern without trailing slash matches a directory
  dir.c::match_pathname(): pay attention to the length of string parameters
  dir.c::match_pathname(): adjust patternlen when shifting pattern
  dir.c::match_basename(): pay attention to the length of string parameters
  attr.c::path_matches(): special case paths that end with a slash
  attr.c::path_matches(): the basename is part of the pathname

Using grep "devel\s\+3:" to find at least one whitspace is not
portable on all grep versions; not all grep versions understand "\s"
as a "whitespace".

Use a literal TAB followed by SPACE.

The + as a qualifier for "one or more" is not a basic regular
expression; use egrep instead of grep.
Signed-off-by: NTorsten Bögershausen <tboegi@web.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The explanation for 'git commit --amend' talks about preparing a tree
object, which shouldn't be how user-facing documentation talks about
commit.

Reword it to say it works as usual, but replaces the current commit.
Signed-off-by: NCarlos Martín Nieto <cmn@elego.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Eric Wong noticed that the address at suse.cz no longer works.
We may want to update in-code addresses as well, but let's do
this first in 'maint'.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* nd/index-pack-threaded-fixes:
  index-pack: guard nr_resolved_deltas reads by lock
  index-pack: protect deepest_delta in multithread code

* jk/index-pack-correct-depth-fix:
  index-pack: always zero-initialize object_entry list

"submodule summary --summary-limit" option did not support
"--option=value" form.

* rs/submodule-summary-limit:
  submodule summary: support --summary-limit=<n>

* jk/peel-ref:
  upload-pack: load non-tip "want" objects from disk
  upload-pack: make sure "want" objects are parsed
  upload-pack: drop lookup-before-parse optimization