delta/git.git, branch mk/submodule-gitdir-path

path: implement common_dir handling in git_pathdup_submodule()

2015-09-14T18:03:46+00:00

When submodule is a linked worktree, "git diff --submodule" and other
calls which directly access the submodule's object database do not correctly
calculate its path. Fix it by changing the git_pathdup_submodule() behavior,
to use either common or per-worktree directory.

Do it similarly as for parent repository, but ignore the GIT_COMMON_DIR
environment variable, because it would mean common directory for the parent
repository and does not make sense for submodule.

Also add test for functionality which uses this call.

Signed-off-by: Max Kirillov 
Signed-off-by: Junio C Hamano

submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()

2015-09-14T18:03:46+00:00

Functions which directly operate submodule's object database do not
handle the case when the submodule is linked worktree (which are
introduced in c7b3a3d2fe). Instead of fixing the path calculation use
already existing strbuf_git_path_submodule() function without changing
overall behaviour. Then it will be possible to modify only that function
whenever we need to change real location of submodule's repository
content.

Helped-by: Jeff King 
Signed-off-by: Max Kirillov 
Signed-off-by: Junio C Hamano

Git 2.6-rc0

2015-09-02T19:55:28+00:00

Signed-off-by: Junio C Hamano

Merge branch 'cc/trailers-corner-case-fix'

2015-09-02T19:50:21+00:00

The "interpret-trailers" helper mistook a multi-paragraph title of
a commit log message with a colon in it as the end of the trailer
block.

* cc/trailers-corner-case-fix:
  trailer: support multiline title

Merge branch 'sb/read-cache-one-indent-style-fix'

2015-09-02T19:50:18+00:00

* sb/read-cache-one-indent-style-fix:
  read-cache: fix indentation in read_index_from

Merge branch 'ee/clean-test-fixes'

2015-09-02T19:50:16+00:00

* ee/clean-test-fixes:
  t7300: fix broken && chains

Merge branch 'jk/log-missing-default-HEAD'

2015-09-02T19:50:10+00:00

"git init empty && git -C empty log" said "bad default revision 'HEAD'",
which was found to be a bit confusing to new users.

* jk/log-missing-default-HEAD:
  log: diagnose empty HEAD more clearly

Ninth batch for 2.6

2015-09-01T23:31:58+00:00

Signed-off-by: Junio C Hamano

Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update'

2015-09-01T23:31:29+00:00

When re-priming the cache-tree opportunistically while committing
the in-core index as-is, we mistakenly invalidated the in-core
index too aggressively, causing the experimental split-index code
to unnecessarily rewrite the on-disk index file(s).

* dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update:
  commit: don't rewrite shared index unnecessarily

Merge branch 'rt/remove-hold-lockfile-for-append'

2015-09-01T23:31:27+00:00

* rt/remove-hold-lockfile-for-append:
  lockfile: remove function "hold_lock_file_for_append"