delta/git.git, branch ah/doc-gitattributes-empty-index github.com: git/git.git doc: do not use `rm .git/index` when normalizing line endings 2017-06-15T17:55:47+00:00 Andreas Heiduk asheiduk@gmail.com 2017-06-14T06:51:39+00:00 773a88914f7b951cb33b27b12b4b715b66451a07 When illustrating how to normalize the line endings, the documentation in gitattributes tells the user to `rm .git/index`. This is incorrect for two reasons: - Users shouldn't be instructed to mess around with the internal implementation of Git using raw file system tools like `rm`. - Within a submodule or an additional working tree `.git` is just a file containing a `gitdir: <path>` pointer into the real `.git` directory. Therefore `rm .git/index` does not work. The purpose of the `rm .git/index` instruction is to remove all entries from the index without touching the working tree. The way to do this with Git is to use `read-tree --empty`. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
When illustrating how to normalize the line endings, the
documentation in gitattributes tells the user to `rm .git/index`.

This is incorrect for two reasons:

 - Users shouldn't be instructed to mess around with the internal
   implementation of Git using raw file system tools like `rm`.

 - Within a submodule or an additional working tree `.git` is just a
   file containing a `gitdir: <path>` pointer into the real `.git`
   directory.  Therefore `rm .git/index` does not work.

The purpose of the `rm .git/index` instruction is to remove all entries
from the index without touching the working tree.  The way to do this
with Git is to use `read-tree --empty`.

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Prepare for 2.13.2 2017-06-13T20:30:16+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:30:16+00:00 fd99e2bda0ca6a361ef03c04d6d7fdc7a9c40b78 Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ad/pull-remote-doc' into maint 2017-06-13T20:27:06+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:27:06+00:00 603d52d3cc2264f04a6f17ec67654f1a60793087 Docfix. * ad/pull-remote-doc: docs: fix formatting and grammar 
Docfix.

* ad/pull-remote-doc:
  docs: fix formatting and grammar
Merge branch 'jk/drop-free-refspecs' into maint 2017-06-13T20:27:06+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:27:06+00:00 9451a7b629478790ad621d41b3f12ab8aa9097cc Code clean-up. * jk/drop-free-refspecs: remote: drop free_refspecs() function 
Code clean-up.

* jk/drop-free-refspecs:
  remote: drop free_refspecs() function
Merge branch 'jk/connect-symref-info-leak-fix' into maint 2017-06-13T20:27:05+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:27:05+00:00 87d4fdd9805edfe582bcbe92da638bb7eeb1725d Leakfix. * jk/connect-symref-info-leak-fix: connect.c: fix leak in parse_one_symref_info() 
Leakfix.

* jk/connect-symref-info-leak-fix:
  connect.c: fix leak in parse_one_symref_info()
Merge branch 'rf/completion-config-commit' into maint 2017-06-13T20:27:05+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:27:05+00:00 e0538abaf7ad330ab639f418e9de82ef8adbe5bb Completion update. * rf/completion-config-commit: completion: add completions for git config commit 
Completion update.

* rf/completion-config-commit:
  completion: add completions for git config commit
Merge branch 'ab/t3070-test-dedup' into maint 2017-06-13T20:27:04+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:27:04+00:00 cbbe1c87130f066692253fc9cd87b6f65f31e2dc Test cleanup. * ab/t3070-test-dedup: wildmatch test: remove redundant duplicate test 
Test cleanup.

* ab/t3070-test-dedup:
  wildmatch test: remove redundant duplicate test
Merge branch 'jh/memihash-opt' into maint 2017-06-13T20:27:04+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:27:03+00:00 a4478c9c0319a1d32dc8af76366ef8d855c16ff9 perf-test update. * jh/memihash-opt: p0004: don't error out if test repo is too small p0004: don't abort if multi-threaded is too slow p0004: use test_perf p0004: avoid using pipes p0004: simplify calls of test-lazy-init-name-hash 
perf-test update.

* jh/memihash-opt:
  p0004: don't error out if test repo is too small
  p0004: don't abort if multi-threaded is too slow
  p0004: use test_perf
  p0004: avoid using pipes
  p0004: simplify calls of test-lazy-init-name-hash
Merge branch 'tb/pull-ff-rebase-autostash' into maint 2017-06-13T20:27:03+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:27:03+00:00 9e60e21e53a6a8be899f9834955017e0ff6e6906 "git pull --rebase --autostash" didn't auto-stash when the local history fast-forwards to the upstream. * tb/pull-ff-rebase-autostash: pull: ff --rebase --autostash works in dirty repo 
"git pull --rebase --autostash" didn't auto-stash when the local history
fast-forwards to the upstream.

* tb/pull-ff-rebase-autostash:
  pull: ff --rebase --autostash works in dirty repo
Merge branch 'jh/close-index-before-stat' into maint 2017-06-13T20:27:02+00:00 Junio C Hamano gitster@pobox.com 2017-06-13T20:27:02+00:00 f24e079cb6ecaa217e593c2d2620187044ba1b0d The timestamp of the index file is now taken after the file is closed, to help Windows, on which a stale timestamp is reported by fstat() on a file that is opened for writing and data was written but not yet closed. * jh/close-index-before-stat: read-cache: close index.lock in do_write_index 
The timestamp of the index file is now taken after the file is
closed, to help Windows, on which a stale timestamp is reported by
fstat() on a file that is opened for writing and data was written
but not yet closed.

* jh/close-index-before-stat:
  read-cache: close index.lock in do_write_index