[PATCH jk/checkout-attribute-lookup] t2003: work around path mangling issue on Windows

2013-03-20 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org MSYS bash considers the part /g in the sed expression s/./=/g as an absolute path after an assignment, and mangles it to a C:/something string. Do not attract bash's attention by avoiding the equals sign. Signed-off-by: Johannes Sixt j...@kdbg.org --- t/t2003

Re: [PATCH v3 3/4] t7800: modernize tests

2013-03-20 Thread Johannes Sixt
Am 2/21/2013 5:03, schrieb David Aguilar: test_expect_success PERL 'difftool -d' ' - diff=$(git difftool -d --extcmd ls branch) - echo $diff | stdin_contains sub - echo $diff | stdin_contains file + git difftool -d --extcmd ls branch output + stdin_contains sub output

Re: [PATCH jk/pkt-line-cleanup] t5700-clone-reference: send trace to fd 2, not 3, to please Windows git

2013-03-20 Thread Johannes Sixt
Am 3/20/2013 10:33, schrieb Jeff King: On Wed, Mar 20, 2013 at 09:24:44AM +0100, Johannes Sixt wrote: From: Johannes Sixt j...@kdbg.org Two tests use GIT_TRACE=3 to dump debugging information of git. On Windows, however, bash is unable to set up file descriptor 3 correctly for its child

Re: [PATCH] Allow combined diff to ignore white-spaces

2013-03-14 Thread Johannes Sixt
Am 3/13/2013 22:21, schrieb Antoine Pelisse: Currently, it's not possible to use the space-ignoring options (-b, -w, --ignore-space-at-eol) with combined diff. It makes it pretty impossible to read a merge between a branch that changed all tabs to spaces, and a branch with functional changes.

Re: What I want rebase to do

2013-03-07 Thread Johannes Sixt
Am 3/7/2013 9:48, schrieb Thomas Rast: wor...@alum.mit.edu (Dale R. Worley) writes: [...snip...] Isn't that just a very long-winded way of restating what Junio said earlier: It was suggested to make it apply the first-parent diff and record the result, I think. If that were an

Re: [PATCH 2/3] git p4 test: should honor symlink in p4 client root

2013-03-07 Thread Johannes Sixt
Am 3/8/2013 0:19, schrieb Pete Wyckoff: +# When the p4 client Root is a symlink, make sure chdir() does not use +# getcwd() to convert it to a physical path. +test_expect_failure 'p4 client root symlink should stay symbolic' ' + physical=$TRASH_DIRECTORY/physical +

Re: [PATCH] setup: suppress implicit . work-tree for bare repos

2013-03-07 Thread Johannes Sixt
Am 3/8/2013 8:15, schrieb Jeff King: --- a/cache.h +++ b/cache.h @@ -344,6 +344,7 @@ static inline enum object_type object_type(unsigned int mode) #define GIT_DIR_ENVIRONMENT GIT_DIR #define GIT_NAMESPACE_ENVIRONMENT GIT_NAMESPACE #define GIT_WORK_TREE_ENVIRONMENT GIT_WORK_TREE

Re: [PATCH] help: show manpage for aliased command on git alias --help

2013-03-05 Thread Johannes Sixt
Am 3/5/2013 15:44, schrieb Ævar Arnfjörð Bjarmason: Change the semantics of git alias --help to show the help for the command alias is aliased to, instead of just saying: `git alias' is aliased to `whatever' E.g. if you have checkout aliased to co you won't get: $ git co --help

Re: [msysGit] Re: [PATCH 0/5] Fix msvc build

2013-02-26 Thread Johannes Sixt
Am 25.02.2013 20:01, schrieb Johannes Schindelin: Can you please send a pull request on GitHub? It's not github, but hopefully useful for you: The following changes since commit bcd45b4085f9269a536c8fb1963ac8380bfac0e8: Update draft release notes to 1.8.2 (2013-02-01 12:52:08 -0800) are

Re: [PATCH] Improve QNX support in GIT

2013-02-26 Thread Johannes Sixt
Am 26.02.2013 21:32, schrieb Mike Gorchak: If I remove the call to pthread_create, it doesn't output anything and exits successfully. I see. Most resource managers use procmgr_daemon(), which has no such limitation. Anyway, as far as I can see current git sources do not use fork together

Re: clean/smudge filters on .zip/.tgz files

2013-02-26 Thread Johannes Sixt
Am 2/26/2013 23:38, schrieb Tim Chase: Various programs that I use ([Open|Libre]Office, Vym, etc) use a zipped/.tgz'ed file format, usually containing multiple (usually) plain-text files within. I'm trying to figure out a way for git to treat these as virtual directories for purposes of

Re: [PATCH 0/5] Fix msvc build

2013-02-25 Thread Johannes Sixt
attempt to run the test suite). More importantly, I'm using git on Windows (MinGW flavor) with these patches in production, so there are no obvious regressions. Feel free to add my Tested-by: Johannes Sixt j...@kdbg.org but if you don't have the patches around, I can resend them. -- Hannes

[PATCH ] t4210-log-i18n: spell encoding name UTF-8 correctly

2013-02-25 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org iconv on Windows does not know the encoding name utf8, and does not re-encode log messages when this name is given. Request UTF-8 encoding. Signed-off-by: Johannes Sixt j...@kdbg.org --- I'm not sure whether I'm right to say that UTF-8 is the correct spelling

Re: [PATCH ] t4210-log-i18n: spell encoding name UTF-8 correctly

2013-02-25 Thread Johannes Sixt
Am 2/25/2013 21:31, schrieb Jeff King: Subject: [PATCH] utf8: accept alternate spellings of UTF-8 ... JSixt, can you double-check that this passes t4210 for you? Yes, t4210 and all other *i18n* and *log* tests pass with this patch. Thanks, -- Hannes utf8.c | 20 ++-- 1

Re: [PATCH] Documentation: filter-branch env-filter example

2013-02-13 Thread Johannes Sixt
Am 2/13/2013 20:47, schrieb Tade: filter-branch --env-filter example that shows how to change the email address in all commits by a certain developer. --- You should sign off your patch. Use a full real name, please. Documentation/git-filter-branch.txt | 13 + 1 file changed,

Re: How to diff 2 file revisions with gitk

2013-02-06 Thread Johannes Sixt
Am 06.02.2013 16:57, schrieb R. Diez: I would like to start gitk, select with the mouse 2 revisions of some file and then compare them, hopefully with an external diff tool, very much like I am used to with WinCVS. The closest I got is to start gitk with a filename as an argument, in

Re: [PATCH 1/4] mergetool--lib: Simplify command expressions

2013-01-27 Thread Johannes Sixt
Am 27.01.2013 22:24, schrieb David Aguilar: Use $(command $arg) instead of $(command $arg) as the latter is harder to read. If at all, you should restrict yourself to simplify only variable assignments. Because this case: - if test -z $(get_merge_tool_cmd $merge_tool) + if test -z

Re: [PATCH 3/4] mergetool--lib: Add functions for finding available tools

2013-01-27 Thread Johannes Sixt
Am 27.01.2013 22:24, schrieb David Aguilar: Refactor show_tool_help() so that the tool-finding logic is broken out into separate functions. Signed-off-by: David Aguilar dav...@gmail.com --- git-mergetool--lib.sh | 60 +-- 1 file changed,

Re: [PATCH v3] Enable minimal stat checking

2013-01-22 Thread Johannes Sixt
Am 1/22/2013 8:49, schrieb Robin Rosenberg: Specifically the fields uid, gid, ctime, ino and dev are set to zero by JGit. Other implementations, eg. Git in cygwin are allegedly also somewhat incompatible with Git For Windows and on *nix platforms the resolution of the timestamps may differ.

Re: [BUG] Bug in git stash

2013-01-14 Thread Johannes Sixt
Am 1/14/2013 10:18, schrieb Nikolay Frantsev: nikolay@localhost:~/Desktop/git-stash_bug/bug$ git status # On branch master # Changes to be committed: # (use git reset HEAD file... to unstage) # # new file: 3 # # Changes not staged for commit: # (use git add file... to update

Re: Error:non-monotonic index after failed recursive sed command

2013-01-14 Thread Johannes Sixt
Am 1/14/2013 12:40, schrieb George Karpenkov: I've managed to corrupt my very valuable repository with a recursive sed which went wrong. I wanted to convert all tabs to spaces with the following command: find ./ -name '*.*' -exec sed -i 's/\t//g' {} \; I think that has changed not

Re: [PATCH v2] Make git selectively and conditionally ignore certain stat fields

2013-01-14 Thread Johannes Sixt
Am 1/15/2013 1:11, schrieb Junio C Hamano: I'd say a simplistic ignore if zero is stored or even ignore this as one of the systems that shares this file writes crap in it may be sufficient, and if this is a jGit specific issue, it might even make sense to introduce a single configuration

Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases

2013-01-10 Thread Johannes Sixt
Am 10.01.2013 21:22, schrieb Junio C Hamano: Jeff King p...@peff.net writes: Maybe the right rule is if we are using the shell to execute, do not mention SIGPIPE? It seems a little iffy at first, but: 1. It tends to coincide with direct use of internal tools versus external tools.

Re: git branch case insensitivity (Possible bug)

2013-01-09 Thread Johannes Sixt
Am 09.01.2013 18:03, schrieb Alexander Gallego: On Wed, Jan 9, 2013 at 10:52 AM, Andreas Ericsson a...@op5.se wrote: [about case-insensitivity of HFS+ and branch names] If you said yes to all of the above, this is a filesystem feature, courtesy of (cr)Apple, and you're screwed. You can work

[PATCH jk/pathspec-literal] t6130-pathspec-noglob: Windows does not allow a file named f*

2013-01-06 Thread Johannes Sixt
Windows disallows file names that contain a star. Arrange the test setup to insert the file name f* in the repository without the corresponding file in the worktree. Signed-off-by: Johannes Sixt j...@kdbg.org --- t/t6130-pathspec-noglob.sh | 8 +++- 1 file changed, 7 insertions(+), 1

Re: [PATCH] run-command: encode signal death as a positive integer

2013-01-05 Thread Johannes Sixt
) there are no callers that are really interested in the difference and (2) we get it wrong in the shell case anyway, this change makes total sense. Acked-by: Johannes Sixt j...@kdbg.org Signed-off-by: Jeff King p...@peff.net --- Documentation/technical/api-run-command.txt | 6

Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases

2013-01-04 Thread Johannes Sixt
Am 04.01.2013 13:47, schrieb Jeff King: I have two reservations with this patch: 1. We are ignoring SIGPIPE all the time. For an alias that is calling log, that is fine. But if pack-objects dies on the server side, seeing that it died from SIGPIPE is useful data, and we are

Re: git filter-branch doesn't dereference annotated tags

2013-01-03 Thread Johannes Sixt
Am 03.01.2013 00:19, schrieb Junio C Hamano: Grégory Pakosz gpak...@visionobjects.com writes: So we have an annotated tag that points to a commit that is rewritten to nothing as the result of the filtering. What should happen? If the user asked to filter that tag itself, it may make sense

Re: [RFD] annnotating a pair of commit objects?

2013-01-03 Thread Johannes Sixt
Am 03.01.2013 08:03, schrieb Junio C Hamano: The intended use case is to go beyond rerere. Given a history of this shape: o---o---o---I mainline / O---o---X---o---Atopic A \ o---Y---o---o---B topic B Suppose in the original O we had a function

Re: git filter-branch doesn't dereference annotated tags

2013-01-01 Thread Johannes Sixt
Am 31.12.2012 17:24, schrieb Grégory Pakosz: Please disregard the previous email that contains an incorrect fix suggestion. I wish my first contribution was flawless. Here is what's happening. git-filter-branch let git-update-ref -d verify that the value for $ref matches $sha1. However,

Re: What's cooking in git.git (Dec 2012, #04; Sun, 16)

2012-12-18 Thread Johannes Sixt
Junio C Hamano wrote: It could turn out that we may be able to get rid of sys/param.h altogether, but one step at a time. Inputs from people on minority platforms are very much appreciated---does your platform build fine when the inclusion of the file is removed from git-compat-util.h?

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Johannes Sixt
Am 12/18/2012 12:00, schrieb Yann Dirson: On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com writes: Yeah, at one point I wanted to have a command that created to craft a new

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Johannes Sixt
Am 12/18/2012 17:24, schrieb Jeff King: I am not really interested in pushing this forward myself, but I worked up this toy that somebody might find interesting (you can git replace HEAD~20 to get dumped in an editor). It should probably handle trees, and it would probably make sense to do

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Johannes Sixt
Am 12/17/2012 8:21, schrieb Junio C Hamano: Chris Rorvick ch...@rorvick.com writes: 'git checkout' [branch]:: Is branch really optional in this form? BTW, what does plain 'git checkout' do? Just report ahead/behind information? + +Update the index, working tree, and HEAD to reflect the

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Johannes Sixt
Am 12/17/2012 9:48, schrieb Junio C Hamano: Here is what I tentatively have ... Thanks! -'git checkout' [--detach] [commit]:: +'git checkout' --detach [commit]:: +'git checkout' commit:: - Update the index and working tree to reflect the specified - commit and set HEAD to point

Re: [PATCH/RFC 0/3] compiling git with gcc -O3 -Wuninitialized

2012-12-15 Thread Johannes Sixt
Am 14.12.2012 23:09, schrieb Jeff King: Can anybody think of a clever way to expose the constant return value of error() to the compiler? We could do it with a macro, but that is also out for error(), as we do not assume the compiler has variadic macros. I guess we could hide it behind #ifdef

Re: [PATCH 4/4] Declare that HP NonStop systems require strings.h

2012-12-14 Thread Johannes Sixt
Am 14.12.2012 20:57, schrieb David Michael: This platform previously included strings.h automatically. However, the build system now requires an explicit option to do so. Signed-off-by: David Michael fedora@gmail.com --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git

Re: [PATCH 4/4] Declare that HP NonStop systems require strings.h

2012-12-14 Thread Johannes Sixt
Am 14.12.2012 23:46, schrieb Joachim Schmitz: Johannes Sixt wrote: Am 14.12.2012 20:57, schrieb David Michael: This platform previously included strings.h automatically. However, the build system now requires an explicit option to do so. Signed-off-by: David Michael fedora@gmail.com

Re: [PATCH] RFC Optionally handle symbolic links as copies

2012-12-05 Thread Johannes Sixt
Am 12/5/2012 23:46, schrieb Robin Rosenberg: - git status - when do we report a diff. - After checkout we should probably not Are you saying that it should be ignored that the index records a symbolic link, but the worktree contains a regular file and that the regular file does not even

Re: [PATCH] Perform minimal stat comparison when some stat fields are not set

2012-12-05 Thread Johannes Sixt
Am 12/6/2012 2:09, schrieb Robin Rosenberg: Robin Rosenberg robin.rosenb...@dewire.com writes: At least JGit does sets uid, gid, ctime, ino and dev fields to zero on update. To Git this looks like the stat data does not match and a full file compare will be forced even it size and mtime match.

[PATCH] t4049: avoid test failures on filemode challenged file systems (Windows)

2012-11-29 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org The earlier change 74faaa16 (Fix git diff --stat for interesting - but empty - file changes) needed to change the count of differing files because the executable-bit changes of two empty files are now counted. On file systems that do not record the executable

Re: [PATCH] t4049: avoid test failures on filemode challenged file systems (Windows)

2012-11-29 Thread Johannes Sixt
Am 11/29/2012 21:48, schrieb Junio C Hamano: I've tested this with the testpen set on vfat mounted on my Linux box, ... and it seems to work OK, Works well here on Windows, too. Thanks, -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v2 3/3] Add option to transpose parents of merge commit

2012-11-27 Thread Johannes Sixt
Am 11/28/2012 0:00, schrieb Kacper Kornet: When the changes are pushed upstream, and in the meantime someone else updated upstream branch git advises to use git pull. This results in history: ---A---B---C-- \ / D---E The commit message will say: Merge branch

Re: Python extension commands in git - request for policy change

2012-11-25 Thread Johannes Sixt
Am 25.11.2012 03:44, schrieb Eric S. Raymond: That, among other things, means up-to-date versions of Python are ubiquitous unless we're looking at Windows - in which case Perl and shell actually become much bigger portability problems. You seem to ignore that more than a quater of users are on

[PATCH 14/13] test-wildmatch: avoid Windows path mangling

2012-11-20 Thread Johannes Sixt
message] Reported-by: Johannes Sixt j...@kdbg.org Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Johannes Sixt j...@kdbg.org --- Am 11/20/2012 21:11, schrieb Junio C Hamano: Thanks, but you need to fix your format-patch somehow. No, it was Thunderbird. It ate the blank lines

Re: [wishlist] support git flow-like view

2012-11-20 Thread Johannes Sixt
Am 11/21/2012 1:13, schrieb Lisandro Damián Nicanor Pérez Meyer: I think the best mock-up would be: http://nvie.com/img/2009/12/Screen-shot-2009-12-24-at-11.32.03.png Yes, I'm referring to swim-lanes like view. Which may be already there and I'm miserably failing to see :-/ Maybe you are

[PATCH 14/13] test-wildmatch: avoid Windows path mangling

2012-11-19 Thread Johannes Sixt
message] Reported-by: Johannes Sixt j...@kdbg.org Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Johannes Sixt j...@kdbg.org --- Works well, and I'm fine with this work-around. -- Hannes t/t3070-wildmatch.sh | 10 +- test-wildmatch.c | 8 2 files

Re: [PATCH 15/13] compat/fnmatch: fix off-by-one character class's length check

2012-11-19 Thread Johannes Sixt
. Reported-by: Johannes Sixt j...@kdbg.org Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- I tested with Linux (removing the ifdef __LIBC in fnmatch.c) but I think this should get an ACK from someone who actually uses it on Windows. Works well here on Windows. This does

Re: Git does not understand absolute Win'dos' path

2012-11-14 Thread Johannes Sixt
Am 11/14/2012 10:12, schrieb Martin Lichtin: Maven's release plugin prepares a call Git like in this example: cmd.exe /X /C git commit --verbose -F C:\cygwin\tmp\maven-scm-915771020.commit pom.xml Git doesn't seem to understand the -F argument and treats it like a relative path (relative

Re: [PATCH 14/13] test-wildmatch: avoid Windows path mangling

2012-11-13 Thread Johannes Sixt
with a slash. Those arguments must be rewritten with a leading XXX (e.g. /abc becomes XXX/abc), which will be removed by test-wildmatch itself before feeding the patterns to wildmatch() or fnmatch(). Reported-by: Johannes Sixt j...@kdbg.org Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com

Re: [PATCH 15/13] compat/fnmatch: fix off-by-one character class's length check

2012-11-13 Thread Johannes Sixt
Am 11.11.2012 11:13, schrieb Nguyễn Thái Ngọc Duy: - if (c1 == CHAR_CLASS_MAX_LENGTH) + if (c1 CHAR_CLASS_MAX_LENGTH) Nice catch! With this one and 14/13, all tests in t3070 pass on Windows. -- Hannes -- To unsubscribe from this list: send the line

Re: [PATCH nd/wildmatch] Correct Git's version of isprint and isspace

2012-11-13 Thread Johannes Sixt
Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy: @@ -14,11 +14,11 @@ enum { P = GIT_PATHSPEC_MAGIC, /* other non-alnum, except for ] and } */ X = GIT_CNTRL, U = GIT_PUNCT, - Z = GIT_CNTRL | GIT_SPACE + Z = GIT_CNTRL_SPACE }; -const unsigned char

Re: Rename edge case...

2012-11-09 Thread Johannes Sixt
Am 11/9/2012 11:25, schrieb John Szakmeister: On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky tomas.carne...@gmail.com wrote: [snip] When merging two branches, git only looks at the tips. It doesn't inspect their histories to see how the files were moved around. So i doesn't matter whether

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Johannes Sixt
Am 11/6/2012 1:58, schrieb Eric Miao: On Mon, Nov 5, 2012 at 10:40 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Eric Miao venit, vidit, dixit 05.11.2012 15:12: The problem is, most cases we have no idea of the base rev1, and commit rev2 which it's leading up to. E.g. for a single

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Johannes Sixt
Am 11/6/2012 7:56, schrieb Eric Miao: On Tue, Nov 6, 2012 at 2:39 PM, Johannes Sixt j.s...@viscovery.net wrote: Am 11/6/2012 1:58, schrieb Eric Miao: E.g. when we merged a series of patches: [PATCH 00/08] [PATCH 01/08] ... [PATCH 08/08] How do we know this whole series after

[PATCH 14/13] wildmatch: fix tests that fail on Windows due to path mangling

2012-11-04 Thread Johannes Sixt
of a path, on Windows, '**' actually matches something because /foo is converted to c:\path\to\msys\foo. Let's be lazy and let this pass. Signed-off-by: Johannes Sixt j...@kdbg.org --- After this change, there are still 3 failing tests that are in connection with [[:xdigit:]]. Don't know, yet, what's

[PATCH as/check-ignore] t0007: fix tests on Windows

2012-11-04 Thread Johannes Sixt
a SYMLINKS prerequisite to the tests involving symbolic links. Signed-off-by: Johannes Sixt j...@kdbg.org --- t/t0007-ignores.sh | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/t/t0007-ignores.sh b/t/t0007-ignores.sh index 7fd7e53..5d2b8f2 100755

Re: [PATCH] Teach rm to remove submodules when given with a trailing '/'

2012-10-31 Thread Johannes Sixt
Am 10/30/2012 22:28, schrieb Jens Lehmann: Am 29.10.2012 08:11, schrieb Johannes Sixt: Am 10/29/2012 0:28, schrieb Jens Lehmann: + /* Remove trailing '/' from directories to find submodules in the index */ + for (i = 0; i argc; i++) { + size_t pathlen = strlen(argv[i

Re: [PATCH] test-lib: avoid full path to store test results

2012-10-31 Thread Johannes Sixt
Am 31.10.2012 03:28, schrieb Felipe Contreras: On Wed, Oct 31, 2012 at 3:13 AM, Jonathan Nieder jrnie...@gmail.com wrote: Felipe Contreras wrote: It's all fun and games to write explanations for things, but it's not that easy when you want those explanations to be actually true, and

Re: Why does git-commit --template want the template to be modified ?

2012-10-30 Thread Johannes Sixt
Am 10/30/2012 11:53, schrieb Francis Moreau: I'm using git-commit with the --template option. The template I'm given is self sufficient for my purpose but as stated in the documentation, git-commit wants the template to be edited otherwise it aborts the operation. Is it possible to change

Re: [PATCH 1/2] gitk: simplify file filtering

2012-10-29 Thread Johannes Sixt
Am 10/25/2012 19:23, schrieb Felipe Contreras: git diff is perfectly able to do this with '-- files', no need for manual filtering. It would have been very useful if you summarized what the code did before this change. As for the change itself, it seems to make sense to use git diff's path

Re: [PATCH 2/2] gitk: handle --full-diff correctly

2012-10-29 Thread Johannes Sixt
Am 10/25/2012 19:23, schrieb Felipe Contreras: Otherwise the files are missing from the diff, and the list of files. We do this by creating a limitdiffs variable specific for the view which can be turned of by using --full-diff. It would be very helpful if you described the problem. Try it

Re: git push tags

2012-10-28 Thread Johannes Sixt
Am 25.10.2012 08:58, schrieb Angelo Borsotti: Hello, git push tag updates silently the specified tag. E.g. git init --bare release.git git clone release.git integrator cd integrator git branch -avv touch f1; git add f1; git commit -m A git tag v1 git push origin tag v1 touch f2; git

Re: [PATCH] tile: support GENERIC_KERNEL_THREAD and GENERIC_KERNEL_EXECVE

2012-10-24 Thread Johannes Sixt
Am 10/24/2012 0:23, schrieb Jeff King: For the fold-on-rebase idea, I'd think you would want something similar, like setting rebase.foldNotes to foo to say refs/notes/foo contains pseudo-headers that should be folded in like a signed-off-by. If you are rebasing anyway, you can already use

Re: [PATCH 1/8] t1300: style updates

2012-10-24 Thread Johannes Sixt
Am 10/24/2012 0:35, schrieb Jeff King: -test_expect_success 'non-match value' \ - 'test wow = $(git config --get nextsection.nonewline !for)' +test_expect_success 'non-match value' ' + test wow = $(git config --get nextsection.nonewline !for) +' Here's a case you forgot to update to

Re: [PATCH 8/8] git-config: use git_config_with_options

2012-10-24 Thread Johannes Sixt
All looked sane. Thanks for a pleasant read! -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] transport-helper: check when helpers fail

2012-10-22 Thread Johannes Sixt
Am 10/21/2012 21:19, schrieb Felipe Contreras: diff --git a/run-command.c b/run-command.c index 1101ef7..2852e9d 100644 --- a/run-command.c +++ b/run-command.c @@ -559,6 +559,23 @@ int run_command(struct child_process *cmd) return finish_command(cmd); } +int check_command(struct

Re: diff support for the Eiffel language?

2012-10-22 Thread Johannes Sixt
Am 10/22/2012 15:06, schrieb Ævar Arnfjörð Bjarmason: On Mon, Oct 22, 2012 at 1:58 PM, Ulrich Windl ulrich.wi...@rz.uni-regensburg.de wrote: However there's one little thing I noticed with git diff: The conte4xt lines (staring with @@) show the current function (in Perl and C), but they show

Re: [PATCH] transport-helper: check when helpers fail

2012-10-22 Thread Johannes Sixt
Am 10/22/2012 13:50, schrieb Felipe Contreras: On Mon, Oct 22, 2012 at 8:35 AM, Johannes Sixt j.s...@viscovery.net wrote: Another thought: In your use-case, isn't it so that it would be an error that the process exited for whatever reason? I.e., even if it exited with code 0 (success

Re: [PATCH v3 6/8] longest_ancestor_length(): require prefix list entries to be normalized

2012-10-22 Thread Johannes Sixt
Am 21.10.2012 07:57, schrieb Michael Haggerty: Move the responsibility for normalizing the prefixes passed to longest_ancestor_length() to its caller. In t0060, only test longest_ancestor_lengths using normalized paths: remove empty entries and non-absolute paths, strip trailing slashes from

Re: [PATCH 0/2] gitk: fix --full-diff handling

2012-10-19 Thread Johannes Sixt
Am 10/19/2012 12:56, schrieb Felipe Contreras: I find usel to do 'git log --full-duff -- file' to find out all the commits that touched the file, and show the full diff (not just the one of the file). Unfortunately gitk doesn't honour this option; the diff is limited in the UI. There is

Re: [PATCH 2/2] filter-branch: use git-sh-setup's ident parsing functions

2012-10-18 Thread Johannes Sixt
Am 10/18/2012 9:25, schrieb Jeff King: -# When piped a commit, output a script to set the ident of either -# author or committer +# Ensure non-empty id name. +fallback_name() { + echo case \\$GIT_$1_NAME\ in \\) GIT_$1_NAME=\\${GIT_$1_EMAIL%%@*}\ export GIT_$1_NAME;; esac +}

Re: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Johannes Sixt
this: $ sh -c '. $(git --exec-path)/git-sh-setup; get_author_ident_from_commit HEAD' GIT_AUTHOR_NAME='Johannes Sixt' GIT_AUTHOR_EMAIL='j...@kdbg.org' GIT_AUTHOR_DATE='@1350025129 +0200' -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Johannes Sixt
Am 10/18/2012 0:09, schrieb Jeff King: - lid=$(echo $1 | tr [A-Z] [a-z]) - uid=$(echo $1 | tr [a-z] [A-Z]) + lid=$(echo $1 | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + uid=$(echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ) That seems

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-16 Thread Johannes Sixt
Am 10/15/2012 18:54, schrieb Junio C Hamano: Ideally, that earlier workaround should have done a logica equivalent of: ... and did so not in-line at the calling site but in a compat/ wrapper for fflush() to eliminate the need for the ifdef. Fair enough. But reverting the EINVAL check from

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-15 Thread Johannes Sixt
Am 10/14/2012 6:29, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: It might be worth it. We already have a similar special case in write_or_die.c:maybe_flush_or_die() for Windows, although it is not about a colon in a path name. Perhaps like this. Hrm, the we already

Re: make test

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 12:36, schrieb Joachim Schmitz: not ok 4 - pretend we have a known breakage # TODO known breakage This is expected, right? Right. the next is not though? Why might it be failing, where to check? not ok - 12 tests clean up even on failures # # mkdir

Re: make test

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 13:00, schrieb Joachim Schmitz: From: Johannes Sixt [mailto:j.s...@viscovery.net] and if that does not give sufficient clues, $SHELL_PATH -x ./t-basic.sh -v -i not ok - 12 tests clean up even on failures #... + die Looks identical, except for the die at the end

Re: make test

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 13:37, schrieb Joachim Schmitz: ... + eval ' find .git/objects -type f -print should-be-empty test_line_count = 0 should-be-empty ' ++ find .git/objects -type f -print ++ test_line_count = 0 should-be-empty ++ test 3 '!=' 3 +++ wc -l ++ test 0 = 0 +

Re: make test

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 13:58, schrieb Joachim Schmitz: ++ mkdir failing-cleanup ++ cd failing-cleanup ++ cat ++ chmod +x failing-cleanup.sh ++ test_must_fail ./failing-cleanup.sh + eval_ret=1 I wonder why the log does not show the commands of function test_must_fail. Is there a 'set +x' hidden

Re: How can I tell if anything was fetched?

2012-10-12 Thread Johannes Sixt
Am 10/11/2012 18:25, schrieb Phil Lawrence: What is the best way to know whether or not anything was received during the fetch? I don't want to be stuck trying to parse the answer out of STDOUT and STDERR... what=--all # or --remotes=the-remote presha1s=$(git rev-parse $what) git fetch

Re: [PATCH v4 12/12] t3070: disable two fnmatch tests that have different results on different libc

2012-10-12 Thread Johannes Sixt
Am 10/10/2012 12:40, schrieb Nguyễn Thái Ngọc Duy: fnmatch on glibc-2.12.1 returns no match. glibc-2.15 returns ok. There are many more cases that fail with the fnmatch() that we ship in compat/fnmatch. To test this on Linux, you have to remove the #if defined _LIBC || !defined __GNU_LIBRARY__

Re: [PATCH v4 05/12] Integrate wildmatch to git

2012-10-12 Thread Johannes Sixt
--- 8 --- From: Johannes Sixt j...@kdbg.org Subject: [PATCH] test-wildmatch: avoid exit code -1 Our bash on Windows does not recognize -1 as failure. Signed-off-by: Johannes Sixt j...@kdbg.org --- Please squash this in, in the next round. test-wildmatch.c | 6 +++--- 1 file changed, 3

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-12 Thread Johannes Sixt
Am 10/11/2012 17:51, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: I saw EINVAL errors when 'git grep pattern rev' was run on Windows. The reason is that the code attempted to access rev:dir/.gitattributes in the worktree, which is an invalid path on Windows due

Re: filter-branch IO optimization

2012-10-11 Thread Johannes Sixt
Am 11.10.2012 17:39, schrieb Enrico Weigelt: The main goal of this filtering is splitting out many modules from a large upstream repo into their own downstream repos. ... The next step I have in mind is using --subdirectory-filter, but open questsions are: * does it suffer from the same

Re: [PATCH 3/3] grep: stop looking at random places for .gitattributes

2012-10-10 Thread Johannes Sixt
Thanks for working on this issue! Am 10/10/2012 13:34, schrieb Nguyễn Thái Ngọc Duy: + linkgit:gitattributes[5]). Note that .gitattributes are only + support for searching files in working directory. Does this mean it does not work for 'git grep --cached'? That would be a real loss.

Re: [PATCH 3/3] grep: stop looking at random places for .gitattributes

2012-10-10 Thread Johannes Sixt
Am 10/10/2012 14:03, schrieb Nguyen Thai Ngoc Duy: On Wed, Oct 10, 2012 at 6:51 PM, Johannes Sixt j.s...@viscovery.net wrote: Thanks for working on this issue! Am 10/10/2012 13:34, schrieb Nguyễn Thái Ngọc Duy: + linkgit:gitattributes[5]). Note that .gitattributes are only + support

Re: [PATCH 3/3] grep: stop looking at random places for .gitattributes

2012-10-10 Thread Johannes Sixt
Am 10/10/2012 14:32, schrieb Nguyen Thai Ngoc Duy: git-archive has --worktree-attributes to specify where attributes come from. Sparse checkout can choose to read index version first then worktree's or the other way around. All normal operations read worktree version, if not found index

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-10 Thread Johannes Sixt
Am 10/10/2012 15:59, schrieb Nguyễn Thái Ngọc Duy: This patch passes real paths down to grep_source_load_driver(). Except grepping a blob, all other cases should have right paths down to ... grepping a blob or tree object... grep_source_load_driver(). In other words, .gitattributes are still

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-10 Thread Johannes Sixt
Am 10/10/2012 21:56, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: At any rate, I don't observe the warnings anymore with this series. What kind of warnings have you been getting? Earlier we had a bug in the jk/config-warn-on-inaccessible-paths series that made

Re: [PATCH 3/3] grep: stop looking at random places for .gitattributes

2012-10-10 Thread Johannes Sixt
Am 10/10/2012 21:44, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: Is there already an established definition which the correct .gitattributes are? No, and it is deliberately kept vague while waiting for us to come up with a clear definition of what is correct

Re: [PATCH nd/attr-match-optim-more 2/2] attr: more matching optimizations from .gitignore

2012-10-09 Thread Johannes Sixt
Am 10/9/2012 7:08, schrieb Junio C Hamano: Imagine if we allowed only one attribute per line, instead of multiple attributes on one line. - If you want to unset the attribute, you would write path -attr. - If you want to reset the attribute to unspecified, you would write path

Re: upload-pack is slow with lots of refs

2012-10-09 Thread Johannes Sixt
Am 09.10.2012 08:46, schrieb Shawn Pearce: On Mon, Oct 8, 2012 at 8:05 AM, Johannes Sixt j...@kdbg.org wrote: Am 05.10.2012 18:57, schrieb Shawn Pearce: Smart HTTP is not bidirectional. The client can't cut off the server. Smart HTTP does not need it: you already posted a better solution (I'm

Re: upload-pack is slow with lots of refs

2012-10-09 Thread Johannes Sixt
Am 09.10.2012 22:30, schrieb Johannes Sixt: Am 09.10.2012 08:46, schrieb Shawn Pearce: As it turns out we don't really have this problem with git://. Clients can bury a v2 request in the extended headers where the host line appears today. I tried, but it seems that todays git-daemons

Re: upload-pack is slow with lots of refs

2012-10-08 Thread Johannes Sixt
Am 05.10.2012 18:57, schrieb Shawn Pearce: On Thu, Oct 4, 2012 at 11:24 PM, Johannes Sixt j.s...@viscovery.net wrote: Upload-pack can just start advertising refs in the v1 way and announce a v2 capability and listen for response in parallel. A v2 capable client can start sending wants or some

Re: Proposed function path_in_directory()

2012-10-08 Thread Johannes Sixt
Am 08.10.2012 18:13, schrieb Junio C Hamano: Michael Haggerty mhag...@alum.mit.edu writes: 2. Does there need to be any special related to DOS paths? The ceiling computation may need special case for dos. What does the getcwd() give us? Do we learn only the path within the current drive

Re: upload-pack is slow with lots of refs

2012-10-05 Thread Johannes Sixt
Am 10/3/2012 21:41, schrieb Shawn Pearce: On Wed, Oct 3, 2012 at 11:55 AM, Jeff King p...@peff.net wrote: On Wed, Oct 03, 2012 at 11:53:35AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: Has there been any work on extending the protocol so that the client tells the server what

Re: [PATCH 5/6] gitignore: do not do basename match with patterns that have '**'

2012-10-05 Thread Johannes Sixt
Am 10/4/2012 9:39, schrieb Nguyễn Thái Ngọc Duy: - - If the pattern does not contain a slash '/', git treats it as - a shell glob pattern and checks for a match against the - pathname relative to the location of the `.gitignore` file - (relative to the toplevel of the work tree if not

Re: erratic behavior commit --allow-empty

2012-10-03 Thread Johannes Sixt
Not answering questions does not help anyone. My question was: What is the point in insisting that there is a *really* new commit when the one commit that already existed has exactly the content that you wanted? -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the

Re: erratic behavior commit --allow-empty

2012-10-03 Thread Johannes Sixt
Cc restored; please reply to all. Am 10/3/2012 8:32, schrieb Angelo Borsotti: Hi Hannes, well, I thought I replied to your question: What is the point in insisting that there is a *really* new commit when the one commit that already existed has exactly the content that you

<    6   7   8   9   10   11   12   >