]> git.ipfire.org Git - thirdparty/git.git/log
thirdparty/git.git
7 years agoMerge branch 'bh/diff-highlight-graph' into maint
Junio C Hamano [Mon, 19 Sep 2016 20:51:38 +0000 (13:51 -0700)] 
Merge branch 'bh/diff-highlight-graph' into maint

"diff-highlight" script (in contrib/) learned to work better with
"git log -p --graph" output.

* bh/diff-highlight-graph:
  diff-highlight: avoid highlighting combined diffs
  diff-highlight: add multi-byte tests
  diff-highlight: ignore test cruft
  diff-highlight: add support for --graph output
  diff-highlight: add failing test for handling --graph output
  diff-highlight: add some tests

7 years agoMerge branch 'po/range-doc' into maint
Junio C Hamano [Mon, 19 Sep 2016 20:51:37 +0000 (13:51 -0700)] 
Merge branch 'po/range-doc' into maint

Clarify various ways to specify the "revision ranges" in the
documentation.

* po/range-doc:
  doc: revisions: sort examples and fix alignment of the unchanged
  doc: revisions: show revision expansion in examples
  doc: revisions - clarify reachability examples
  doc: revisions - define `reachable`
  doc: gitrevisions - clarify 'latter case' is revision walk
  doc: gitrevisions - use 'reachable' in page description
  doc: revisions: single vs multi-parent notation comparison
  doc: revisions: extra clarification of <rev>^! notation effects
  doc: revisions: give headings for the two and three dot notations
  doc: show the actual left, right, and boundary marks
  doc: revisions - name the left and right sides
  doc: use 'symmetric difference' consistently

7 years agoMerge tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po into maint
Junio C Hamano [Mon, 12 Sep 2016 22:23:42 +0000 (15:23 -0700)] 
Merge tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po into maint

l10n-2.10.0-rnd2.3

* tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: review for git v2.10.0 l10n
  l10n: zh_CN: fixed some typos for git 2.10.0
  l10n: pt_PT: update Portuguese repository info
  l10n: pt_PT: update Portuguese translation

7 years agol10n: zh_CN: review for git v2.10.0 l10n
Ray Chen [Wed, 7 Sep 2016 10:03:04 +0000 (18:03 +0800)] 
l10n: zh_CN: review for git v2.10.0 l10n

Signed-off-by: Ray Chen <oldsharp@gmail.com>
7 years agol10n: zh_CN: fixed some typos for git 2.10.0
Jiang Xin [Mon, 5 Sep 2016 15:26:21 +0000 (23:26 +0800)] 
l10n: zh_CN: fixed some typos for git 2.10.0

Reviewed-by: Ray <tvvocold@163.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
7 years agoStart maintenance track for 2.10.x series
Junio C Hamano [Fri, 9 Sep 2016 04:39:38 +0000 (21:39 -0700)] 
Start maintenance track for 2.10.x series

7 years agoPrepare for 2.9.4
Junio C Hamano [Fri, 9 Sep 2016 04:37:59 +0000 (21:37 -0700)] 
Prepare for 2.9.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'hv/doc-commit-reference-style' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:36:03 +0000 (21:36 -0700)] 
Merge branch 'hv/doc-commit-reference-style' into maint

A small doc update.

* hv/doc-commit-reference-style:
  SubmittingPatches: use gitk's "Copy commit summary" format
  SubmittingPatches: document how to reference previous commits

7 years agoMerge branch 'sg/reflog-past-root' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:36:02 +0000 (21:36 -0700)] 
Merge branch 'sg/reflog-past-root' into maint

A small test clean-up for a topic introduced in v2.9.1 and later.

* sg/reflog-past-root:
  t1410: remove superfluous 'git reflog' from the 'walk past root' test

7 years agoMerge branch 'rs/mailinfo-lib' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:36:01 +0000 (21:36 -0700)] 
Merge branch 'rs/mailinfo-lib' into maint

Small code clean-up.

* rs/mailinfo-lib:
  mailinfo: recycle strbuf in check_header()

7 years agoMerge branch 'jk/tighten-alloc' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:36:00 +0000 (21:36 -0700)] 
Merge branch 'jk/tighten-alloc' into maint

Small code and comment clean-up.

* jk/tighten-alloc:
  receive-pack: use FLEX_ALLOC_MEM in queue_command()
  correct FLEXPTR_* example in comment

7 years agoMerge branch 'rs/use-strbuf-add-unique-abbrev' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:59 +0000 (21:35 -0700)] 
Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint

A small code clean-up.

* rs/use-strbuf-add-unique-abbrev:
  use strbuf_add_unique_abbrev() for adding short hashes

7 years agoMerge branch 'rs/merge-recursive-string-list-init' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:59 +0000 (21:35 -0700)] 
Merge branch 'rs/merge-recursive-string-list-init' into maint

A small code clean-up.

* rs/merge-recursive-string-list-init:
  merge-recursive: use STRING_LIST_INIT_NODUP

7 years agoMerge branch 'rs/merge-add-strategies-simplification' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:58 +0000 (21:35 -0700)] 
Merge branch 'rs/merge-add-strategies-simplification' into maint

A small code clean-up.

* rs/merge-add-strategies-simplification:
  merge: use string_list_split() in add_strategies()

7 years agoMerge branch 'ls/packet-line-protocol-doc-fix' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:57 +0000 (21:35 -0700)] 
Merge branch 'ls/packet-line-protocol-doc-fix' into maint

Correct an age-old calco (is that a typo-like word for calc)
in the documentation.

* ls/packet-line-protocol-doc-fix:
  pack-protocol: fix maximum pkt-line size

7 years agoMerge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:56 +0000 (21:35 -0700)] 
Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint

The tempfile (hence its user lockfile) API lets the caller to open
a file descriptor to a temporary file, write into it and then
finalize it by first closing the filehandle and then either
removing or renaming the temporary file.  When the process spawns a
subprocess after obtaining the file descriptor, and if the
subprocess has not exited when the attempt to remove or rename is
made, the last step fails on Windows, because the subprocess has
the file descriptor still open.  Open tempfile with O_CLOEXEC flag
to avoid this (on Windows, this is mapped to O_NOINHERIT).

* bw/mingw-avoid-inheriting-fd-to-lockfile:
  mingw: ensure temporary file handles are not inherited by child processes
  t6026-merge-attr: child processes must not inherit index.lock handles

7 years agoMerge branch 'dg/document-git-c-in-git-config-doc' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:56 +0000 (21:35 -0700)] 
Merge branch 'dg/document-git-c-in-git-config-doc' into maint

The "git -c var[=val] cmd" facility to append a configuration
variable definition at the end of the search order was described in
git(1) manual page, but not in git-config(1), which was more likely
place for people to look for when they ask "can I make a one-shot
override, and if so how?"

* dg/document-git-c-in-git-config-doc:
  doc: mention `git -c` in git-config(1)

7 years agoMerge branch 'js/no-html-bypass-on-windows' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:55 +0000 (21:35 -0700)] 
Merge branch 'js/no-html-bypass-on-windows' into maint

On Windows, help.browser configuration variable used to be ignored,
which has been corrected.

* js/no-html-bypass-on-windows:
  Revert "display HTML in default browser using Windows' shell API"

7 years agoMerge branch 'jk/difftool-command-not-found' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:54 +0000 (21:35 -0700)] 
Merge branch 'jk/difftool-command-not-found' into maint

"git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal.  "git difftool" has been
taught to notice these exit status codes.

* jk/difftool-command-not-found:
  difftool: always honor fatal error exit codes

7 years agoMerge branch 'sb/checkout-explit-detach-no-advice' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:54 +0000 (21:35 -0700)] 
Merge branch 'sb/checkout-explit-detach-no-advice' into maint

"git checkout --detach <branch>" used to give the same advice
message as that is issued when "git checkout <tag>" (or anything
that is not a branch name) is given, but asking with "--detach" is
an explicit enough sign that the user knows what is going on.  The
advice message has been squelched in this case.

* sb/checkout-explit-detach-no-advice:
  checkout: do not mention detach advice for explicit --detach option

7 years agoMerge branch 'rs/pull-signed-tag' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:54 +0000 (21:35 -0700)] 
Merge branch 'rs/pull-signed-tag' into maint

When "git merge-recursive" works on history with many criss-cross
merges in "verbose" mode, the names the command assigns to the
virtual merge bases could have overwritten each other by unintended
reuse of the same piece of memory.

* rs/pull-signed-tag:
  commit: use FLEX_ARRAY in struct merge_remote_desc
  merge-recursive: fix verbose output for multiple base trees
  commit: factor out set_merge_remote_desc()
  commit: use xstrdup() in get_merge_parent()

7 years agoMerge branch 'js/test-lint-pathname' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:54 +0000 (21:35 -0700)] 
Merge branch 'js/test-lint-pathname' into maint

The "t/" hierarchy is prone to get an unusual pathname; "make test"
has been taught to make sure they do not contain paths that cannot
be checked out on Windows (and the mechanism can be reusable to
catch pathnames that are not portable to other platforms as need
arises).

* js/test-lint-pathname:
  t/Makefile: ensure that paths are valid on platforms we care

7 years agoMerge branch 'js/mv-dir-to-new-directory' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:54 +0000 (21:35 -0700)] 
Merge branch 'js/mv-dir-to-new-directory' into maint

"git mv dir non-existing-dir/" did not work in some environments
the same way as existing mainstream platforms.  The code now moves
"dir" to "non-existing-dir", without relying on rename("A", "B/")
that strips the trailing slash of '/'.

* js/mv-dir-to-new-directory:
  git mv: do not keep slash in `git mv dir non-existing-dir/`

7 years agoMerge branch 'js/import-tars-hardlinks' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:54 +0000 (21:35 -0700)] 
Merge branch 'js/import-tars-hardlinks' into maint

"import-tars" fast-import script (in contrib/) used to ignore a
hardlink target and replaced it with an empty file, which has been
corrected to record the same blob as the other file the hardlink is
shared with.

* js/import-tars-hardlinks:
  import-tars: support hard links

7 years agoMerge branch 'ms/document-pack-window-memory-is-per-thread' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:53 +0000 (21:35 -0700)] 
Merge branch 'ms/document-pack-window-memory-is-per-thread' into maint

* ms/document-pack-window-memory-is-per-thread:
  document git-repack interaction of pack.threads and pack.windowMemory

7 years agoMerge branch 'jk/push-force-with-lease-creation' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:53 +0000 (21:35 -0700)] 
Merge branch 'jk/push-force-with-lease-creation' into maint

"git push --force-with-lease" already had enough logic to allow
ensuring that such a push results in creation of a ref (i.e. the
receiving end did not have another push from sideways that would be
discarded by our force-pushing), but didn't expose this possibility
to the users.  It does so now.

* jk/push-force-with-lease-creation:
  t5533: make it pass on case-sensitive filesystems
  push: allow pushing new branches with --force-with-lease
  push: add shorthand for --force-with-lease branch creation
  Documentation/git-push: fix placeholder formatting

7 years agoMerge branch 'jk/reflog-date' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:52 +0000 (21:35 -0700)] 
Merge branch 'jk/reflog-date' into maint

The reflog output format is documented better, and a new format
--date=unix to report the seconds-since-epoch (without timezone)
has been added.

* jk/reflog-date:
  date: clarify --date=raw description
  date: add "unix" format
  date: document and test "raw-local" mode
  doc/pretty-formats: explain shortening of %gd
  doc/pretty-formats: describe index/time formats for %gd
  doc/rev-list-options: explain "-g" output formats
  doc/rev-list-options: clarify "commit@{Nth}" for "-g" option

7 years agoMerge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:51 +0000 (21:35 -0700)] 
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint

"git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.

* jc/renormalize-merge-kill-safer-crlf:
  merge: avoid "safer crlf" during recording of merge results
  convert: unify the "auto" handling of CRLF

7 years agoMerge branch 'jk/common-main' into maint
Junio C Hamano [Fri, 9 Sep 2016 04:35:50 +0000 (21:35 -0700)] 
Merge branch 'jk/common-main' into maint

There are certain house-keeping tasks that need to be performed at
the very beginning of any Git program, and programs that are not
built-in commands had to do them exactly the same way as "git"
potty does.  It was easy to make mistakes in one-off standalone
programs (like test helpers).  A common "main()" function that
calls cmd_main() of individual program has been introduced to
make it harder to make mistakes.

* jk/common-main:
  mingw: declare main()'s argv as const
  common-main: call git_setup_gettext()
  common-main: call restore_sigpipe_to_default()
  common-main: call sanitize_stdfds()
  common-main: call git_extract_argv0_path()
  add an extra level of indirection to main()

7 years agol10n: pt_PT: update Portuguese repository info
Vasco Almeida [Sat, 3 Sep 2016 12:10:32 +0000 (12:10 +0000)] 
l10n: pt_PT: update Portuguese repository info

Change Portuguese l10n leadership to Vasco Almeida.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
7 years agol10n: pt_PT: update Portuguese translation
Vasco Almeida [Sat, 3 Sep 2016 12:02:22 +0000 (12:02 +0000)] 
l10n: pt_PT: update Portuguese translation

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
7 years agoGit 2.10 v2.10.0
Junio C Hamano [Fri, 2 Sep 2016 16:05:47 +0000 (09:05 -0700)] 
Git 2.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po
Junio C Hamano [Fri, 2 Sep 2016 15:48:14 +0000 (08:48 -0700)] 
Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po

l10n-2.10.0-rnd2.2

* tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po:
  l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)

7 years agoMerge branch 'master' of https://github.com/vnwildman/git
Jiang Xin [Fri, 2 Sep 2016 13:29:48 +0000 (21:29 +0800)] 
Merge branch 'master' of https://github.com/vnwildman/git

* 'master' of https://github.com/vnwildman/git:
  l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)

7 years agoA few more fixes before the final 2.10
Junio C Hamano [Wed, 31 Aug 2016 17:21:05 +0000 (10:21 -0700)] 
A few more fixes before the final 2.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-po
Junio C Hamano [Wed, 31 Aug 2016 17:04:14 +0000 (10:04 -0700)] 
Merge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-po

l10n-2.10.0-rnd2

* tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: for git v2.10.0 l10n round 2
  l10n: ca.po: update translation
  l10n: fr.po v2.10.0-rc2
  l10n: sv.po: Update Swedish translation (2757t0f0u)
  l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)
  l10n: Updated Vietnamese translation for v2.10.0 (2789t)
  l10n: pt_PT: update Portuguese translation
  l10n: pt_PT: merge git.pot
  l10n: ko.po: Update Korean translation
  l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)

7 years agoMerge branch 'ls/packet-line-protocol-doc-fix'
Junio C Hamano [Wed, 31 Aug 2016 17:03:51 +0000 (10:03 -0700)] 
Merge branch 'ls/packet-line-protocol-doc-fix'

Correct an age-old calco (is that a typo-like word for calc)
in the documentation.

* ls/packet-line-protocol-doc-fix:
  pack-protocol: fix maximum pkt-line size

7 years agoMerge branch 'mh/blame-worktree'
Junio C Hamano [Wed, 31 Aug 2016 17:03:50 +0000 (10:03 -0700)] 
Merge branch 'mh/blame-worktree'

* mh/blame-worktree:
  blame: fix segfault on untracked files

7 years agoMerge branch 'kw/patch-ids-optim'
Junio C Hamano [Wed, 31 Aug 2016 17:03:49 +0000 (10:03 -0700)] 
Merge branch 'kw/patch-ids-optim'

* kw/patch-ids-optim:
  p3400: make test script executable

7 years agodiff-highlight: avoid highlighting combined diffs
Jeff King [Wed, 31 Aug 2016 05:05:38 +0000 (01:05 -0400)] 
diff-highlight: avoid highlighting combined diffs

The algorithm in diff-highlight only understands how to look
at two sides of a diff; it cannot correctly handle combined
diffs with multiple preimages. Often highlighting does not
trigger at all for these diffs because the line counts do
not match up.  E.g., if we see:

  - ours
   -theirs
  ++resolved

we would not bother highlighting; it naively looks like a
single line went away, and then a separate hunk added
another single line.

But of course there are exceptions. E.g., if the other side
deleted the line, we might see:

  - ours
  ++resolved

which looks like we dropped " ours" and added "+resolved".
This is only a small highlighting glitch (we highlight the
space and the "+" along with the content), but it's also the
tip of the iceberg. Even if we learned to find the true
content here (by noticing we are in a 3-way combined diff
and marking _two_ characters from the front of the line as
uninteresting), there are other more complicated cases where
we really do need to handle a 3-way hunk.

Let's just punt for now; we can recognize combined diffs by
the presence of extra "@" symbols in the hunk header, and
treat them as non-diff content.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodiff-highlight: add multi-byte tests
Jeff King [Wed, 31 Aug 2016 05:03:10 +0000 (01:03 -0400)] 
diff-highlight: add multi-byte tests

Now that we have a test suite for diff highlight, we can
show off the improvements from 8d00662 (diff-highlight: do
not split multibyte characters, 2015-04-03).

While we're at it, we can also add another case that
_doesn't_ work: combining code points are treated as their
own unit, which means that we may stick colors between them
and the character they are modifying (with the result that
the color is not shown in an xterm, though it's possible
that other terminals err the other way, and show the color
but not the accent).  There's no fix here, but let's
document it as a failure.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodiff-highlight: ignore test cruft
Jeff King [Wed, 31 Aug 2016 05:02:53 +0000 (01:02 -0400)] 
diff-highlight: ignore test cruft

These are the same as in the normal t/.gitignore, with the
exception of ".prove", as our Makefile does not support it.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agopack-protocol: fix maximum pkt-line size
Lars Schneider [Mon, 29 Aug 2016 17:55:09 +0000 (19:55 +0200)] 
pack-protocol: fix maximum pkt-line size

According to LARGE_PACKET_MAX in pkt-line.h the maximal length of a
pkt-line packet is 65520 bytes. The pkt-line header takes 4 bytes and
therefore the pkt-line data component must not exceed 65516 bytes.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agol10n: zh_CN: for git v2.10.0 l10n round 2
Jiang Xin [Sun, 28 Aug 2016 02:18:12 +0000 (10:18 +0800)] 
l10n: zh_CN: for git v2.10.0 l10n round 2

Update 215 translations (2757t0f0u) for git v2.10.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
7 years agop3400: make test script executable
RenĂ© Scharfe [Sun, 28 Aug 2016 12:39:27 +0000 (14:39 +0200)] 
p3400: make test script executable

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodiff-highlight: add support for --graph output
Brian Henderson [Mon, 29 Aug 2016 17:33:47 +0000 (10:33 -0700)] 
diff-highlight: add support for --graph output

Signed-off-by: Brian Henderson <henderson.bj@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodiff-highlight: add failing test for handling --graph output
Brian Henderson [Mon, 29 Aug 2016 17:33:46 +0000 (10:33 -0700)] 
diff-highlight: add failing test for handling --graph output

Signed-off-by: Brian Henderson <henderson.bj@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodiff-highlight: add some tests
Brian Henderson [Mon, 29 Aug 2016 17:33:45 +0000 (10:33 -0700)] 
diff-highlight: add some tests

Signed-off-by: Brian Henderson <henderson.bj@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoblame: fix segfault on untracked files
Thomas Gummerer [Sat, 27 Aug 2016 20:01:50 +0000 (21:01 +0100)] 
blame: fix segfault on untracked files

Since 3b75ee9 ("blame: allow to blame paths freshly added to the index",
2016-07-16) git blame also looks at the index to determine if there is a
file that was freshly added to the index.

cache_name_pos returns -pos - 1 in case there is no match is found, or
if the name matches, but the entry has a stage other than 0.  As git
blame should work for unmerged files, it uses strcmp to determine
whether the name of the returned position matches, in which case the
file exists, but is merely unmerged, or if the file actually doesn't
exist in the index.

If the repository is empty, or if the file would lexicographically be
sorted as the last file in the repository, -cache_name_pos - 1 is
outside of the length of the active_cache array, causing git blame to
segfault.  Guard against that, and die() normally to restore the old
behaviour.

Reported-by: Simon Ruderich <simon@ruderich.org>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agol10n: ca.po: update translation
Alex Henrie [Sun, 28 Aug 2016 16:32:56 +0000 (10:32 -0600)] 
l10n: ca.po: update translation

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
7 years agol10n: fr.po v2.10.0-rc2
Jean-Noel Avila [Sat, 20 Aug 2016 14:20:17 +0000 (16:20 +0200)] 
l10n: fr.po v2.10.0-rc2

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
7 years agol10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)
Tran Ngoc Quan [Sun, 28 Aug 2016 00:23:30 +0000 (07:23 +0700)] 
l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
7 years agol10n: sv.po: Update Swedish translation (2757t0f0u)
Peter Krefting [Fri, 26 Aug 2016 13:27:24 +0000 (14:27 +0100)] 
l10n: sv.po: Update Swedish translation (2757t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
7 years agoMerge branch 'master' of https://github.com/vnwildman/git
Jiang Xin [Sat, 27 Aug 2016 15:36:16 +0000 (23:36 +0800)] 
Merge branch 'master' of https://github.com/vnwildman/git

* 'master' of https://github.com/vnwildman/git:
  l10n: Updated Vietnamese translation for v2.10.0 (2789t)

7 years agol10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)
Jiang Xin [Sat, 27 Aug 2016 15:23:26 +0000 (23:23 +0800)] 
l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)

Generate po/git.pot from v2.10.0-rc2 for git v2.10.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
7 years agoMerge branch 'master' of git://github.com/git-l10n/git-po
Jiang Xin [Sat, 27 Aug 2016 15:14:27 +0000 (23:14 +0800)] 
Merge branch 'master' of git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
  l10n: pt_PT: update Portuguese translation
  l10n: pt_PT: merge git.pot
  l10n: ko.po: Update Korean translation
  l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)

7 years agol10n: Updated Vietnamese translation for v2.10.0 (2789t)
Tran Ngoc Quan [Sat, 27 Aug 2016 02:15:28 +0000 (09:15 +0700)] 
l10n: Updated Vietnamese translation for v2.10.0 (2789t)

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
7 years agoSubmittingPatches: use gitk's "Copy commit summary" format
Beat Bolli [Fri, 26 Aug 2016 16:59:01 +0000 (18:59 +0200)] 
SubmittingPatches: use gitk's "Copy commit summary" format

Update the suggestion in 175d38ca ("SubmittingPatches: document how
to reference previous commits", 2016-07-28) on the format to refer
to a commit to match what gitk has been giving since last year with
its "Copy commit summary" command; also mention this as one of the
ways to obtain a commit reference in this format.

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoGit 2.10-rc2 v2.10.0-rc2
Junio C Hamano [Fri, 26 Aug 2016 20:59:20 +0000 (13:59 -0700)] 
Git 2.10-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogitattributes: Document the unified "auto" handling
Torsten Bögershausen [Fri, 26 Aug 2016 20:18:48 +0000 (22:18 +0200)] 
gitattributes: Document the unified "auto" handling

Update the documentation about text=auto:
text=auto now follows the core.autocrlf handling when files are not
normalized in the repository.

For a cross platform project recommend the usage of attributes for
line-ending conversions.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoPrepare for 2.10.0-rc2
Junio C Hamano [Thu, 25 Aug 2016 20:56:51 +0000 (13:56 -0700)] 
Prepare for 2.10.0-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'ja/i18n'
Junio C Hamano [Thu, 25 Aug 2016 20:55:07 +0000 (13:55 -0700)] 
Merge branch 'ja/i18n'

The recent i18n patch we added during this cycle did a bit too much
refactoring of the messages to avoid word-legos; the repetition has
been reduced to help translators.

* ja/i18n:
  i18n: simplify numeric error reporting
  i18n: fix git rebase interactive commit messages
  i18n: fix typos for translation

7 years agoMerge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'
Junio C Hamano [Thu, 25 Aug 2016 20:55:07 +0000 (13:55 -0700)] 
Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'

The tempfile (hence its user lockfile) API lets the caller to open
a file descriptor to a temporary file, write into it and then
finalize it by first closing the filehandle and then either
removing or renaming the temporary file.  When the process spawns a
subprocess after obtaining the file descriptor, and if the
subprocess has not exited when the attempt to remove or rename is
made, the last step fails on Windows, because the subprocess has
the file descriptor still open.  Open tempfile with O_CLOEXEC flag
to avoid this (on Windows, this is mapped to O_NOINHERIT).

* bw/mingw-avoid-inheriting-fd-to-lockfile:
  mingw: ensure temporary file handles are not inherited by child processes
  t6026-merge-attr: child processes must not inherit index.lock handles

7 years agoMerge branch 'dg/document-git-c-in-git-config-doc'
Junio C Hamano [Thu, 25 Aug 2016 20:55:07 +0000 (13:55 -0700)] 
Merge branch 'dg/document-git-c-in-git-config-doc'

The "git -c var[=val] cmd" facility to append a configuration
variable definition at the end of the search order was described in
git(1) manual page, but not in git-config(1), which was more likely
place for people to look for when they ask "can I make a one-shot
override, and if so how?"

* dg/document-git-c-in-git-config-doc:
  doc: mention `git -c` in git-config(1)

7 years agoMerge branch 'js/no-html-bypass-on-windows'
Junio C Hamano [Thu, 25 Aug 2016 20:55:06 +0000 (13:55 -0700)] 
Merge branch 'js/no-html-bypass-on-windows'

On Windows, help.browser configuration variable used to be ignored,
which has been corrected.

* js/no-html-bypass-on-windows:
  Revert "display HTML in default browser using Windows' shell API"

7 years agoMerge branch 'hv/doc-commit-reference-style'
Junio C Hamano [Thu, 25 Aug 2016 20:55:05 +0000 (13:55 -0700)] 
Merge branch 'hv/doc-commit-reference-style'

A small doc update.

* hv/doc-commit-reference-style:
  SubmittingPatches: document how to reference previous commits

7 years agogit ls-files: text=auto eol=lf is supported in Git 2.10
Torsten Bögershausen [Thu, 25 Aug 2016 15:52:57 +0000 (17:52 +0200)] 
git ls-files: text=auto eol=lf is supported in Git 2.10

The man page for `git ls-files --eol` mentions the combination
of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not
supported yet, but may be in the future.

Now they are supported.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agol10n: pt_PT: update Portuguese translation
Vasco Almeida [Mon, 22 Aug 2016 16:29:35 +0000 (16:29 +0000)] 
l10n: pt_PT: update Portuguese translation

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
7 years agol10n: pt_PT: merge git.pot
Vasco Almeida [Tue, 16 Aug 2016 12:06:44 +0000 (12:06 +0000)] 
l10n: pt_PT: merge git.pot

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
7 years agoi18n: simplify numeric error reporting
Jean-Noel Avila [Sun, 21 Aug 2016 14:50:39 +0000 (16:50 +0200)] 
i18n: simplify numeric error reporting

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoi18n: fix git rebase interactive commit messages
Jean-Noel Avila [Sun, 21 Aug 2016 14:50:38 +0000 (16:50 +0200)] 
i18n: fix git rebase interactive commit messages

For proper i18n, the logic cannot embed english specific processing.

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoi18n: fix typos for translation
Jean-Noel Avila [Sun, 21 Aug 2016 14:50:37 +0000 (16:50 +0200)] 
i18n: fix typos for translation

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodoc: mention `git -c` in git-config(1)
David Glasser [Tue, 23 Aug 2016 17:33:21 +0000 (10:33 -0700)] 
doc: mention `git -c` in git-config(1)

Signed-off-by: David Glasser <glasser@davidglasser.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agomingw: ensure temporary file handles are not inherited by child processes
Ben Wijen [Mon, 22 Aug 2016 12:47:55 +0000 (14:47 +0200)] 
mingw: ensure temporary file handles are not inherited by child processes

When the index is locked and child processes inherit the handle to
said lock and the parent process wants to remove the lock before the
child process exits, on Windows there is a problem: it won't work
because files cannot be deleted if a process holds a handle on them.
The symptom:

    Rename from 'xxx/.git/index.lock' to 'xxx/.git/index' failed.
    Should I try again? (y/n)

Spawning child processes with bInheritHandles==FALSE would not work
because no file handles would be inherited, not even the hStdXxx
handles in STARTUPINFO (stdin/stdout/stderr).

Opening every file with O_NOINHERIT does not work, either, as e.g.
git-upload-pack expects inherited file handles.

This leaves us with the only way out: creating temp files with the
O_NOINHERIT flag. This flag is Windows-specific, however. For our
purposes, it is equivalent to O_CLOEXEC (which does not exist on
Windows), so let's just open temporary files with the O_CLOEXEC flag and
map that flag to O_NOINHERIT on Windows.

As Eric Wong pointed out, we need to be careful to handle the case where
the Linux headers used to compile Git support O_CLOEXEC but the Linux
kernel used to run Git does not: it returns an EINVAL.

This fixes the test that we just introduced to demonstrate the problem.

Signed-off-by: Ben Wijen <ben@wijen.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agol10n: ko.po: Update Korean translation
Changwoo Ryu [Sun, 21 Aug 2016 13:44:00 +0000 (22:44 +0900)] 
l10n: ko.po: Update Korean translation

Signed-off-by: Changwoo Ryu <cwryu@debian.org>
7 years agoGit 2.10-rc1 v2.10.0-rc1
Junio C Hamano [Fri, 19 Aug 2016 22:39:33 +0000 (15:39 -0700)] 
Git 2.10-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'lt/gpg-show-long-key-in-signature-verification'
Junio C Hamano [Fri, 19 Aug 2016 22:34:16 +0000 (15:34 -0700)] 
Merge branch 'lt/gpg-show-long-key-in-signature-verification'

"git log --show-signature" and other commands that display the
verification status of PGP signature now shows the longer key-id,
as 32-bit key-id is so last century.

* lt/gpg-show-long-key-in-signature-verification:
  gpg-interface: prefer "long" key format output when verifying pgp signatures

7 years agoMerge branch 'ab/hooks'
Junio C Hamano [Fri, 19 Aug 2016 22:34:16 +0000 (15:34 -0700)] 
Merge branch 'ab/hooks'

"git rev-parse --git-path hooks/<hook>" learned to take
core.hooksPath configuration variable (introduced during 2.9 cycle)
into account.

* ab/hooks:
  rev-parse: respect core.hooksPath in --git-path

7 years agoMerge branch 'jk/difftool-command-not-found'
Junio C Hamano [Fri, 19 Aug 2016 22:34:15 +0000 (15:34 -0700)] 
Merge branch 'jk/difftool-command-not-found'

"git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal.  "git difftool" has been
taught to notice these exit status codes.

* jk/difftool-command-not-found:
  difftool: always honor fatal error exit codes

7 years agoMerge branch 'sb/checkout-explit-detach-no-advice'
Junio C Hamano [Fri, 19 Aug 2016 22:34:15 +0000 (15:34 -0700)] 
Merge branch 'sb/checkout-explit-detach-no-advice'

"git checkout --detach <branch>" used to give the same advice
message as that is issued when "git checkout <tag>" (or anything
that is not a branch name) is given, but asking with "--detach" is
an explicit enough sign that the user knows what is going on.  The
advice message has been squelched in this case.

* sb/checkout-explit-detach-no-advice:
  checkout: do not mention detach advice for explicit --detach option

7 years agoMerge branch 'tb/t0027-raciness-fix'
Junio C Hamano [Fri, 19 Aug 2016 22:34:14 +0000 (15:34 -0700)] 
Merge branch 'tb/t0027-raciness-fix'

The t0027 test for CRLF conversion was timing dependent and flaky.

* tb/t0027-raciness-fix:
  convert: Correct NNO tests and missing `LF will be replaced by CRLF`

7 years agoMerge branch 'rs/pull-signed-tag'
Junio C Hamano [Fri, 19 Aug 2016 22:34:13 +0000 (15:34 -0700)] 
Merge branch 'rs/pull-signed-tag'

When "git merge-recursive" works on history with many criss-cross
merges in "verbose" mode, the names the command assigns to the
virtual merge bases could have overwritten each other by unintended
reuse of the same piece of memory.

* rs/pull-signed-tag:
  commit: use FLEX_ARRAY in struct merge_remote_desc
  merge-recursive: fix verbose output for multiple base trees
  commit: factor out set_merge_remote_desc()
  commit: use xstrdup() in get_merge_parent()

7 years agoRevert "display HTML in default browser using Windows' shell API"
Johannes Schindelin [Fri, 19 Aug 2016 08:39:38 +0000 (10:39 +0200)] 
Revert "display HTML in default browser using Windows' shell API"

Since 4804aab (help (Windows): Display HTML in default browser using
Windows' shell API, 2008-07-13), Git for Windows used to call
`ShellExecute()` to launch the default Windows handler for `.html`
files.

The idea was to avoid going through a shell script, for performance
reasons.

However, this change ignores the `help.browser` config setting. Together
with browsing help not being a performance-critical operation, let's
just revert that patch.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agot6026-merge-attr: child processes must not inherit index.lock handles
Ben Wijen [Thu, 18 Aug 2016 14:51:12 +0000 (16:51 +0200)] 
t6026-merge-attr: child processes must not inherit index.lock handles

On Windows, a file cannot be removed unless all file handles to it have
been released. Hence it is particularly important to close handles when
spawning children (which would probably not even know that they hold on
to those handles).

The example chosen for this test is a custom merge driver that indeed
has no idea that it blocks the deletion of index.lock. The full use case
is a daemon that lives on after the merge, with subsequent invocations
handing off to the daemon, thereby avoiding hefty start-up costs. We
simulate this behavior by simply sleeping one second.

Note that the test only fails on Windows, due to the file locking issue.
Since we have no way to say "expect failure with MINGW, success
otherwise", we simply skip this test on Windows for now.

Signed-off-by: Ben Wijen <ben@wijen.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoRelNotes: final batch of topics before -rc1
Junio C Hamano [Wed, 17 Aug 2016 21:09:17 +0000 (14:09 -0700)] 
RelNotes: final batch of topics before -rc1

7 years agoMerge branch 'js/test-lint-pathname'
Junio C Hamano [Wed, 17 Aug 2016 21:07:48 +0000 (14:07 -0700)] 
Merge branch 'js/test-lint-pathname'

The "t/" hierarchy is prone to get an unusual pathname; "make test"
has been taught to make sure they do not contain paths that cannot
be checked out on Windows (and the mechanism can be reusable to
catch pathnames that are not portable to other platforms as need
arises).

* js/test-lint-pathname:
  t/Makefile: ensure that paths are valid on platforms we care

7 years agoMerge branch 'sg/reflog-past-root'
Junio C Hamano [Wed, 17 Aug 2016 21:07:48 +0000 (14:07 -0700)] 
Merge branch 'sg/reflog-past-root'

A small test clean-up for a topic introduced in v2.9.1 and later.

* sg/reflog-past-root:
  t1410: remove superfluous 'git reflog' from the 'walk past root' test

7 years agoMerge branch 'rs/mailinfo-lib'
Junio C Hamano [Wed, 17 Aug 2016 21:07:47 +0000 (14:07 -0700)] 
Merge branch 'rs/mailinfo-lib'

Small code clean-up.

* rs/mailinfo-lib:
  mailinfo: recycle strbuf in check_header()

7 years agoMerge branch 'jk/tighten-alloc'
Junio C Hamano [Wed, 17 Aug 2016 21:07:46 +0000 (14:07 -0700)] 
Merge branch 'jk/tighten-alloc'

Small code and comment clean-up.

* jk/tighten-alloc:
  receive-pack: use FLEX_ALLOC_MEM in queue_command()
  correct FLEXPTR_* example in comment

7 years agoMerge branch 'va/i18n'
Junio C Hamano [Wed, 17 Aug 2016 21:07:45 +0000 (14:07 -0700)] 
Merge branch 'va/i18n'

A handful of tests that were broken under gettext-poison build have
been fixed.

* va/i18n:
  t7411: become resilient to GETTEXT_POISON
  t5520: become resilient to GETTEXT_POISON
  t3404: become resilient to GETTEXT_POISON

7 years agogit-multimail: update to release 1.4.0
Matthieu Moy [Wed, 17 Aug 2016 06:41:16 +0000 (08:41 +0200)] 
git-multimail: update to release 1.4.0

Changes are described in CHANGES.

Contributions-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Contributions-by: Irfan Adilovic <irfanadilovic@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agorelnotes: redo the description of text=auto fix
Junio C Hamano [Wed, 17 Aug 2016 17:18:59 +0000 (10:18 -0700)] 
relnotes: redo the description of text=auto fix

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoSubmittingPatches: document how to reference previous commits
Heiko Voigt [Thu, 28 Jul 2016 12:55:14 +0000 (14:55 +0200)] 
SubmittingPatches: document how to reference previous commits

To reference previous commits people used to put just the
abbreviated SHA-1 into commit messages.  This is what has evolved as
a more stable format for referencing commits.  So lets document it
for everyone to look-up when needed.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/gpg-show...
Junio C Hamano [Tue, 16 Aug 2016 22:04:13 +0000 (15:04 -0700)] 
Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/gpg-show-long-key-in-signature-verification

Linus's original was rebased to apply to the maintenance track just
in case binary distributors that are stuck in the past want to take
it to their older codebase.  Let's merge it up to more modern
codebase that has Peff's gpg-interface clean-up topic that appeared
after Git 2.9 was tagged.

* lt/gpg-show-long-key-in-signature-verification-maint:
  gpg-interface: prefer "long" key format output when verifying pgp signatures

7 years agogpg-interface: prefer "long" key format output when verifying pgp signatures
Linus Torvalds [Tue, 16 Aug 2016 20:10:24 +0000 (13:10 -0700)] 
gpg-interface: prefer "long" key format output when verifying pgp signatures

Yes, gpg2 already uses the long format by default, but most
distributions seem to still have "gpg" be the older 1.x version due to
compatibility reasons.  And older versions of gpg only show the 32-bit
short ID, which is quite insecure.

This doesn't actually matter for the _verification_ itself: if the
verification passes, the pgp signature is good.  But if you don't
actually have the key yet, and want to fetch it, or you want to check
exactly which key was used for verification and want to check it, we
should specify the key with more precision.

In fact, we should preferentially specify the whole key fingerprint, but
gpg doesn't actually support that.  Which is really quite sad.

Showing the "long" format improves things to at least show 64 bits of
the fingerprint.  That's a lot better, even if it's not perfect.

This change the log format for "git log --show-signature" from

    commit 2376d31787760af598db23bb3982a57419854e5c
    merged tag 'v2.9.3'
    gpg: Signature made Fri 12 Aug 2016 09:17:59 AM PDT using RSA key ID 96AFE6CB
    gpg: Good signature from "Junio C Hamano <gitster@pobox.com>"
    gpg:                 aka "Junio C Hamano <jch@google.com>"
    gpg:                 aka "Junio C Hamano <junio@pobox.com>"
    Merge: 2807cd7b25af e0c1ceafc5be
    Author: Junio C Hamano <gitster@pobox.com>
    Date:   Fri Aug 12 10:02:18 2016 -0700

to

    commit 2376d31787760af598db23bb3982a57419854e5c
    merged tag 'v2.9.3'
    gpg: Signature made Fri 12 Aug 2016 09:17:59 AM PDT
    gpg:                using RSA key B0B5E88696AFE6CB
    gpg: Good signature from "Junio C Hamano <gitster@pobox.com>"
    gpg:                 aka "Junio C Hamano <jch@google.com>"
    gpg:                 aka "Junio C Hamano <junio@pobox.com>"
    Merge: 2807cd7b25af e0c1ceafc5be
    Author: Junio C Hamano <gitster@pobox.com>
    Date:   Fri Aug 12 10:02:18 2016 -0700

(note the longer key ID, but also the reflowing of the text) and also
changes the format in the merge messages when merging a signed
tag.

If you already use gpg2 (either because it's installed by default, or
because you have set your gpg_program configuration to point to gpg2),
that already used the long format, you'll also see a change: it will now
have the same formatting as gpg 1.x, and the verification string looks
something like

    gpg: Signature made Sun 24 Jul 2016 12:24:02 PM PDT
    gpg:                using RSA key 79BE3E4300411886
    gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>" [ultimate]

where it used to be on one line:

    gpg: Signature made Sun 24 Jul 2016 12:24:02 PM PDT using RSA key ID 79BE3E4300411886
    gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>" [ultimate]

so there is certainly a chance this could break some automated scripting.
But the 32-bit key ID's really are broken. Also note that because of the
differences between gpg-1.x and gpg-2.x, hopefully any scripted key ID
parsing code (if such code exists) is already flexible enough to not care.

This was triggered by the fact that the "evil32" project keys ended up
leaking to the public key servers, so now there are 32-bit aliases for
just about every open source developer that you can easily get by
mistake if you use the 32-bit short ID format.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agorev-parse: respect core.hooksPath in --git-path
Johannes Schindelin [Tue, 16 Aug 2016 13:14:27 +0000 (15:14 +0200)] 
rev-parse: respect core.hooksPath in --git-path

The idea of the --git-path option is not only to avoid having to
prefix paths with the output of --git-dir all the time, but also to
respect overrides for specific common paths inside the .git directory
(e.g. `git rev-parse --git-path objects` will report the value of the
environment variable GIT_OBJECT_DIRECTORY, if set).

When introducing the core.hooksPath setting, we forgot to adjust
git_path() accordingly. This patch fixes that.

While at it, revert the special-casing of core.hooksPath in
run-command.c, as it is now no longer needed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agot/Makefile: ensure that paths are valid on platforms we care
Johannes Schindelin [Tue, 16 Aug 2016 15:13:25 +0000 (17:13 +0200)] 
t/Makefile: ensure that paths are valid on platforms we care

Some pathnames that are okay on ext4 and on HFS+ cannot be checked
out on Windows. Tests that want to see operations on such paths on
filesystems that support them must do so behind appropriate test
prerequisites, and must not include them in the source tree (instead
they should create them when they run). Otherwise, the source tree
cannot even be checked out.

Make sure that double-quotes, asterisk, colon, greater/less-than,
question-mark, backslash, tab, vertical-bar, as well as any non-ASCII
characters never appear in the pathnames with a new test-lint-* target
as part of a `make test`. To that end, we call `git ls-files` (ensuring
that the paths are quoted properly), relying on the fact that paths
containing non-ASCII characters are quoted within double-quotes.

In case that the source code does not actually live in a Git
repository (e.g. when extracted from a .zip file), or that the `git`
executable cannot be executed, we simply ignore the error for now; In
that case, our trusty Continuous Integration will be the last line of
defense and catch any problematic file name.

Noticed when a topic wanted to add a pathname with '>' in it.  A
check like this will prevent a similar problems from happening in the
future.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodifftool: always honor fatal error exit codes
John Keeping [Mon, 15 Aug 2016 21:54:39 +0000 (22:54 +0100)] 
difftool: always honor fatal error exit codes

At the moment difftool's "trust exit code" logic always suppresses the
exit status of the diff utility we invoke.  This is useful because we
don't want to exit just because diff returned "1" because the files
differ, but it's confusing if the shell returns an error because the
selected diff utility is not found.

POSIX specifies 127 as the exit status for "command not found", 126 for
"command found but is not executable" and values greater than 128 if the
command terminated because it received a signal [1] and at least bash
and dash follow this specification, while diff utilities generally use
"1" for the exit status we want to ignore.

Handle any value of 126 or greater as a special value indicating that
some form of fatal error occurred.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_02

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agocheckout: do not mention detach advice for explicit --detach option
Stefan Beller [Mon, 15 Aug 2016 18:40:21 +0000 (11:40 -0700)] 
checkout: do not mention detach advice for explicit --detach option

When a user asked for a detached HEAD specifically with `--detach`,
we do not need to give advice on what a detached HEAD state entails as
we can assume they know what they're getting into as they asked for it.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoRelnotes: decribe the updates to the "text=auto" attribute
Junio C Hamano [Mon, 15 Aug 2016 17:20:38 +0000 (10:20 -0700)] 
Relnotes: decribe the updates to the "text=auto" attribute

Helped-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>