Re: [PATCH] commit: ignore assume-unchanged files in commmit file mode

On Sex, 2014-12-05 at 17:56 +0700, Nguyễn Thái Ngọc Duy wrote: In the same spirit of 7fce6e3 (commit: correctly respect skip-worktree bit - 2009-12-14), if a file is marked unchanged, skip it. Noticed-by: Sérgio Basto ser...@serjux.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com

Re: fast-import should not care about core.ignorecase

Jonathan Nieder wrote on 12/8/2014 6:31 PM: Joshua Jensen wrote: I think it has been discussed before, but maybe Git needs a core.casefold in addition to core.ignorecase.) Would it work for --casefold to be a commandline flag to fast-import, instead of a global option affecting multiple Git

Re: [PATCH v2] doc: make clear --assume-unchanged's user contract

On Sáb, 2014-12-06 at 15:04 +, Philip Oakley wrote: Many users misunderstand the --assume-unchanged contract, believing it means Git won't look at the flagged file. Be explicit that the --assume-unchanged contract is by the user that they will NOT change the file so that Git does not

[PATCH v3 0/3] Multiple worktrees vs. submodules fixes

After discussions I came to basically same as v1. * Resubmitting the 2 patches which have not been taken to worktrees reroll - they fix visible issue. Mostly unchanged except small cleanup in test. * Added GIT_COMMON_DIR to local_repo_env. While it is obviously a right thing, I wasn't able to

[PATCH v3 2/3] path: implement common_dir handling in git_path_submodule()

This allows making submodules a linked workdirs. Same as for .git, but ignores 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:

[PATCH v3 3/3] Add GIT_COMMON_DIR to local_repo_env

This is obviously right thing to do, because submodule repository does not use common directory of super repository. Suggested-by: Jens Lehmann jens.lehm...@web.de Signed-off-by: Max Kirillov m...@max630.net --- environment.c | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.c

[PATCH v3 1/3] submodule refactor: use git_path_submodule() in add_submodule_odb()

Signed-off-by: Max Kirillov m...@max630.net --- submodule.c | 28 ++-- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/submodule.c b/submodule.c index 34094f5..4aad3d4 100644 --- a/submodule.c +++ b/submodule.c @@ -122,43 +122,35 @@ void

Re: [PATCH v3 0/3] Multiple worktrees vs. submodules fixes

On Tue, Dec 09, 2014 at 06:44:40AM +0200, Max Kirillov wrote: After discussions I came to basically same as v1. * Resubmitting the 2 patches which have not been taken to worktrees reroll - they fix visible issue. Mostly unchanged except small cleanup in test. * Added GIT_COMMON_DIR to

<    1   2