git/git.git
6 years agoMerge branch 'km/log-usage-string-i18n'
Junio C Hamano [Wed, 14 Jan 2015 20:32:39 +0000 (12:32 -0800)]
Merge branch 'km/log-usage-string-i18n'

* km/log-usage-string-i18n:
  log.c: fix translation markings

6 years agoMerge branch 'km/imap-send-libcurl-options'
Junio C Hamano [Wed, 14 Jan 2015 20:31:50 +0000 (12:31 -0800)]
Merge branch 'km/imap-send-libcurl-options'

Now imap-send learned to talk to the server using cURL library,
allow the same GIT_CURL_VERBOSE environment variable to control the
verbosity of the chattering.

* km/imap-send-libcurl-options:
  imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY
  imap-send.c: support GIT_CURL_VERBOSE

6 years agoMerge branch 'jk/prune-packed-server-info'
Junio C Hamano [Wed, 14 Jan 2015 20:30:26 +0000 (12:30 -0800)]
Merge branch 'jk/prune-packed-server-info'

Fix recent breakage in Git 2.2 that started creating info/refs and
objects/info/packs files with permission bits tighter than user's
umask.

* jk/prune-packed-server-info:
  update-server-info: create info/* with mode 0666
  t1301: set umask in reflog sharedrepository=group test

6 years agoMerge branch 'js/remote-add-with-insteadof'
Junio C Hamano [Wed, 14 Jan 2015 20:29:47 +0000 (12:29 -0800)]
Merge branch 'js/remote-add-with-insteadof'

"git remote add $name $URL" is now allowed when "url.$URL.insteadOf"
is already defined.

* js/remote-add-with-insteadof:
  Add a regression test for 'git remote add <existing> <same-url>'
  git remote: allow adding remotes agreeing with url.<...>.insteadOf

6 years agoGit 2.3.0-rc0 v2.3.0-rc0
Junio C Hamano [Mon, 12 Jan 2015 22:12:42 +0000 (14:12 -0800)]
Git 2.3.0-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoSync with 2.2.2
Junio C Hamano [Mon, 12 Jan 2015 22:08:42 +0000 (14:08 -0800)]
Sync with 2.2.2

6 years agoGit 2.2.2 v2.2.2
Junio C Hamano [Mon, 12 Jan 2015 22:06:12 +0000 (14:06 -0800)]
Git 2.2.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'jk/read-packed-refs-without-path-max' into maint
Junio C Hamano [Mon, 12 Jan 2015 22:02:54 +0000 (14:02 -0800)]
Merge branch 'jk/read-packed-refs-without-path-max' into maint

* jk/read-packed-refs-without-path-max:
  read_packed_refs: use skip_prefix instead of static array
  read_packed_refs: pass strbuf to parse_ref_line
  read_packed_refs: use a strbuf for reading lines

6 years agoMerge branch 'mg/add-ignore-errors' into maint
Junio C Hamano [Mon, 12 Jan 2015 22:02:19 +0000 (14:02 -0800)]
Merge branch 'mg/add-ignore-errors' into maint

* mg/add-ignore-errors:
  add: ignore only ignored files

6 years agoMerge branch 'mh/find-uniq-abbrev' into maint
Junio C Hamano [Mon, 12 Jan 2015 22:02:05 +0000 (14:02 -0800)]
Merge branch 'mh/find-uniq-abbrev' into maint

* mh/find-uniq-abbrev:
  sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev

6 years agoMerge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint
Junio C Hamano [Mon, 12 Jan 2015 22:01:18 +0000 (14:01 -0800)]
Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint

* jk/approxidate-avoid-y-d-m-over-future-dates:
  approxidate: allow ISO-like dates far in the future
  pass TIME_DATE_NOW to approxidate future-check

6 years agoMerge branch 'rw/apply-does-not-take-ignore-date' into maint
Junio C Hamano [Mon, 12 Jan 2015 22:00:16 +0000 (14:00 -0800)]
Merge branch 'rw/apply-does-not-take-ignore-date' into maint

* rw/apply-does-not-take-ignore-date:
  git-am.txt: --ignore-date flag is not passed to git-apply

6 years agoMerge branch 'jk/for-each-reflog-ent-reverse' into maint
Junio C Hamano [Mon, 12 Jan 2015 20:19:17 +0000 (12:19 -0800)]
Merge branch 'jk/for-each-reflog-ent-reverse' into maint

* jk/for-each-reflog-ent-reverse:
  for_each_reflog_ent_reverse: turn leftover check into assertion
  for_each_reflog_ent_reverse: fix newlines on block boundaries

6 years agoMerge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'
Junio C Hamano [Mon, 12 Jan 2015 19:38:56 +0000 (11:38 -0800)]
Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'

Earlier we made "rev-list --object-edge" more aggressively list the
objects at the edge commits, in order to reduce number of objects
fetched into a shallow repository, but the change affected cases
other than "fetching into a shallow repository" and made it
unusably slow (e.g. fetching into a normal repository should not
have to suffer the overhead from extra processing).  Limit it to a
more specific case by introducing --objects-edge-aggressive, a new
option to rev-list.

* bc/fetch-thin-less-aggressive-in-normal-repository:
  pack-objects: use --objects-edge-aggressive for shallow repos
  rev-list: add an option to mark fewer edges as uninteresting
  Documentation: add missing article in rev-list-options.txt

6 years agoMerge branch 'sb/doc-submitting-patches-keep-notes'
Junio C Hamano [Mon, 12 Jan 2015 19:38:54 +0000 (11:38 -0800)]
Merge branch 'sb/doc-submitting-patches-keep-notes'

* sb/doc-submitting-patches-keep-notes:
  SubmittingPatches: explain rationale for using --notes with format-patch

6 years agoMerge branch 'rs/simplify-transport-get'
Junio C Hamano [Mon, 12 Jan 2015 19:38:51 +0000 (11:38 -0800)]
Merge branch 'rs/simplify-transport-get'

* rs/simplify-transport-get:
  transport: simplify duplicating a substring in transport_get() using xmemdupz()

6 years agoMerge branch 'rs/simplify-parsing-commit-tree-S'
Junio C Hamano [Mon, 12 Jan 2015 19:38:39 +0000 (11:38 -0800)]
Merge branch 'rs/simplify-parsing-commit-tree-S'

* rs/simplify-parsing-commit-tree-S:
  commit-tree: simplify parsing of option -S using skip_prefix()

6 years agoMerge branch 'rs/plug-strbuf-leak-in-merge'
Junio C Hamano [Mon, 12 Jan 2015 19:38:32 +0000 (11:38 -0800)]
Merge branch 'rs/plug-strbuf-leak-in-merge'

* rs/plug-strbuf-leak-in-merge:
  merge: release strbuf after use in suggest_conflicts()

6 years agoMerge branch 'rs/plug-strbuf-leak-in-lock-ref'
Junio C Hamano [Mon, 12 Jan 2015 19:38:30 +0000 (11:38 -0800)]
Merge branch 'rs/plug-strbuf-leak-in-lock-ref'

* rs/plug-strbuf-leak-in-lock-ref:
  refs: plug strbuf leak in lock_ref_sha1_basic()

6 years agoMerge branch 'es/checkout-index-temp'
Junio C Hamano [Mon, 12 Jan 2015 19:38:23 +0000 (11:38 -0800)]
Merge branch 'es/checkout-index-temp'

"git checkout-index --temp=$target $path" did not work correctly
for paths outside the current subdirectory in the project.

* es/checkout-index-temp:
  checkout-index: fix --temp relative path mangling
  t2004: demonstrate broken relative path printing
  t2004: standardize file naming in symlink test
  t2004: drop unnecessary write-tree/read-tree
  t2004: modernize style

6 years agoMerge branch 'cc/bisect-rev-parsing'
Junio C Hamano [Mon, 12 Jan 2015 19:38:14 +0000 (11:38 -0800)]
Merge branch 'cc/bisect-rev-parsing'

The logic in "git bisect bad HEAD" etc. to avoid forcing the test
of the common ancestor of bad and good commits was broken.

* cc/bisect-rev-parsing:
  bisect: add test to check that revs are properly parsed
  bisect: parse revs before passing them to check_expected_revs()

6 years agoFourth batch for 2.3 cycle
Junio C Hamano [Wed, 7 Jan 2015 21:12:54 +0000 (13:12 -0800)]
Fourth batch for 2.3 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'maint'
Junio C Hamano [Wed, 7 Jan 2015 21:28:29 +0000 (13:28 -0800)]
Merge branch 'maint'

* maint:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

6 years agoMerge branch 'maint-2.1' into maint
Junio C Hamano [Wed, 7 Jan 2015 21:28:10 +0000 (13:28 -0800)]
Merge branch 'maint-2.1' into maint

* maint-2.1:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

6 years agoMerge branch 'maint-2.0' into maint-2.1
Junio C Hamano [Wed, 7 Jan 2015 21:27:56 +0000 (13:27 -0800)]
Merge branch 'maint-2.0' into maint-2.1

* maint-2.0:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

6 years agoMerge branch 'maint-1.9' into maint-2.0
Junio C Hamano [Wed, 7 Jan 2015 21:27:19 +0000 (13:27 -0800)]
Merge branch 'maint-1.9' into maint-2.0

* maint-1.9:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

6 years agoMerge branch 'maint-1.8.5' into maint-1.9
Junio C Hamano [Wed, 7 Jan 2015 21:27:13 +0000 (13:27 -0800)]
Merge branch 'maint-1.8.5' into maint-1.9

* maint-1.8.5:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

6 years agoMerge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5
Junio C Hamano [Wed, 7 Jan 2015 21:26:35 +0000 (13:26 -0800)]
Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5

* jk/dotgit-case-maint-1.8.5:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

6 years agoMerge branch 'bw/maint-0090-awk-tweak'
Junio C Hamano [Wed, 7 Jan 2015 21:10:44 +0000 (13:10 -0800)]
Merge branch 'bw/maint-0090-awk-tweak'

* bw/maint-0090-awk-tweak:
  t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk

6 years agoMerge branch 'jh/pre-push-sample-no-custom-ifs'
Junio C Hamano [Wed, 7 Jan 2015 21:10:40 +0000 (13:10 -0800)]
Merge branch 'jh/pre-push-sample-no-custom-ifs'

The sample pre-push hook used customized IFS=' ' for no good reason.

* jh/pre-push-sample-no-custom-ifs:
  pre-push.sample: remove unnecessary and misleading IFS=' '

6 years agoMerge branch 'tf/prompt-preserve-exit-status'
Junio C Hamano [Wed, 7 Jan 2015 21:09:35 +0000 (13:09 -0800)]
Merge branch 'tf/prompt-preserve-exit-status'

Using the exit status of the last command in the prompt, e.g.
PS1='$(__git_ps1) $? ', did not work well because the helper
function stomped on the exit status.

* tf/prompt-preserve-exit-status:
  git-prompt: preserve value of $? inside shell prompt

6 years agoMerge branch 'sb/dco-indentation-fix'
Junio C Hamano [Wed, 7 Jan 2015 21:09:32 +0000 (13:09 -0800)]
Merge branch 'sb/dco-indentation-fix'

* sb/dco-indentation-fix:
  Documentation/SubmittingPatches: unify whitespace/tabs for the DCO

6 years agoMerge branch 'bb/update-unicode-table'
Junio C Hamano [Wed, 7 Jan 2015 21:09:04 +0000 (13:09 -0800)]
Merge branch 'bb/update-unicode-table'

Simplify the procedure to generate unicode table.

* bb/update-unicode-table:
  update_unicode.sh: delete the command group
  update_unicode.sh: make the output structure visible
  update_unicode.sh: shorten uniset invocation path
  update_unicode.sh: set UNICODE_DIR only once
  update_unicode.sh: simplify output capture

6 years agoMerge branch 'es/squelch-openssl-warnings-on-macosx'
Junio C Hamano [Wed, 7 Jan 2015 21:08:30 +0000 (13:08 -0800)]
Merge branch 'es/squelch-openssl-warnings-on-macosx'

Squelch useless compiler warnings on Mac OS X.

* es/squelch-openssl-warnings-on-macosx:
  git-compat-util: suppress unavoidable Apple-specific deprecation warnings

6 years agoMerge branch 'sb/t5400-remove-unused'
Junio C Hamano [Wed, 7 Jan 2015 21:08:26 +0000 (13:08 -0800)]
Merge branch 'sb/t5400-remove-unused'

* sb/t5400-remove-unused:
  t5400: remove dead code

6 years agoMerge branch 'lh/send-email-hide-x-mailer'
Junio C Hamano [Wed, 7 Jan 2015 21:07:27 +0000 (13:07 -0800)]
Merge branch 'lh/send-email-hide-x-mailer'

"git send-email" normally identifies itself via X-Mailer: header
in the message it sends out.  A new command line flag allows the
user to squelch the header.

* lh/send-email-hide-x-mailer:
  test/send-email: --[no-]xmailer tests
  send-email: add --[no-]xmailer option

6 years agoMerge branch 'rd/send-email-2047-fix'
Junio C Hamano [Wed, 7 Jan 2015 21:06:47 +0000 (13:06 -0800)]
Merge branch 'rd/send-email-2047-fix'

"git send-email" did not handle RFC 2047 encoded headers quite
right.

* rd/send-email-2047-fix:
  send-email: handle adjacent RFC 2047-encoded words properly
  send-email: align RFC 2047 decoding more closely with the spec

6 years agoMerge branch 'pd/completion-filenames-fix'
Junio C Hamano [Wed, 7 Jan 2015 21:06:36 +0000 (13:06 -0800)]
Merge branch 'pd/completion-filenames-fix'

The top-of-the-file instruction for completion scripts (in contrib/)
did not name the files correctly.

* pd/completion-filenames-fix:
  Update documentation occurrences of filename .sh

6 years agoMerge branch 'jk/add-i-read-error'
Junio C Hamano [Wed, 7 Jan 2015 21:05:58 +0000 (13:05 -0800)]
Merge branch 'jk/add-i-read-error'

"git add -i" did not notice when the interactive command input
stream went away and kept asking.

* jk/add-i-read-error:
  add--interactive: leave main loop on read error

6 years agoMerge branch 'jk/approxidate-avoid-y-d-m-over-future-dates'
Junio C Hamano [Wed, 7 Jan 2015 21:01:16 +0000 (13:01 -0800)]
Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates'

Traditionally we tried to avoid interpreting date strings given by
the user as future dates, e.g. GIT_COMMITTER_DATE=2014-12-10 when
used early November 2014 was taken as "October 12, 2014" because it
is likely that a date in the future, December 10, is a mistake.

Loosen this and do not tiebreak by future-ness of the date when

(1) ISO-like format is used, and
(2) the string can make sense interpreted as both y-m-d and y-d-m.

* jk/approxidate-avoid-y-d-m-over-future-dates:
  approxidate: allow ISO-like dates far in the future
  pass TIME_DATE_NOW to approxidate future-check

6 years agoMerge branch 'br/imap-send-via-libcurl'
Junio C Hamano [Wed, 7 Jan 2015 20:58:05 +0000 (12:58 -0800)]
Merge branch 'br/imap-send-via-libcurl'

Newer libCurl knows how to talk IMAP; "git imap-send" has been
updated to use this instead of a hand-rolled OpenSSL calls.

* br/imap-send-via-libcurl:
  git-imap-send: use libcurl for implementation

6 years agoMerge branch 'br/imap-send-verbosity'
Junio C Hamano [Wed, 7 Jan 2015 20:57:03 +0000 (12:57 -0800)]
Merge branch 'br/imap-send-verbosity'

* br/imap-send-verbosity:
  imap-send: use parse options API to determine verbosity

6 years agoMerge branch 'nd/lockfile-absolute'
Junio C Hamano [Wed, 7 Jan 2015 20:56:01 +0000 (12:56 -0800)]
Merge branch 'nd/lockfile-absolute'

The lockfile API can get confused which file to clean up when the
process moved the $cwd after creating a lockfile.

* nd/lockfile-absolute:
  lockfile.c: store absolute path

6 years agoMerge branch 'jc/merge-bases'
Junio C Hamano [Wed, 7 Jan 2015 20:55:05 +0000 (12:55 -0800)]
Merge branch 'jc/merge-bases'

The get_merge_bases*() API was easy to misuse by careless
copy&paste coders, leaving object flags tainted in the commits that
needed to be traversed.

* jc/merge-bases:
  get_merge_bases(): always clean-up object flags
  bisect: clean flags after checking merge bases

6 years agoMerge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'
Junio C Hamano [Wed, 7 Jan 2015 20:49:19 +0000 (12:49 -0800)]
Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'

The commented output used to blindly add a SP before the payload
line, resulting in "# \t<indented text>\n" when the payload began
with a HT.  Instead, produce "#\t<indented text>\n".

* jc/strbuf-add-lines-avoid-sp-ht-sequence:
  strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines

6 years agoMerge branch 'jc/diff-b-m'
Junio C Hamano [Wed, 7 Jan 2015 20:44:41 +0000 (12:44 -0800)]
Merge branch 'jc/diff-b-m'

Fix long-standing bug in "diff -B -M" output.

* jc/diff-b-m:
  diff -B -M: fix output for "copy and then rewrite" case

6 years agoMerge branch 'jc/clone-borrow'
Junio C Hamano [Wed, 7 Jan 2015 20:42:13 +0000 (12:42 -0800)]
Merge branch 'jc/clone-borrow'

Allow "git clone --reference" to be used more safely.

* jc/clone-borrow:
  clone: --dissociate option to mark that reference is only temporary

6 years agoMerge branch 'jc/checkout-local-track-report'
Junio C Hamano [Wed, 7 Jan 2015 20:40:59 +0000 (12:40 -0800)]
Merge branch 'jc/checkout-local-track-report'

The report from "git checkout" on a branch that builds on another
local branch by setting its branch.*.merge to branch name (not a
full refname) incorrectly said that the upstream is gone.

* jc/checkout-local-track-report:
  checkout: report upstream correctly even with loosely defined branch.*.merge

6 years agoSubmittingPatches: explain rationale for using --notes with format-patch
Eric Sunshine [Tue, 30 Dec 2014 23:30:30 +0000 (18:30 -0500)]
SubmittingPatches: explain rationale for using --notes with format-patch

While here, also change grammatically poor "three dash lines" to
"three-dash line".

Suggested-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoupdate-server-info: create info/* with mode 0666
Jeff King [Tue, 6 Jan 2015 03:50:49 +0000 (22:50 -0500)]
update-server-info: create info/* with mode 0666

Prior to d38379e (make update-server-info more robust, 2014-09-13),
we used a straight "fopen" to create the info/refs and
objects/info/packs files, which creates the file using mode 0666
(less the default umask).

In d38379e, we switched to creating the file with mkstemp to get a
unique filename. But mkstemp also uses the more restrictive 0600
mode to create the file. This was an unintended side effect that we
did not want, and causes problems when the repository is served by a
different user than the one running update-server-info (it is not
readable by a dumb http server running as `www`, for example).

We can fix this by using git_mkstemp_mode and specifying 0666 to
make sure that the umask is honored.

Note that we could also say "just use core.sharedrepository", as we
do call adjust_shared_perm on the result before renaming it into
place.  But that should not be necessary as long as everybody
involved is using permissive umask to allow HTTP server to read
necessary files.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoimap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY
Kyle J. McKay [Tue, 6 Jan 2015 11:20:37 +0000 (03:20 -0800)]
imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY

According to the cURL documentation for the CURLOPT_USE_SSL option,
it is only used with plain text protocols that get upgraded to SSL
using the STARTTLS command.

The server.use_ssl variable is only set when we are using a protocol
that is already SSL/TLS (i.e. imaps), so setting CURLOPT_USE_SSL
when the server.use_ssl variable is set has no effect whatsoever.

Instead, set CURLOPT_USE_SSL to CURLUSESSL_TRY when the server.use_ssl
variable is NOT set so that cURL will attempt to upgrade the plain
text connection to SSL/TLS using STARTTLS in that case.

This much more closely matches the behavior of the non-cURL code path.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoimap-send.c: support GIT_CURL_VERBOSE
Kyle J. McKay [Tue, 6 Jan 2015 11:00:55 +0000 (03:00 -0800)]
imap-send.c: support GIT_CURL_VERBOSE

When using git-imap-send to send via cURL, support setting
the GIT_CURL_VERBOSE environment variable to enable cURL's
verbose mode.

The existing http.c code already supports this and does
it by simply checking to see whether or not the environment
variable exists -- it does not examine the value at all.

For consistency, enable CURLOPT_VERBOSE when GIT_CURL_VERBOSE
is set by using the exact same test that http.c does.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agolog.c: fix translation markings
Kyle J. McKay [Tue, 6 Jan 2015 10:34:18 +0000 (02:34 -0800)]
log.c: fix translation markings

The parse_options API expects an array of alternative usage lines
to which it automatically ads the language-appropriate "or" when
displaying.  Each of these options is marked for translation with N_
and then later translated when gettext is called on each element
of the array.

Since the N_ macro just expands to its argument, if two N_-marked
strings appear next to each other without being separated by anything
else such as a comma, the preprocessor will join them into one string.

In that case two separate strings get marked for translation, but at
runtime they have been joined into a single string passed to gettext
which then fails to get translated because the combined string was
never marked for translation.

Fix this by properly separating the two N_ marked strings with
a comma and removing the embedded "\n" and "   or:" that are
properly supplied by the parse_options API.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot1301: set umask in reflog sharedrepository=group test
Jeff King [Tue, 6 Jan 2015 03:49:43 +0000 (22:49 -0500)]
t1301: set umask in reflog sharedrepository=group test

The t1301 script sets the umask globally before many of the
tests. Most of the tests that care about the umask then set
it explicitly at the start of the test. However, one test
does not, and relies on the 077 umask setting from earlier
tests. This is fragile and can break if another test is
added in between. Let's be more explicit.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agorefs: plug strbuf leak in lock_ref_sha1_basic()
René Scharfe [Wed, 24 Dec 2014 00:18:45 +0000 (01:18 +0100)]
refs: plug strbuf leak in lock_ref_sha1_basic()

Don't just reset, but release the resource held by the local
variable that is about to go out of scope.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agois_hfs_dotgit: loosen over-eager match of \u{..47}
Jeff King [Tue, 23 Dec 2014 08:45:36 +0000 (03:45 -0500)]
is_hfs_dotgit: loosen over-eager match of \u{..47}

Our is_hfs_dotgit function relies on the hackily-implemented
next_hfs_char to give us the next character that an HFS+
filename comparison would look at. It's hacky because it
doesn't implement the full case-folding table of HFS+; it
gives us just enough to see if the path matches ".git".

At the end of next_hfs_char, we use tolower() to convert our
32-bit code point to lowercase. Our tolower() implementation
only takes an 8-bit char, though; it throws away the upper
24 bits. This means we can't have any false negatives for
is_hfs_dotgit. We only care about matching 7-bit ASCII
characters in ".git", and we will correctly process 'G' or
'g'.

However, we _can_ have false positives. Because we throw
away the upper bits, code point \u{0147} (for example) will
look like 'G' and get downcased to 'g'. It's not known
whether a sequence of code points whose truncation ends up
as ".git" is meaningful in any language, but it does not
hurt to be more accurate here. We can just pass out the full
32-bit code point, and compare it manually to the upper and
lowercase characters we care about.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agobisect: add test to check that revs are properly parsed
Christian Couder [Thu, 25 Dec 2014 18:25:33 +0000 (19:25 +0100)]
bisect: add test to check that revs are properly parsed

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agobisect: parse revs before passing them to check_expected_revs()
Christian Couder [Thu, 25 Dec 2014 18:25:32 +0000 (19:25 +0100)]
bisect: parse revs before passing them to check_expected_revs()

When running for example "git bisect bad HEAD" or
"git bisect good master", the parameter passed to
"git bisect (bad|good)" has to be parsed into a
commit hash before checking if it is the expected
commit or not.

We could do that in is_expected_rev() or in
check_expected_revs(), but it is already done in
bisect_state(). Let's just store the hash values
that result from this parsing, and then reuse
them after all the parsing is done.

This way we can also use a for loop over these
values to call bisect_write() on them, instead of
using eval.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agocheckout-index: fix --temp relative path mangling
Eric Sunshine [Wed, 24 Dec 2014 09:43:16 +0000 (04:43 -0500)]
checkout-index: fix --temp relative path mangling

checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:

    mkdir a bbb &&
    >file &&
    >bbb/file &&
    git update-index --add file bbb/file &&
    cd a &&
    git checkout-index --temp ../file ../bbb/file

prints:

    .merge_file_ooblek  le
    .merge_file_igloo0  b/file

rather than the correct:

    .merge_file_ooblek  ../file
    .merge_file_igloo0  ../bbb/file

Internally, given the above example, checkout-index prefixes each input
argument with the name of the current directory ("a/", in this case),
and then assumes that it can simply skip forward by strlen("a/") bytes
to recover the original name. This works for files in the current
directory or its descendants, but fails for files in ancestors or
siblings (or their children) due to path normalization.

For instance, given "../file", "a/" is prepended, giving "a/../file".
Path normalization folds out "a/../", resulting in "file". Attempting
to recover the original name by skipping strlen("a/") bytes gives the
incorrect "le" rather than the desired "../file".

Fix this by taking advantage of write_name_quoted_relative() to recover
the original name properly, rather than assuming that it can be
recovered by skipping strlen(prefix) bytes.

As a bonus, this also fixes a bug in which checkout-index --temp
accessed and printed memory beyond the end-of-string. For instance,
within a subdirectory named "subdirectory", and given argument
"../file", prefixing would give "subdirectory/../file", which would
become "file" after normalization. checkout-index would then attempt to
recover the original name by skipping strlen("subdirectory/") bytes of
"file", which placed it well beyond end-of-string. Despite this error,
it often appeared to give the correct result, but only due to an
accident of implementation which left an apparently correct copy of the
path in memory following the normalized value. In particular, handed
"subdirectory/../file", in-place processing by normalize_path_copy_len()
resulted in "file\0rectory/../file". When checkout-index skipped
strlen("subdirectory/") bytes, it ended up back at "../file" and thus
appeared to give the correct answer, despite being past end-of-string.

Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot2004: demonstrate broken relative path printing
Eric Sunshine [Wed, 24 Dec 2014 09:43:15 +0000 (04:43 -0500)]
t2004: demonstrate broken relative path printing

checkout-index --temp only properly prints relative paths which are
descendants of the current directory. Paths in ancestor or sibling
directories (or their children) are often printed in mangled form. For
example:

    mkdir a bbb &&
    >file &&
    >bbb/file &&
    git update-index --add file bbb/file &&
    cd a &&
    git checkout-index --temp ../file ../bbb/file

prints:

    .merge_file_ooblek  le
    .merge_file_igloo0  b/file

rather than the correct:

    .merge_file_ooblek  ../file
    .merge_file_igloo0  ../bbb/file

Unfortunately, testing is complicated slightly by relative paths
sometimes _appearing_ to be printed correctly, but this is an accident
of implementation in which a "correct" copy of the string exists in
memory beyond the end of the real string, and that "correct" copy gets
printed. This test takes care to avoid the accidentally "correct"
behavior by testing with a filename longer than the directory name in
which checkout-index is invoked.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot2004: standardize file naming in symlink test
Eric Sunshine [Wed, 24 Dec 2014 09:43:14 +0000 (04:43 -0500)]
t2004: standardize file naming in symlink test

Update "symlink" test to use the common file naming scheme so that its
temporary files can be cleaned up by the "rm -f path*" idiom employed by
other tests in this script.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot2004: drop unnecessary write-tree/read-tree
Eric Sunshine [Wed, 24 Dec 2014 09:43:13 +0000 (04:43 -0500)]
t2004: drop unnecessary write-tree/read-tree

Unlike earlier tests which reference several trees prepared by "setup",
no other tests utilize the tree from the "symlink" test, so there is no
need to write it (or read it back immediately).

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot2004: modernize style
Eric Sunshine [Wed, 24 Dec 2014 09:43:12 +0000 (04:43 -0500)]
t2004: modernize style

In particular:

* indent test body
* place test description on same line as test_expect_*
* place closing quote on its own line
* name output file "actual" rather than "out"
* name setup test "setup" rather than "preparation"

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'for-junio' of git://bogomips.org/git-svn
Junio C Hamano [Mon, 29 Dec 2014 18:15:22 +0000 (10:15 -0800)]
Merge branch 'for-junio' of git://bogomips.org/git-svn

* 'for-junio' of git://bogomips.org/git-svn:
  git-svn: support for git-svn propset

6 years agopack-objects: use --objects-edge-aggressive for shallow repos
brian m. carlson [Wed, 24 Dec 2014 23:05:40 +0000 (23:05 +0000)]
pack-objects: use --objects-edge-aggressive for shallow repos

When fetching into or pushing from a shallow repository, we want to
aggressively mark edges as uninteresting, since this decreases the pack
size.  However, aggressively marking edges can negatively affect
performance on large non-shallow repositories with lots of refs.

Teach pack-objects a --shallow option to indicate that we're pushing
from or fetching into a shallow repository.  Use
--objects-edge-aggressive only for shallow repositories and otherwise
use --objects-edge, which performs better in the general case.  Update
the callers to pass the --shallow option when they are dealing with a
shallow repository.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agorev-list: add an option to mark fewer edges as uninteresting
brian m. carlson [Wed, 24 Dec 2014 23:05:39 +0000 (23:05 +0000)]
rev-list: add an option to mark fewer edges as uninteresting

In commit fbd4a70 (list-objects: mark more commits as edges in
mark_edges_uninteresting - 2013-08-16), we marked an increasing number
of edges uninteresting.  This change, and the subsequent change to make
this conditional on --objects-edge, are used by --thin to make much
smaller packs for shallow clones.

Unfortunately, they cause a significant performance regression when
pushing non-shallow clones with lots of refs (23.322 seconds vs.
4.785 seconds with 22400 refs).  Add an option to git rev-list,
--objects-edge-aggressive, that preserves this more aggressive behavior,
while leaving --objects-edge to provide more performant behavior.
Preserve the current behavior for the moment by using the aggressive
option.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agotransport: simplify duplicating a substring in transport_get() using xmemdupz()
René Scharfe [Wed, 24 Dec 2014 00:18:31 +0000 (01:18 +0100)]
transport: simplify duplicating a substring in transport_get() using xmemdupz()

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agomerge: release strbuf after use in suggest_conflicts()
René Scharfe [Wed, 24 Dec 2014 00:18:38 +0000 (01:18 +0100)]
merge: release strbuf after use in suggest_conflicts()

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agocommit-tree: simplify parsing of option -S using skip_prefix()
René Scharfe [Wed, 24 Dec 2014 00:18:11 +0000 (01:18 +0100)]
commit-tree: simplify parsing of option -S using skip_prefix()

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'jc/t9001-modernise'
Junio C Hamano [Mon, 29 Dec 2014 17:32:07 +0000 (09:32 -0800)]
Merge branch 'jc/t9001-modernise'

* jc/t9001-modernise:
  t9001: style modernisation phase #5
  t9001: style modernisation phase #4
  t9001: style modernisation phase #3
  t9001: style modernisation phase #2
  t9001: style modernisation phase #1

6 years agoMerge branch 'mh/update-ref-verify'
Junio C Hamano [Mon, 29 Dec 2014 17:30:55 +0000 (09:30 -0800)]
Merge branch 'mh/update-ref-verify'

"git update-ref --stdin"'s verify command did not work well when
<oldvalue>, which is documented as optional, was missing.

* mh/update-ref-verify:
  update-ref: fix "verify" command with missing <oldvalue>
  t1400: add some more tests of "update-ref --stdin"'s verify command

6 years agoAdd a regression test for 'git remote add <existing> <same-url>'
Johannes Schindelin [Tue, 23 Dec 2014 13:25:09 +0000 (14:25 +0100)]
Add a regression test for 'git remote add <existing> <same-url>'

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agogit remote: allow adding remotes agreeing with url.<...>.insteadOf
Johannes Schindelin [Tue, 23 Dec 2014 13:25:05 +0000 (14:25 +0100)]
git remote: allow adding remotes agreeing with url.<...>.insteadOf

When adding a remote, we make sure that the remote does not exist
already. However, this test was not quite correct: when the
url.<...>.insteadOf config variable was set to the remote name to be
added, the code would assume that the remote exists already.

Let's allow adding remotes when there is a url.<...>.insteadOf setting
when both the name and the URL agree with the remote to be added.

It might seem like a mistake to compare against remote->url[0] without
verifying that remote->url_nr >=1, but at this point a missing URL has
been filled by the name already, therefore url_nr cannot be zero.

Noticed by Anastas Dancha.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agot0090: tweak awk statement for Solaris /usr/xpg4/bin/awk
Ben Walton [Mon, 22 Dec 2014 23:25:44 +0000 (15:25 -0800)]
t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk

The awk statements previously used in this test weren't compatible
with the native versions of awk on Solaris:

    echo "dir" | /bin/awk -v c=0 '$1 {++c} END {print c}'
    awk: syntax error near line 1
    awk: bailing out near line 1

    echo "dir" | /usr/xpg4/bin/awk -v c=0 '$1 {++c} END {print c}'
    0

Even though we do not cater to tools in /usr/bin on Solaris that
have and are overridden by corresponding ones in /usr/xpg?/bin,
in this case, even the XPG version does not work correctly.

With GNU awk for comparison:

    echo "dir" | /opt/csw/gnu/awk -v c=0 '$1 {++c} END {print c}'
    1

which is what this test expects (and is in line with POSIX; non-empty
string is true and an empty string is false).

Work this issue around by using $1 != "" to state more explicitly
that we are skipping empty lines.

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ben Walton <bdwalton@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoSync with maint
Junio C Hamano [Mon, 22 Dec 2014 20:43:48 +0000 (12:43 -0800)]
Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoThird batch for 2.3 cycle
Junio C Hamano [Mon, 22 Dec 2014 20:43:16 +0000 (12:43 -0800)]
Third batch for 2.3 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years agoMerge branch 'rs/use-strbuf-complete-line'
Junio C Hamano [Mon, 22 Dec 2014 20:28:22 +0000 (12:28 -0800)]
Merge branch 'rs/use-strbuf-complete-line'

* rs/use-strbuf-complete-line:
  use strbuf_complete_line() for adding a newline if needed

6 years agoMerge branch 'jg/prompt-localize-temporary'
Junio C Hamano [Mon, 22 Dec 2014 20:28:20 +0000 (12:28 -0800)]
Merge branch 'jg/prompt-localize-temporary'

"git-prompt" (in contrib/) used a variable from the global scope,
possibly contaminating end-user's namespace.

* jg/prompt-localize-temporary:
  git-prompt.sh: make $f local to __git_eread()

6 years agoMerge branch 'ch/new-gpg-drops-rfc-1991'
Junio C Hamano [Mon, 22 Dec 2014 20:28:16 +0000 (12:28 -0800)]
Merge branch 'ch/new-gpg-drops-rfc-1991'

Recent GPG changes the keyring format and drops support for RFC1991
formatted signatures, breaking our existing tests.

* ch/new-gpg-drops-rfc-1991:
  tests: make comment on GPG keyring match the code
  tests: squelch noise from GPG machinery set-up
  tests: replace binary GPG keyrings with ASCII-armored keys
  tests: skip RFC1991 tests for gnupg 2.1
  tests: create gpg homedir on the fly

6 years agoMerge branch 'jk/commit-date-approxidate'
Junio C Hamano [Mon, 22 Dec 2014 20:28:14 +0000 (12:28 -0800)]
Merge branch 'jk/commit-date-approxidate'

Recent update to "git commit" broke amending an existing commit
with bogus author/committer lines without a valid e-mail address.

* jk/commit-date-approxidate:
  commit: always populate GIT_AUTHOR_* variables
  commit: loosen ident checks when generating template

6 years agoMerge branch 'nd/split-index'
Junio C Hamano [Mon, 22 Dec 2014 20:28:11 +0000 (12:28 -0800)]
Merge branch 'nd/split-index'

A typofix to the documentation of a feature already in the release.

* nd/split-index:
  index-format.txt: add a missing closing quote

6 years agoMerge branch 'jk/test-asan'
Junio C Hamano [Mon, 22 Dec 2014 20:28:08 +0000 (12:28 -0800)]
Merge branch 'jk/test-asan'

* jk/test-asan:
  t: support clang/gcc AddressSanitizer

6 years agoMerge branch 'ok/rebase-i-count-todo'
Junio C Hamano [Mon, 22 Dec 2014 20:28:06 +0000 (12:28 -0800)]
Merge branch 'ok/rebase-i-count-todo'

* ok/rebase-i-count-todo:
  Show number of TODO items for interactive rebase

6 years agoMerge branch 'jk/read-packed-refs-without-path-max'
Junio C Hamano [Mon, 22 Dec 2014 20:28:04 +0000 (12:28 -0800)]
Merge branch 'jk/read-packed-refs-without-path-max'

Git did not correctly read an overlong refname from a packed refs
file.

* jk/read-packed-refs-without-path-max:
  read_packed_refs: use skip_prefix instead of static array
  read_packed_refs: pass strbuf to parse_ref_line
  read_packed_refs: use a strbuf for reading lines

6 years agoMerge branch 'jk/always-allow-large-packets'
Junio C Hamano [Mon, 22 Dec 2014 20:28:02 +0000 (12:28 -0800)]
Merge branch 'jk/always-allow-large-packets'

"git push" and "git fetch" did not communicate an overlong refname
correctly.

* jk/always-allow-large-packets:
  pkt-line: allow writing of LARGE_PACKET_MAX buffers

6 years agoMerge branch 'jk/colors'
Junio C Hamano [Mon, 22 Dec 2014 20:27:58 +0000 (12:27 -0800)]
Merge branch 'jk/colors'

"diff-highlight" filter (in contrib/) allows its color output
to be customized via configuration variables.

* jk/colors:
  parse_color: drop COLOR_BACKGROUND macro
  diff-highlight: allow configurable colors
  parse_color: recognize "no$foo" to clear the $foo attribute
  parse_color: support 24-bit RGB values
  parse_color: refactor color storage

6 years agoMerge branch 'rw/apply-does-not-take-ignore-date'
Junio C Hamano [Mon, 22 Dec 2014 20:27:51 +0000 (12:27 -0800)]
Merge branch 'rw/apply-does-not-take-ignore-date'

* rw/apply-does-not-take-ignore-date:
  git-am.txt: --ignore-date flag is not passed to git-apply

6 years agoMerge branch 'js/test-hashmap-squelch-gcc'
Junio C Hamano [Mon, 22 Dec 2014 20:27:46 +0000 (12:27 -0800)]
Merge branch 'js/test-hashmap-squelch-gcc'

* js/test-hashmap-squelch-gcc:
  test-hashmap: squelch gcc compiler warning

6 years agoMerge branch 'js/fsck-tag-validation'
Junio C Hamano [Mon, 22 Dec 2014 20:27:41 +0000 (12:27 -0800)]
Merge branch 'js/fsck-tag-validation'

New tag object format validation added in 2.2 showed garbage
after a tagname it reported in its error message.

* js/fsck-tag-validation:
  index-pack: terminate object buffers with NUL
  fsck: properly bound "invalid tag name" error message

6 years agoMerge branch 'po/doc-assume-unchanged'
Junio C Hamano [Mon, 22 Dec 2014 20:27:38 +0000 (12:27 -0800)]
Merge branch 'po/doc-assume-unchanged'

Fixes long-standing misunderstanding of what assume-unchanged is
about.  Some text near what is removed by the bottom patch may also
have to be removed.

* po/doc-assume-unchanged:
  gitignore.txt: do not suggest assume-unchanged
  doc: make clear --assume-unchanged's user contract

6 years agoMerge branch 'mg/branch-d-m-f'
Junio C Hamano [Mon, 22 Dec 2014 20:27:36 +0000 (12:27 -0800)]
Merge branch 'mg/branch-d-m-f'

"git branch -d" (delete) and "git branch -m" (move) learned to
honor "-f" (force) flag; unlike many other subcommands, the way to
force these have been with separate "-D/-M" options, which was
inconsistent.

* mg/branch-d-m-f:
  branch: allow -f with -m and -d
  t3200-branch: test -M

6 years agoMerge branch 'tb/t0027-eol-conversion'
Junio C Hamano [Mon, 22 Dec 2014 20:27:34 +0000 (12:27 -0800)]
Merge branch 'tb/t0027-eol-conversion'

* tb/t0027-eol-conversion:
  t0027: check the eol conversion warnings

6 years agoMerge branch 'jk/for-each-reflog-ent-reverse'
Junio C Hamano [Mon, 22 Dec 2014 20:27:32 +0000 (12:27 -0800)]
Merge branch 'jk/for-each-reflog-ent-reverse'

The code that reads the reflog from the newer to the older entries
did not handle an entry that crosses a boundary of block it uses to
read them correctly.

* jk/for-each-reflog-ent-reverse:
  for_each_reflog_ent_reverse: turn leftover check into assertion
  for_each_reflog_ent_reverse: fix newlines on block boundaries

6 years agoMerge branch 'sb/string-list'
Junio C Hamano [Mon, 22 Dec 2014 20:27:29 +0000 (12:27 -0800)]
Merge branch 'sb/string-list'

API simplification.

* sb/string-list:
  string_list: remove string_list_insert_at_index() from its API
  mailmap: use higher level string list functions
  string_list: document string_list_(insert,lookup)

6 years agoMerge branch 'sv/doc-stripspace'
Junio C Hamano [Mon, 22 Dec 2014 20:27:27 +0000 (12:27 -0800)]
Merge branch 'sv/doc-stripspace'

* sv/doc-stripspace:
  Documentation/git-stripspace: add synopsis for --comment-lines

6 years agoMerge branch 'rt/completion-tag'
Junio C Hamano [Mon, 22 Dec 2014 20:27:24 +0000 (12:27 -0800)]
Merge branch 'rt/completion-tag'

* rt/completion-tag:
  completion: add git-tag options

6 years agoMerge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
Junio C Hamano [Mon, 22 Dec 2014 20:27:22 +0000 (12:27 -0800)]
Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'

* mg/doc-check-ignore-tracked-are-not-ignored:
  check-ignore: clarify treatment of tracked files

6 years agoMerge branch 'jk/credential-quit'
Junio C Hamano [Mon, 22 Dec 2014 20:27:19 +0000 (12:27 -0800)]
Merge branch 'jk/credential-quit'

Credential helpers are asked in turn until one of them give
positive response, which is cumbersome to turn off when you need to
run Git in an automated setting.  The credential helper interface
learned to allow a helper to say "stop, don't ask other helpers."
Also GIT_TERMINAL_PROMPT environment can be set to false to disable
our built-in prompt mechanism for passwords.

* jk/credential-quit:
  prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
  credential: let helpers tell us to quit

6 years agoMerge branch 'dm/compat-s-ifmt-for-zos'
Junio C Hamano [Mon, 22 Dec 2014 20:27:16 +0000 (12:27 -0800)]
Merge branch 'dm/compat-s-ifmt-for-zos'

Long overdue departure from the assumption that S_IFMT is shared by
everybody made in 2005.

* dm/compat-s-ifmt-for-zos:
  compat: convert modes to use portable file type values

6 years agoMerge branch 'ps/new-workdir-into-empty-directory'
Junio C Hamano [Mon, 22 Dec 2014 20:27:13 +0000 (12:27 -0800)]
Merge branch 'ps/new-workdir-into-empty-directory'

"git new-workdir" (in contrib/) can be used to populate an empty
and existing directory now.

* ps/new-workdir-into-empty-directory:
  git-new-workdir: don't fail if the target directory is empty