RE: Git feature request: Option to force Git to abort a checkout if working directory is dirty (i.e. disregarding the check for conflicts)

2014-03-29 Thread Jonas Bang
Thanks for your feedback, Junio, I have added more details and tried to simplify the request. Jonas Bang em...@jonasbang.dk writes: Hi Git developers, This is my first Git feature request, I hope it won’t get me hanged on the gallows ;o) *Git feature request:* Add an option to

[PATCH 2/2] Don't rely on strerror text when testing rmdir failure

2014-03-29 Thread Charles Bailey
AIX doesn't make a distiction between EEXIST and ENOTEMPTY so relying on the strerror string for the rmdir failure is fragile. Just test that the start of the string matches the Git controlled failed to rmdir... error. The exact text of the OS generated error string isn't important to the test.

[PATCH 1/2] Remove inline from git_fnmatch in dir.c

2014-03-29 Thread Charles Bailey
Now that it calls a static inline function, it cannot be an inline definition with external linkage. Remove inline and make it an external definition. Signed-off-by: Charles Bailey cbaile...@bloomberg.net --- dir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dir.c

AIX fixes

2014-03-29 Thread Charles Bailey
[PATCH 1/2] Remove inline from git_fnmatch in dir.c There are currently a few issues with building on AIX. These two patches address two of them. The first removes 'inline' from a function in dir.c. The function has grown such that I don't really see a benefit in explicitly encouraging the

Re: [PATCH 2/2] Don't rely on strerror text when testing rmdir failure

2014-03-29 Thread Jens Lehmann
Am 29.03.2014 16:39, schrieb Charles Bailey: AIX doesn't make a distiction between EEXIST and ENOTEMPTY so relying on the strerror string for the rmdir failure is fragile. Just test that the start of the string matches the Git controlled failed to rmdir... error. The exact text of the OS

Re: [PATCH 2/2] Don't rely on strerror text when testing rmdir failure

2014-03-29 Thread Charles Bailey
On Sat, Mar 29, 2014 at 04:48:44PM +0100, Jens Lehmann wrote: Am 29.03.2014 16:39, schrieb Charles Bailey: diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 3d30581..23eed17 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -709,10 +709,9 @@ test_expect_success 'checking out a commit

[PATCH v2] MSVC: fix t0040-parse-options crash

2014-03-29 Thread Marat Radchenko
On 64-bit MSVC, pointers are 64 bit but `long` is only 32. Thus, casting string to `unsigned long`, which is redundand on other platforms, throws away important bits and when later cast to `intptr_t` results in corrupt pointer. This patch fixes test-parse-options by simply removing harming cast.

[PATCH v3] MSVC: fix t0040-parse-options crash

2014-03-29 Thread Marat Radchenko
On 64-bit MSVC, pointers are 64 bit but `long` is only 32. Thus, casting string to `unsigned long`, which is redundand on other platforms, throws away important bits and when later cast to `intptr_t` results in corrupt pointer. This patch fixes test-parse-options by replacing harming cast with

Re: [PATCH v3] MSVC: fix t0040-parse-options crash

2014-03-29 Thread Andreas Schwab
Marat Radchenko ma...@slonopotamus.org writes: diff --git a/test-parse-options.c b/test-parse-options.c index 434e8b8..6f6c656 100644 --- a/test-parse-options.c +++ b/test-parse-options.c @@ -60,7 +60,7 @@ int main(int argc, char **argv) OPT_STRING('o', NULL, string, str, get

Re: [PATCH v3] MSVC: fix t0040-parse-options crash

2014-03-29 Thread René Scharfe
Am 29.03.2014 22:34, schrieb Andreas Schwab: Marat Radchenko ma...@slonopotamus.org writes: diff --git a/test-parse-options.c b/test-parse-options.c index 434e8b8..6f6c656 100644 --- a/test-parse-options.c +++ b/test-parse-options.c @@ -60,7 +60,7 @@ int main(int argc, char **argv)

Re: git commit vs. ignore-submodules

2014-03-29 Thread Ronald Weiss
On Fri, Mar 28, 2014 at 5:47 PM, Jens Lehmann jens.lehm...@web.de wrote: Such a patch would be very much appreciated. You might want to look into other commands that already have the --ignore-submodules option to get an idea how to do that. cmd_status() in builtin/commit.c should be a good

[PATCH 2/2] status: don't ignore submodules added to index

2014-03-29 Thread Ronald Weiss
Submodules explicitly added to index by user should be never hidden in status output. This also fixes a bug in commit, where submodules with configured ignore setting (in .gitmodules or .git/config), added to index by user, are not displayed in the commit message as being commited, but they still

[PATCH 3/4] Fix misuses of nor in comments. (v3)

2014-03-29 Thread Justin Lebar
This version applies successfully to master, maint, next, and pu. The other patches in the previous version of this queue apply successfully without any changes. Signed-off-by: Justin Lebar jle...@google.com --- Makefile| 2 +- builtin/apply.c

Re: [PATCH 1/2] commit: add --ignore-submodules[=when] parameter

2014-03-29 Thread Jens Lehmann
Am 29.03.2014 23:50, schrieb Ronald Weiss: Git commit honors the 'ignore' setting from .gitmodules or .git/config, but didn't allow to override it from command line, like other commands do. Useful when values for commit are 'all' (default) or 'none'. The others ('dirty' and 'untracked') have

Re: [PATCH 2/2] status: don't ignore submodules added to index

2014-03-29 Thread Jens Lehmann
Am 29.03.2014 23:56, schrieb Ronald Weiss: Submodules explicitly added to index by user should be never hidden in status output. This also fixes a bug in commit, where submodules with configured ignore setting (in .gitmodules or .git/config), added to index by user, are not displayed in the

Re: [PATCH 099/144] t9101-git-svn-props.sh: use the $( ... ) construct for command substitution

2014-03-29 Thread Eric Wong
Elia Pinto gitter.spi...@gmail.com wrote: The Git CodingGuidelines prefer the $( ... ) construct for command substitution instead of using the back-quotes, or grave accents (`..`). I did not check very closely, but for the git-svn tests: Acked-by: Eric Wong normalper...@yhbt.net Thanks. -- To

Re: [PATCH 2/2] status: don't ignore submodules added to index

2014-03-29 Thread Ronald Weiss
On 30. 3. 2014 0:40, Ronald Weiss wrote: That change was really too aggresive, the one below seems better, all tests pass with it, and it still works. Oops, some tests still fail, sorry for my blindness. Nevermind, I'm looking forward to Your fix. -- To unsubscribe from this list: send the

Re: [PATCH v3] MSVC: fix t0040-parse-options crash

2014-03-29 Thread Junio C Hamano
Marat Radchenko ma...@slonopotamus.org writes: On 64-bit MSVC, pointers are 64 bit but `long` is only 32. Thus, casting string to `unsigned long`, which is redundand on other platforms, throws away important bits and when later cast to `intptr_t` results in corrupt pointer. This patch fixes

Re: What's cooking in git.git (Mar 2014, #07; Fri, 28)

2014-03-29 Thread Duy Nguyen
On Sat, Mar 29, 2014 at 5:21 AM, Junio C Hamano gits...@pobox.com wrote: * nd/gc-aggressive (2014-03-17) 4 commits - gc --aggressive: three phase repacking - gc --aggressive: make --depth configurable - pack-objects: support --keep - environment.c: fix constness for odb_pack_keep() Using