gitweb.git
Merge branch 'fk/doc-format-patch-vn'Junio C Hamano Wed, 24 Jun 2015 19:21:56 +0000 (12:21 -0700)

Merge branch 'fk/doc-format-patch-vn'

Docfix.

* fk/doc-format-patch-vn:
doc: format-patch: fix typo

Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano Wed, 24 Jun 2015 19:21:55 +0000 (12:21 -0700)

Merge branch 'sg/commit-cleanup-scissors'

"git commit --cleanup=scissors" was not careful enough to protect
against getting fooled by a line that looked like scissors.

* sg/commit-cleanup-scissors:
commit: cope with scissors lines in commit message

Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano Wed, 24 Jun 2015 19:21:54 +0000 (12:21 -0700)

Merge branch 'jk/index-pack-reduce-recheck'

Disable "have we lost a race with competing repack?" check while
receiving a huge object transfer that runs index-pack.

* jk/index-pack-reduce-recheck:
index-pack: avoid excessive re-reading of pack directory

Merge branch 'af/tcsh-completion-noclobber'Junio C Hamano Wed, 24 Jun 2015 19:21:53 +0000 (12:21 -0700)

Merge branch 'af/tcsh-completion-noclobber'

The tcsh completion writes a bash scriptlet but that would have
failed for users with noclobber set.

* af/tcsh-completion-noclobber:
git-completion.tcsh: fix redirect with noclobber

Merge branch 'mh/reporting-broken-refs-from-for-each... Junio C Hamano Wed, 24 Jun 2015 19:21:51 +0000 (12:21 -0700)

Merge branch 'mh/reporting-broken-refs-from-for-each-ref'

"git for-each-ref" reported "missing object" for 0{40} when it
encounters a broken ref. The lack of object whose name is 0{40} is
not the problem; the ref being broken is.

* mh/reporting-broken-refs-from-for-each-ref:
read_loose_refs(): treat NULL_SHA1 loose references as broken
read_loose_refs(): simplify function logic
for-each-ref: report broken references correctly
t6301: new tests of for-each-ref error handling

Merge branch 'sg/completion-commit-cleanup'Junio C Hamano Wed, 24 Jun 2015 19:21:51 +0000 (12:21 -0700)

Merge branch 'sg/completion-commit-cleanup'

* sg/completion-commit-cleanup:
completion: teach 'scissors' mode to 'git commit --cleanup='

Merge branch 'pt/am-abort-fix'Junio C Hamano Wed, 24 Jun 2015 19:21:49 +0000 (12:21 -0700)

Merge branch 'pt/am-abort-fix'

Various fixes around "git am" that applies a patch to a history
that is not there yet.

* pt/am-abort-fix:
am --abort: keep unrelated commits on unborn branch
am --abort: support aborting to unborn branch
am --abort: revert changes introduced by failed 3way merge
am --skip: support skipping while on unborn branch
am -3: support 3way merge on unborn branch
am --skip: revert changes introduced by failed 3way merge

Merge branch 'nd/untracked-cache'Junio C Hamano Wed, 24 Jun 2015 19:21:49 +0000 (12:21 -0700)

Merge branch 'nd/untracked-cache'

Hotfix for the 'untracked-cache' topic that is already in 'master'.

* nd/untracked-cache:
read-cache: fix untracked cache invalidation when split-index is used

Merge branch 'mh/fsck-reflog-entries'Junio C Hamano Wed, 24 Jun 2015 19:21:48 +0000 (12:21 -0700)

Merge branch 'mh/fsck-reflog-entries'

"git fsck" used to ignore missing or invalid objects recorded in reflog.

* mh/fsck-reflog-entries:
fsck: report errors if reflog entries point at invalid objects
fsck_handle_reflog_sha1(): new function

Merge branch 'js/sleep-without-select'Junio C Hamano Wed, 24 Jun 2015 19:21:47 +0000 (12:21 -0700)

Merge branch 'js/sleep-without-select'

Portability fix.

* js/sleep-without-select:
lockfile: wait using sleep_millisec() instead of select()
lockfile: convert retry timeout computations to millisecond
help.c: wrap wait-only poll() invocation in sleep_millisec()
lockfile: replace random() by rand()

Merge branch 'es/utf8-stupid-compiler-workaround'Junio C Hamano Wed, 24 Jun 2015 19:21:46 +0000 (12:21 -0700)

Merge branch 'es/utf8-stupid-compiler-workaround'

A compilation workaround.

* es/utf8-stupid-compiler-workaround:
utf8: NO_ICONV: silence uninitialized variable warning

Merge branch 'rl/am-3way-config'Junio C Hamano Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)

Merge branch 'rl/am-3way-config'

"git am" learned am.threeWay configuration variable.

* rl/am-3way-config:
git-am: add am.threeWay config variable
t4150-am: refactor am -3 tests
git-am.sh: fix initialization of the threeway variable

Merge branch 'jc/ll-merge-expose-path'Junio C Hamano Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)

Merge branch 'jc/ll-merge-expose-path'

Traditionally, external low-level 3-way merge drivers are expected
to produce their results based solely on the contents of the three
variants given in temporary files named by %O, %A and %B on their
command line. Additionally allow them to look at the final path
(given by %P).

* jc/ll-merge-expose-path:
ll-merge: pass the original path to external drivers

Merge branch 'es/osx-header-pollutes-mask-macro'Junio C Hamano Wed, 24 Jun 2015 19:21:44 +0000 (12:21 -0700)

Merge branch 'es/osx-header-pollutes-mask-macro'

* es/osx-header-pollutes-mask-macro:
ewah: use less generic macro name
ewah/bitmap: silence warning about MASK macro redefinition

Merge branch 'es/configure-getdelim'Junio C Hamano Wed, 24 Jun 2015 19:21:43 +0000 (12:21 -0700)

Merge branch 'es/configure-getdelim'

Auto-detect availability of getdelim() that helps optimized version
of strbuf_getwholeline().

* es/configure-getdelim:
configure: add getdelim() check
config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases

Merge branch 'pt/pull-optparse'Junio C Hamano Wed, 24 Jun 2015 19:21:42 +0000 (12:21 -0700)

Merge branch 'pt/pull-optparse'

"git pull" has become more aware of the options meant for
underlying "git fetch" and then learned to use parse-options
parser.

* pt/pull-optparse:
pull: use git-rev-parse --parseopt for option parsing
pull: handle git-fetch's options as well

Merge branch 'qn/blame-show-email'Junio C Hamano Wed, 24 Jun 2015 19:21:41 +0000 (12:21 -0700)

Merge branch 'qn/blame-show-email'

"git blame" learned blame.showEmail configuration variable.

* qn/blame-show-email:
blame: add blame.showEmail configuration

Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano Wed, 24 Jun 2015 19:21:40 +0000 (12:21 -0700)

Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'

"git format-patch --ignore-if-upstream A..B" did not like to be fed
tags as boundary commits.

* jc/do-not-feed-tags-to-clear-commit-marks:
format-patch: do not feed tags to clear_commit_marks()

Merge branch 'es/send-email-sendmail-alias'Junio C Hamano Wed, 24 Jun 2015 19:21:39 +0000 (12:21 -0700)

Merge branch 'es/send-email-sendmail-alias'

"git send-email" learned to handle more forms of sendmail style
aliases file.

* es/send-email-sendmail-alias:
send-email: further warn about unsupported sendmail aliases features
t9001: add sendmail aliases line continuation tests
t9001: refactor sendmail aliases test infrastructure
send-email: implement sendmail aliases line continuation support
send-email: simplify sendmail aliases comment and blank line recognizer
send-email: refactor sendmail aliases parser
send-email: fix style: cuddle 'elsif' and 'else' with closing brace
send-email: drop noise comments which merely repeat what code says
send-email: visually distinguish sendmail aliases parser warnings
send-email: further document missing sendmail aliases functionality

Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano Wed, 24 Jun 2015 19:21:39 +0000 (12:21 -0700)

Merge branch 'jc/apply-reject-noop-hunk'

"git apply" cannot diagnose a patch corruption when the breakage is
to mark the length of the hunk shorter than it really is on the
hunk header line "@@ -l,k +m,n @@"; one special case it could is
when the hunk becomes no-op (e.g. k == n == 2 for two-line context
patch output), and it learned how to do so.

* jc/apply-reject-noop-hunk:
apply: reject a hunk that does not do anything

git-multimail: update to release 1.1.0Matthieu Moy Thu, 18 Jun 2015 08:46:04 +0000 (10:46 +0200)

git-multimail: update to release 1.1.0

The changes are described in CHANGES.

Contributions-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Contributions-by: Richard Hansen <rhansen@rhansen.org>
Contributions-by: Michael Haggerty <mhagger@alum.mit.edu>
Contributions-by: Elijah Newren <newren@gmail.com>
Contributions-by: Luke Mewburn <luke@mewburn.net>
Contributions-by: Dave Boutcher <daveboutcher@gmail.com>
Contributions-by: Azat Khuzhin <a3at.mail@gmail.com>
Contributions-by: Sebastian Schuberth <sschuberth@gmail.com>
Contributions-by: Mikko Johannes Koivunalho <mikko.koivunalho@iki.fi>
Contributions-by: Elijah Newren <newren@palantir.com>
Contributions-by: Benoît Ryder <benoit@ryder.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eighth batch for 2.5Junio C Hamano Tue, 16 Jun 2015 21:39:31 +0000 (14:39 -0700)

Eighth batch for 2.5

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

Sync with 2.4.4Junio C Hamano Tue, 16 Jun 2015 21:39:01 +0000 (14:39 -0700)

Sync with 2.4.4

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

Git 2.4.4 v2.4.4Junio C Hamano Tue, 16 Jun 2015 21:38:01 +0000 (14:38 -0700)

Git 2.4.4

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

Merge branch 'jk/clone-dissociate' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:52 +0000 (14:33 -0700)

Merge branch 'jk/clone-dissociate' into maint

Code clean-up.

* jk/clone-dissociate:
clone: reorder --dissociate and --reference options
clone: use OPT_STRING_LIST for --reference

Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:52 +0000 (14:33 -0700)

Merge branch 'sb/submodule-doc-intro' into maint

* sb/submodule-doc-intro:
submodule doc: reorder introductory paragraphs

Merge branch 'sb/glossary-submodule' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:51 +0000 (14:33 -0700)

Merge branch 'sb/glossary-submodule' into maint

* sb/glossary-submodule:
glossary: add "remote", "submodule", "superproject"

Merge branch 'ah/usage-strings' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:50 +0000 (14:33 -0700)

Merge branch 'ah/usage-strings' into maint

A few usage string updates.

* ah/usage-strings:
blame, log: format usage strings similarly to those in documentation

Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:49 +0000 (14:33 -0700)

Merge branch 'mc/commit-doc-grammofix' into maint

Doc grammar fix.

* mc/commit-doc-grammofix:
Documentation/git-commit: grammofix

Merge branch 'rs/janitorial' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:47 +0000 (14:33 -0700)

Merge branch 'rs/janitorial' into maint

Code clean-up.

* rs/janitorial:
dir: remove unused variable sb
clean: remove unused variable buf
use file_exists() to check if a file exists in the worktree

Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:47 +0000 (14:33 -0700)

Merge branch 'sb/test-bitmap-free-at-end' into maint

An earlier leakfix to bitmap testing code was incomplete.

* sb/test-bitmap-free-at-end:
test_bitmap_walk: free bitmap with bitmap_free

Merge branch 'dt/clean-pathspec-filter-then-lstat'... Junio C Hamano Tue, 16 Jun 2015 21:33:46 +0000 (14:33 -0700)

Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint

"git clean pathspec..." tried to lstat(2) and complain even for
paths outside the given pathspec.

* dt/clean-pathspec-filter-then-lstat:
clean: only lstat files in pathspec

Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:45 +0000 (14:33 -0700)

Merge branch 'jk/http-backend-deadlock' into maint

Communication between the HTTP server and http_backend process can
lead to a dead-lock when relaying a large ref negotiation request.
Diagnose the situation better, and mitigate it by reading such a
request first into core (to a reasonable limit).

* jk/http-backend-deadlock:
http-backend: spool ref negotiation requests to buffer
t5551: factor out tag creation
http-backend: fix die recursion with custom handler

Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:44 +0000 (14:33 -0700)

Merge branch 'jh/filter-empty-contents' into maint

The clean/smudge interface did not work well when filtering an
empty contents (failed and then passed the empty input through).
It can be argued that a filter that produces anything but empty for
an empty input is nonsense, but if the user wants to do strange
things, then why not?

* jh/filter-empty-contents:
sha1_file: pass empty buffer to index empty file

Merge branch 'jk/stash-options' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:43 +0000 (14:33 -0700)

Merge branch 'jk/stash-options' into maint

Make "git stash something --help" error out, so that users can
safely say "git stash drop --help".

* jk/stash-options:
stash: recognize "--help" for subcommands
stash: complain about unknown flags

Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano Tue, 16 Jun 2015 21:33:42 +0000 (14:33 -0700)

Merge branch 'mm/log-format-raw-doc' into maint

Clarify that "log --raw" and "log --format=raw" are unrelated
concepts.

* mm/log-format-raw-doc:
Documentation/log: clarify sha1 non-abbreviation in log --raw
Documentation/log: clarify what --raw means

Merge branch 'ep/do-not-feed-a-pointer-to-array-size... Junio C Hamano Tue, 16 Jun 2015 21:33:41 +0000 (14:33 -0700)

Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maint

Catch a programmer mistake to feed a pointer not an array to
ARRAY_SIZE() macro, by using a couple of GCC extensions.

* ep/do-not-feed-a-pointer-to-array-size:
git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array

Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano Tue, 16 Jun 2015 21:27:08 +0000 (14:27 -0700)

Merge branch 'nd/slim-index-pack-memory-usage'

An earlier optimization broke index-pack for a large object
transfer; this fixes it before the breakage hits any released
version.

* nd/slim-index-pack-memory-usage:
index-pack: fix truncation of off_t in comparison

Merge branch 'sb/pack-protocol-mention-smart-http'Junio C Hamano Tue, 16 Jun 2015 21:27:07 +0000 (14:27 -0700)

Merge branch 'sb/pack-protocol-mention-smart-http'

Doc updates.

* sb/pack-protocol-mention-smart-http:
Documentation/technical/pack-protocol: mention http as possible protocol

Merge branch 'jk/make-fix-dependencies'Junio C Hamano Tue, 16 Jun 2015 21:27:06 +0000 (14:27 -0700)

Merge branch 'jk/make-fix-dependencies'

Build clean-up.

* jk/make-fix-dependencies:
Makefile: silence perl/PM.stamp recipe
Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS
Makefile: drop dependency between git-instaweb and gitweb

Merge branch 'jk/die-on-bogus-worktree-late'Junio C Hamano Tue, 16 Jun 2015 21:27:06 +0000 (14:27 -0700)

Merge branch 'jk/die-on-bogus-worktree-late'

The setup code used to die when core.bare and core.worktree are set
inconsistently, even for commands that do not need working tree.

* jk/die-on-bogus-worktree-late:
setup_git_directory: delay core.bare/core.worktree errors

Merge branch 'sg/merge-summary-config'Junio C Hamano Tue, 16 Jun 2015 21:27:05 +0000 (14:27 -0700)

Merge branch 'sg/merge-summary-config'

Doc updates.

* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well

Merge branch 'ah/send-email-sendmail-alias'Junio C Hamano Tue, 16 Jun 2015 21:27:04 +0000 (14:27 -0700)

Merge branch 'ah/send-email-sendmail-alias'

"git send-email" learned the alias file format used by the sendmail
program (in an abbreviated form).

* ah/send-email-sendmail-alias:
t9001: write $HOME/, not ~/, to help shells without tilde expansion
send-email: add sendmail email aliases format

Merge tag 'l10n-2.4-maint-de-updates' of git://github... Junio C Hamano Sun, 14 Jun 2015 21:24:49 +0000 (14:24 -0700)

Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po into maint

l10n-2.4-maint-de-updates

* tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po:
l10n: de.po: translation fix for fall-back to 3way merge
l10n: de.po: punctuation fixes
l10n: de.po: grammar fix
l10n: de.po: change error message from "sagen" to "Meinten Sie"

l10n: de.po: translation fix for fall-back to 3way... Michael J Gruber Tue, 19 May 2015 08:51:34 +0000 (10:51 +0200)

l10n: de.po: translation fix for fall-back to 3way merge

The English version is correct, but misleading: It is not the 3way merge
that is being patched also, but that is being fallen back to also.

The German version translates the former meaning. Make it translate the
latter.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: de.po: punctuation fixesMichael J Gruber Tue, 19 May 2015 08:51:33 +0000 (10:51 +0200)

l10n: de.po: punctuation fixes

This respects the ellipsis style used in de.po.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: de.po: grammar fixMichael J Gruber Tue, 19 May 2015 08:51:32 +0000 (10:51 +0200)

l10n: de.po: grammar fix

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: de.po: change error message from "sagen" to ... Phillip Sz Sat, 9 May 2015 11:28:55 +0000 (13:28 +0200)

l10n: de.po: change error message from "sagen" to "Meinten Sie"

We should not use "sagen" if someone has written something wrong.
Although it's "say" in English, we should not use it in German
and instead use our normal error message.

Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

Second half of seventh batchJunio C Hamano Thu, 11 Jun 2015 16:35:25 +0000 (09:35 -0700)

Second half of seventh batch

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

Merge branch 'tb/complete-sequencing'Junio C Hamano Thu, 11 Jun 2015 16:29:59 +0000 (09:29 -0700)

Merge branch 'tb/complete-sequencing'

The bash completion script (in contrib/) learned a few options that
"git revert" takes.

* tb/complete-sequencing:
completion: suggest sequencer commands for revert

Merge branch 'jk/squelch-missing-link-warning-for-unrea... Junio C Hamano Thu, 11 Jun 2015 16:29:58 +0000 (09:29 -0700)

Merge branch 'jk/squelch-missing-link-warning-for-unreachable'

Recent "git prune" traverses young unreachable objects to safekeep
old objects in the reachability chain from them, which sometimes
caused error messages that are unnecessarily alarming.

* jk/squelch-missing-link-warning-for-unreachable:
suppress errors on missing UNINTERESTING links
silence broken link warnings with revs->ignore_missing_links
add quieter versions of parse_{tree,commit}

Merge branch 'pt/pull-tests'Junio C Hamano Thu, 11 Jun 2015 16:29:58 +0000 (09:29 -0700)

Merge branch 'pt/pull-tests'

Add more test coverage to "git pull".

* pt/pull-tests:
t5520: check reflog action in fast-forward merge
t5521: test --dry-run does not make any changes
t5520: test --rebase failure on unborn branch with index
t5520: test --rebase with multiple branches
t5520: test work tree fast-forward when fetch updates head
t5520: test for failure if index has unresolved entries
t5520: test no merge candidates cases
t5520: prevent field splitting in content comparisons

Merge branch 'sb/glossary-submodule'Junio C Hamano Thu, 11 Jun 2015 16:29:57 +0000 (09:29 -0700)

Merge branch 'sb/glossary-submodule'

* sb/glossary-submodule:
glossary: add "remote", "submodule", "superproject"

Merge branch 'sb/submodule-doc-intro'Junio C Hamano Thu, 11 Jun 2015 16:29:56 +0000 (09:29 -0700)

Merge branch 'sb/submodule-doc-intro'

* sb/submodule-doc-intro:
submodule doc: reorder introductory paragraphs

Merge branch 'jk/diagnose-config-mmap-failure'Junio C Hamano Thu, 11 Jun 2015 16:29:55 +0000 (09:29 -0700)

Merge branch 'jk/diagnose-config-mmap-failure'

The configuration reader/writer uses mmap(2) interface to access
the files; when we find a directory, it barfed with "Out of memory?".

* jk/diagnose-config-mmap-failure:
xmmap(): drop "Out of memory?"
config.c: rewrite ENODEV into EISDIR when mmap fails
config.c: avoid xmmap error messages
config.c: fix mmap leak when writing config
read-cache.c: drop PROT_WRITE from mmap of index

Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano Thu, 11 Jun 2015 16:29:55 +0000 (09:29 -0700)

Merge branch 'mt/p4-depotFile-at-version'

* mt/p4-depotFile-at-version:
p4: retrieve the right revision of the file in UTF-16 codepath

Merge branch 'mh/verify-lock-error-report'Junio C Hamano Thu, 11 Jun 2015 16:29:54 +0000 (09:29 -0700)

Merge branch 'mh/verify-lock-error-report'

Bring consistency to error reporting mechanism used in "refs" API.

* mh/verify-lock-error-report:
ref_transaction_commit(): do not capitalize error messages
verify_lock(): do not capitalize error messages
verify_lock(): report errors via a strbuf
verify_lock(): on errors, let the caller unlock the lock
verify_lock(): return 0/-1 rather than struct ref_lock *

Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano Thu, 11 Jun 2015 16:29:53 +0000 (09:29 -0700)

Merge branch 'jk/color-diff-plain-is-context'

"color.diff.plain" was a misnomer; give it 'color.diff.context' as
a more logical synonym.

* jk/color-diff-plain-is-context:
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
diff: accept color.diff.context as a synonym for "plain"

Merge branch 'jk/clone-dissociate'Junio C Hamano Thu, 11 Jun 2015 16:29:52 +0000 (09:29 -0700)

Merge branch 'jk/clone-dissociate'

Code clean-up.

* jk/clone-dissociate:
clone: reorder --dissociate and --reference options
clone: use OPT_STRING_LIST for --reference

Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano Thu, 11 Jun 2015 16:29:51 +0000 (09:29 -0700)

Merge branch 'jc/diff-ws-error-highlight'

Allow whitespace breakages in deleted and context lines to be also
painted in the output.

* jc/diff-ws-error-highlight:
diff.c: --ws-error-highlight=<kind> option
diff.c: add emit_del_line() and emit_context_line()
t4015: separate common setup and per-test expectation
t4015: modernise style

doc: format-patch: fix typoFrans Klaver Wed, 10 Jun 2015 21:01:14 +0000 (23:01 +0200)

doc: format-patch: fix typo

reroll count documentation states that v<n> will be pretended to the
filename. Judging by the examples that should have been 'prepended'.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

index-pack: avoid excessive re-reading of pack directoryJeff King Tue, 9 Jun 2015 17:24:37 +0000 (13:24 -0400)

index-pack: avoid excessive re-reading of pack directory

Since 45e8a74 (has_sha1_file: re-check pack directory before
giving up, 2013-08-30), we spend extra effort for
has_sha1_file to give the right answer when somebody else is
repacking. Usually this effort does not matter, because
after finding that the object does not exist, the next step
is usually to die().

However, some code paths make a large number of
has_sha1_file checks which are _not_ expected to return 1.
The collision test in index-pack.c is such a case. On a
local system, this can cause a performance slowdown of
around 5%. But on a system with high-latency system calls
(like NFS), it can be much worse.

This patch introduces a "quick" flag to has_sha1_file which
callers can use when they would prefer high performance at
the cost of false negatives during repacks. There may be
other code paths that can use this, but the index-pack one
is the most obviously critical, so we'll start with
switching that one.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit: cope with scissors lines in commit messageSZEDER Gábor Tue, 9 Jun 2015 00:28:34 +0000 (02:28 +0200)

commit: cope with scissors lines in commit message

The diff and submodule shortlog appended to the commit message template
by 'git commit --verbose' are not stripped when the commit message
contains an indented scissors line.

When cleaning up a commit message with 'git commit --verbose' or
'--cleanup=scissors' the code is careful and triggers only on a pure
scissors line, i.e. a line containing nothing but a comment character, a
space, and the scissors cut. This is good, because people can embed
scissors lines in the commit message while using 'git commit --verbose',
and the text they write after their indented scissors line doesn't get
deleted.

While doing so, however, the cleanup function only looks at the first
line matching the scissors pattern and if it doesn't start at the
beginning of the line, then the function just returns without performing
any cleanup. This is wrong, because a "real" scissors line added by
'git commit --verbose' might follow, and in that case the diff and
submodule shortlog get included in the commit message.

Fix this by changing the scissors pattern to match only at the beginning
of the line, yet be careful to catch scissors on the first line as well.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-completion.tcsh: fix redirect with noclobberAriel Faigon Tue, 9 Jun 2015 17:25:15 +0000 (10:25 -0700)

git-completion.tcsh: fix redirect with noclobber

tcsh users who happen to have 'set noclobber' elsewhere in their
~/.tcshrc or ~/.cshrc startup files get a 'File exist' error, and
the tcsh completion file doesn't get generated/updated.

Adding a `!` in the redirect works correctly for both clobber (default)
and 'set noclobber' users.

Reviewed-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: Ariel Faigon <github.2009@yendor.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

am --abort: keep unrelated commits on unborn branchPaul Tan Sat, 6 Jun 2015 11:46:12 +0000 (19:46 +0800)

am --abort: keep unrelated commits on unborn branch

Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure
and warn, 2010-12-21), git-am would refuse to rewind HEAD if commits
were made since the last git-am failure. This check was implemented in
safe_to_abort(), which checked to see if HEAD's hash matched the
abort-safety file.

However, this check was skipped if the abort-safety file was empty,
which can happen if git-am failed while on an unborn branch. As such, if
any commits were made since then, they would be discarded. Fix this by
carrying on the abort safety check even if the abort-safety file is
empty.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

am --abort: support aborting to unborn branchPaul Tan Sat, 6 Jun 2015 11:46:11 +0000 (19:46 +0800)

am --abort: support aborting to unborn branch

When git-am is first run on an unborn branch, no ORIG_HEAD is created.
As such, any applied commits will remain even after a git am --abort.

To be consistent with the behavior of git am --abort when it is not run
from an unborn branch, we empty the index, and then destroy the branch
pointed to by HEAD if there is no ORIG_HEAD.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

am --abort: revert changes introduced by failed 3way... Paul Tan Sat, 6 Jun 2015 11:46:10 +0000 (19:46 +0800)

am --abort: revert changes introduced by failed 3way merge

Even when a merge conflict occurs with am --3way, the index will be
modified with the results of any successfully merged files. These
changes to the index will not be reverted with a
"git read-tree --reset -u HEAD ORIG_HEAD", as git read-tree will not be
aware of how the current index differs from HEAD or ORIG_HEAD.

To fix this, we first reset any conflicting entries in the index. The
resulting index will contain the results of successfully merged files
introduced by the failed merge. We write this index to a tree, and then
use git read-tree to fast-forward this "index tree" back to ORIG_HEAD,
thus undoing all the changes from the failed merge.

When we are on an unborn branch, HEAD and ORIG_HEAD will not point to
valid trees. In this case, use an empty tree.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

am --skip: support skipping while on unborn branchPaul Tan Sat, 6 Jun 2015 11:46:09 +0000 (19:46 +0800)

am --skip: support skipping while on unborn branch

When git am --skip is run, git am will copy HEAD's tree entries to the
index with "git reset HEAD". However, on an unborn branch, HEAD does not
point to a tree, so "git reset HEAD" will fail.

Fix this by treating HEAD as en empty tree when we are on an unborn
branch.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

am -3: support 3way merge on unborn branchPaul Tan Sat, 6 Jun 2015 11:46:08 +0000 (19:46 +0800)

am -3: support 3way merge on unborn branch

While on an unborn branch, git am -3 will fail to do a threeway merge as
it references HEAD as "our tree", but HEAD does not point to a valid
tree.

Fix this by using an empty tree as "our tree" when we are on an unborn
branch.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

am --skip: revert changes introduced by failed 3way... Paul Tan Sat, 6 Jun 2015 11:46:07 +0000 (19:46 +0800)

am --skip: revert changes introduced by failed 3way merge

Even when a merge conflict occurs with am --3way, the index will be
modified with the results of any succesfully merged files (such as a new
file). These changes to the index will not be reverted with a
"git read-tree --reset -u HEAD HEAD", as git read-tree will not be aware
of how the current index differs from HEAD.

To fix this, we first reset any conflicting entries from the index. The
resulting index will contain the results of successfully merged files.
We write the index to a tree, then use git read-tree -m to fast-forward
the "index tree" back to HEAD, thus undoing all the changes from the
failed merge.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fsck: report errors if reflog entries point at invalid... Michael Haggerty Mon, 8 Jun 2015 13:40:05 +0000 (15:40 +0200)

fsck: report errors if reflog entries point at invalid objects

Previously, if a reflog entry's old or new SHA-1 was not resolvable to
an object, that SHA-1 was silently ignored. Instead, report such cases
as errors.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fsck_handle_reflog_sha1(): new functionMichael Haggerty Mon, 8 Jun 2015 13:40:04 +0000 (15:40 +0200)

fsck_handle_reflog_sha1(): new function

New function, extracted from fsck_handle_reflog_ent(). The extra
is_null_sha1() test for the new reference is currently unnecessary, as
reflogs are deleted when the reference itself is deleted. But it
doesn't hurt, either.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

read_loose_refs(): treat NULL_SHA1 loose references... Michael Haggerty Wed, 3 Jun 2015 13:51:59 +0000 (15:51 +0200)

read_loose_refs(): treat NULL_SHA1 loose references as broken

NULL_SHA1 is used to indicate an "invalid object name" throughout our
code (and the code of other git implementations), so it is vastly more
likely that an on-disk reference was set to this value due to a
software bug than that NULL_SHA1 is the legitimate SHA-1 of an actual
object. Therefore, if a loose reference has the value NULL_SHA1,
consider it to be broken.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

read-cache: fix untracked cache invalidation when split... Nguyễn Thái Ngọc Duy Sun, 7 Jun 2015 10:40:52 +0000 (17:40 +0700)

read-cache: fix untracked cache invalidation when split-index is used

Before this change, t7063.17 fails. The actual action though happens at
t7063.16 where the entry "two" is added back to index after being
removed in the .13. Here we expect a directory invalidate at .16 and
none at .17 where untracked cache is refreshed. But things do not go as
expected when GIT_TEST_SPLIT_INDEX is set.

The different behavior that happens at .16 when split index is used: the
entry "two", when deleted at .13, is simply marked "deleted". When .16
executes, the entry resurfaces from the version in base index. This
happens in merge_base_index() where add_index_entry() is called to add
"two" back from the base index.

This is where the bug comes from. The add_index_entry() is called with
ADD_CACHE_KEEP_CACHE_TREE flag because this version of "two" is not new,
it does not break either cache-tree or untracked cache. The code should
check this flag and not invalidate untracked cache. This causes a second
invalidation violates test expectation. The fix is obvious.

Noticed-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: teach 'scissors' mode to 'git commit -... SZEDER Gábor Mon, 8 Jun 2015 01:43:31 +0000 (03:43 +0200)

completion: teach 'scissors' mode to 'git commit --cleanup='

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

utf8: NO_ICONV: silence uninitialized variable warningEric Sunshine Fri, 5 Jun 2015 06:42:16 +0000 (02:42 -0400)

utf8: NO_ICONV: silence uninitialized variable warning

The last argument of reencode_string_len() is an 'int *' which is
assigned the length of the converted string. When NO_ICONV is defined,
however, reencode_string_len() is stubbed out by the macro:

#define reencode_string_len(a,b,c,d,e) NULL

which never assigns a value to the final argument. When called like
this:

int n;
char *s = reencode_string_len(..., &n);
if (s)
do_something(s, n);

some compilers complain that 'n' is used uninitialized within the
conditional.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

lockfile: wait using sleep_millisec() instead of select()Johannes Sixt Fri, 5 Jun 2015 19:45:07 +0000 (21:45 +0200)

lockfile: wait using sleep_millisec() instead of select()

Use the new function sleep_millisec() to delay execution for a short
time. This avoids the invocation of select() with just a timeout, but
no file descriptors. Such a use of select() is quit with EINVAL on
Windows, leading to no delay at all.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

lockfile: convert retry timeout computations to millisecondJohannes Sixt Fri, 5 Jun 2015 19:45:06 +0000 (21:45 +0200)

lockfile: convert retry timeout computations to millisecond

When the goal is to wait for some random amount of time up to one
second, it is not necessary to compute with microsecond precision.
This is a preparation to re-use sleep_millisec().

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

help.c: wrap wait-only poll() invocation in sleep_milli... Johannes Sixt Fri, 5 Jun 2015 19:45:05 +0000 (21:45 +0200)

help.c: wrap wait-only poll() invocation in sleep_millisec()

We want to use the new function elsewhere in a moment.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

lockfile: replace random() by rand()Johannes Sixt Fri, 5 Jun 2015 19:45:04 +0000 (21:45 +0200)

lockfile: replace random() by rand()

On Windows, we do not have functions srandom() and random(). Use srand()
and rand(). These functions produce random numbers of lesser quality,
but for the purpose (a retry time-out) they are still good enough.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 2.4.3Junio C Hamano Fri, 5 Jun 2015 19:23:18 +0000 (12:23 -0700)

Sync with 2.4.3

Git 2.4.3 v2.4.3Junio C Hamano Fri, 5 Jun 2015 19:15:57 +0000 (12:15 -0700)

Git 2.4.3

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

The first half of the seventh batch for 2.5Junio C Hamano Fri, 5 Jun 2015 19:20:57 +0000 (12:20 -0700)

The first half of the seventh batch for 2.5

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

Merge branch 'ld/p4-editor-multi-words'Junio C Hamano Fri, 5 Jun 2015 19:17:38 +0000 (12:17 -0700)

Merge branch 'ld/p4-editor-multi-words'

Unlike "$EDITOR" and "$GIT_EDITOR" that can hold the path to the
command and initial options (e.g. "/path/to/emacs -nw"), 'git p4'
did not let the shell interpolate the contents of the environment
variable that name the editor "$P4EDITOR" (and "$EDITOR", too).
Make it in line with the rest of Git, as well as with Perforce.

* ld/p4-editor-multi-words:
git-p4: tests: use test-chmtime in place of touch
git-p4: fix handling of multi-word P4EDITOR
git-p4: add failing test for P4EDITOR handling

Merge branch 'bc/object-id'Junio C Hamano Fri, 5 Jun 2015 19:17:37 +0000 (12:17 -0700)

Merge branch 'bc/object-id'

for_each_ref() callback functions were taught to name the objects
not with "unsigned char sha1[20]" but with "struct object_id".

* bc/object-id: (56 commits)
struct ref_lock: convert old_sha1 member to object_id
warn_if_dangling_symref(): convert local variable "junk" to object_id
each_ref_fn_adapter(): remove adapter
rev_list_insert_ref(): remove unneeded arguments
rev_list_insert_ref_oid(): new function, taking an object_oid
mark_complete(): remove unneeded arguments
mark_complete_oid(): new function, taking an object_oid
clear_marks(): rewrite to take an object_id argument
mark_complete(): rewrite to take an object_id argument
send_ref(): convert local variable "peeled" to object_id
upload-pack: rewrite functions to take object_id arguments
find_symref(): convert local variable "unused" to object_id
find_symref(): rewrite to take an object_id argument
write_one_ref(): rewrite to take an object_id argument
write_refs_to_temp_dir(): convert local variable sha1 to object_id
submodule: rewrite to take an object_id argument
shallow: rewrite functions to take object_id arguments
handle_one_ref(): rewrite to take an object_id argument
add_info_ref(): rewrite to take an object_id argument
handle_one_reflog(): rewrite to take an object_id argument
...

Merge branch 'jk/at-push-sha1'Junio C Hamano Fri, 5 Jun 2015 19:17:36 +0000 (12:17 -0700)

Merge branch 'jk/at-push-sha1'

Introduce <branch>@{push} short-hand to denote the remote-tracking
branch that tracks the branch at the remote the <branch> would be
pushed to.

* jk/at-push-sha1:
for-each-ref: accept "%(push)" format
for-each-ref: use skip_prefix instead of starts_with
sha1_name: implement @{push} shorthand
sha1_name: refactor interpret_upstream_mark
sha1_name: refactor upstream_mark
remote.c: add branch_get_push
remote.c: return upstream name from stat_tracking_info
remote.c: untangle error logic in branch_get_upstream
remote.c: report specific errors from branch_get_upstream
remote.c: introduce branch_get_upstream helper
remote.c: hoist read_config into remote_get_1
remote.c: provide per-branch pushremote name
remote.c: hoist branch.*.remote lookup out of remote_get_1
remote.c: drop "remote" pointer from "struct branch"
remote.c: refactor setup of branch->merge list
remote.c: drop default_remote_name variable

Merge branch 'dl/branch-error-message' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:29 +0000 (12:00 -0700)

Merge branch 'dl/branch-error-message' into maint

Error messages from "git branch" called remote-tracking branches as
"remote branches".

* dl/branch-error-message:
branch: do not call a "remote-tracking branch" a "remote branch"

Merge branch 'jk/skip-http-tests-under-no-curl' into... Junio C Hamano Fri, 5 Jun 2015 19:00:28 +0000 (12:00 -0700)

Merge branch 'jk/skip-http-tests-under-no-curl' into maint

Test clean-up.

* jk/skip-http-tests-under-no-curl:
tests: skip dav http-push tests under NO_EXPAT=NoThanks
t/lib-httpd.sh: skip tests if NO_CURL is defined

Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:27 +0000 (12:00 -0700)

Merge branch 'ps/doc-packfile-vs-pack-file' into maint

Doc consistency updates.

* ps/doc-packfile-vs-pack-file:
doc: fix inconsistent spelling of "packfile"
pack-protocol.txt: fix insconsistent spelling of "packfile"
git-unpack-objects.txt: fix inconsistent spelling of "packfile"
git-verify-pack.txt: fix inconsistent spelling of "packfile"

Merge branch 'fg/document-commit-message-stripping... Junio C Hamano Fri, 5 Jun 2015 19:00:26 +0000 (12:00 -0700)

Merge branch 'fg/document-commit-message-stripping' into maint

* fg/document-commit-message-stripping:
Documentation: clarify how "git commit" cleans up the edited log message

Merge branch 'jk/rerere-forget-check-enabled' into... Junio C Hamano Fri, 5 Jun 2015 19:00:25 +0000 (12:00 -0700)

Merge branch 'jk/rerere-forget-check-enabled' into maint

"git rerere forget" in a repository without rerere enabled gave a
cryptic error message; it should be a silent no-op instead.

* jk/rerere-forget-check-enabled:
rerere: exit silently on "forget" when rerere is disabled

Merge branch 'pt/pull-log-n' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:24 +0000 (12:00 -0700)

Merge branch 'pt/pull-log-n' into maint

"git pull --log" and "git pull --no-log" worked as expected, but
"git pull --log=20" did not.

* pt/pull-log-n:
pull: handle --log=<n>

Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:23 +0000 (12:00 -0700)

Merge branch 'pt/pull-ff-vs-merge-ff' into maint

The pull.ff configuration was supposed to override the merge.ff
configuration, but it didn't.

* pt/pull-ff-vs-merge-ff:
pull: parse pull.ff as a bool or string
pull: make pull.ff=true override merge.ff

Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:22 +0000 (12:00 -0700)

Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint

The code to read pack-bitmap wanted to allocate a few hundred
pointers to a structure, but by mistake allocated and leaked memory
enough to hold that many actual structures. Correct the allocation
size and also have it on stack, as it is small enough.

* rs/plug-leak-in-pack-bitmaps:
pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps

Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:22 +0000 (12:00 -0700)

Merge branch 'ja/tutorial-asciidoctor-fix' into maint

A literal block in the tutorial had lines with unequal lengths to
delimit it from the rest of the document, which choke GitHub's
AsciiDoc renderer.

* ja/tutorial-asciidoctor-fix:
doc: fix unmatched code fences

Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:20 +0000 (12:00 -0700)

Merge branch 'jk/stripspace-asciidoctor-fix' into maint

A literal block in the tutorial had lines with unequal lengths to
delimit it from the rest of the document, which choke GitHub's
AsciiDoc renderer.

* jk/stripspace-asciidoctor-fix:
doc: fix unmatched code fences in git-stripspace

Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:19 +0000 (12:00 -0700)

Merge branch 'jk/asciidoc-markup-fix' into maint

Various documentation mark-up fixes to make the output more
consistent in general and also make AsciiDoctor (an alternative
formatter) happier.

* jk/asciidoc-markup-fix:
doc: convert AsciiDoc {?foo} to ifdef::foo[]
doc: put example URLs and emails inside literal backticks
doc: drop backslash quoting of some curly braces
doc: convert \--option to --option
doc/add: reformat `--edit` option
doc: fix length of underlined section-title
doc: fix hanging "+"-continuation
doc: fix unquoted use of "{type}"
doc: fix misrendering due to `single quote'

Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:18 +0000 (12:00 -0700)

Merge branch 'ps/bundle-verify-arg' into maint

"git bundle verify" did not diagnose extra parameters on the
command line.

* ps/bundle-verify-arg:
bundle: verify arguments more strictly

Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:17 +0000 (12:00 -0700)

Merge branch 'mh/write-refs-sooner-2.4' into maint

Multi-ref transaction support we merged a few releases ago
unnecessarily kept many file descriptors open, risking to fail with
resource exhaustion. This is for 2.4.x track.

* mh/write-refs-sooner-2.4:
ref_transaction_commit(): fix atomicity and avoid fd exhaustion
ref_transaction_commit(): remove the local flags variable
ref_transaction_commit(): inline call to write_ref_sha1()
rename_ref(): inline calls to write_ref_sha1() from this function
commit_ref_update(): new function, extracted from write_ref_sha1()
write_ref_to_lockfile(): new function, extracted from write_ref_sha1()
t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
update-ref: test handling large transactions properly
ref_transaction_commit(): fix atomicity and avoid fd exhaustion
ref_transaction_commit(): remove the local flags variable
ref_transaction_commit(): inline call to write_ref_sha1()
rename_ref(): inline calls to write_ref_sha1() from this function
commit_ref_update(): new function, extracted from write_ref_sha1()
write_ref_to_lockfile(): new function, extracted from write_ref_sha1()
t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
update-ref: test handling large transactions properly

Merge branch 'mh/ref-directory-file' into maintJunio C Hamano Fri, 5 Jun 2015 19:00:16 +0000 (12:00 -0700)

Merge branch 'mh/ref-directory-file' into maint

The ref API did not handle cases where 'refs/heads/xyzzy/frotz' is
removed at the same time as 'refs/heads/xyzzy' is added (or vice
versa) very well.

* mh/ref-directory-file:
reflog_expire(): integrate lock_ref_sha1_basic() errors into ours
ref_transaction_commit(): delete extra "the" from error message
ref_transaction_commit(): provide better error messages
rename_ref(): integrate lock_ref_sha1_basic() errors into ours
lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts
lock_ref_sha1_basic(): report errors via a "struct strbuf *err"
verify_refname_available(): report errors via a "struct strbuf *err"
verify_refname_available(): rename function
refs: check for D/F conflicts among refs created in a transaction
ref_transaction_commit(): use a string_list for detecting duplicates
is_refname_available(): use dirname in first loop
struct nonmatching_ref_data: store a refname instead of a ref_entry
report_refname_conflict(): inline function
entry_matches(): inline function
is_refname_available(): convert local variable "dirname" to strbuf
is_refname_available(): avoid shadowing "dir" variable
is_refname_available(): revamp the comments
t1404: new tests of ref D/F conflicts within transactions