Re: [PATCH gitk 0/4] gitk support for git log -L

Paul Mackerras pau...@samba.org writes: Hi Thomas, On Wed, Jul 31, 2013 at 03:17:41PM +0200, Thomas Rast wrote: Jens Lehmann jens.lehm...@web.de writes: Am 29.07.2013 21:37, schrieb Thomas Rast: Thomas Rast tr...@inf.ethz.ch writes: Thomas Rast tr...@inf.ethz.ch writes: Now

Re: Does Git now have any C struct version history tracking mechanism?

; it doesn't by default) never matches a leading '#´ either. So it's no surprise that the tracked range extends a few more lines after the struct. Or is there an issue that I'm missing? -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH] Git segmentation faults if submodule path is empty.

, namelen, key) 0 || !name) + if (parse_config_key(var, submodule, name, namelen, key) 0 || !name || !value) return 0; if (!strcmp(key, path)) { -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH] lookup_object: split up displacement penalty for hash collisions

. - obj_hash[i] = obj_hash[first]; + obj_hash[i] = obj_hash[middle]; + obj_hash[middle] = obj_hash[first]; obj_hash[first] = tmp; } return obj; -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe

Re: [PATCH] lookup_object: split up displacement penalty for hash collisions

Thomas Rast tr...@inf.ethz.ch writes: Stefan Beller stefanbel...@googlemail.com writes: However please do check if this patch brings the promised performance on your own, as you're likely using different hardware and another software setup. Feel free to share your performance differences

Re: Reproducible, corrupt packfile after fresh git-svn checkout message

, because double free() detection is squarely up valgrind's alley. So valgrind's lack of complaints is a strong argument against it. But it's the best I've got so far. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: re-ignoring a force added file

actually using it. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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: gitk: Can't parse git log output: { }

] Has anyone else seen this, and know what might have happened? I do not get the behaviour in other repositories (including other clones of git.git), only this particular one. Have you tried moving away .git/gitk.cache? If that fixes it, perhaps you can share it for inspection. -- Thomas

Re: Reproducible, corrupt packfile after fresh

(if the project is public) or compile a git-fsck without optimization and with debugging, and run it under valgrind, to hopefully get us a backtrace of where the memory management goes off the rails? -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line

Re: Reproducible, corrupt packfile after fresh git-svn checkout message 3 of 20)

have been more interested in error output from valgrind, because memory corruption invariably happens long before glibc finally figures out that something is amiss. But as things stand, the backtrace is probably the only thing we have... -- Thomas Rast trast@{inf,student}.ethz.ch

Re: Reproducible, corrupt packfile after fresh git-svn checkout message (gitml: message 5 of 20)

of the mail you are replying to. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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: Reproducible, corrupt packfile after fresh git-svn checkout message (gitml: message 5 of 20) (gitml: message 6 of 20)

Ben Tebulin tebu...@googlemail.com writes: Am 08.08.2013 16:20, schrieb Thomas Rast - tr...@inf.ethz.ch: Can you try to reproduce with a version older than v1.8.3? E.g. v1.8.2.3. I'm asking because the above points at packed_object_info(), which I recently rewrote to be nonrecursive

Re: [PATCH] replace: forbid replacing an object with one of a different type

(Object ref '%s' is of type '%s'\n + while replace ref '%s' is of type '%s'., + object_ref, typename(obj_type), + replace_ref, typename(repl_type)); + if (read_ref(ref, prev)) hashclr(prev); else if (!force) -- Thomas

Re: [PATCH] die_with_status: use printf '%s\n', not echo

+ ) + grep -v error Umm, doesn't that only test that _some_ line in the error does not contain a tab? Whereas you need to test that _no_ line contains TABemp, or some such. Perhaps as ! grep -vemp error +' + test_done -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe

Re: [PATCH] l10n: de.po: translate 5 messages

it seems that concatenating sentences indeed falls into a gray area between avoid sentence lego and split at paragraphs. And Peff's style of splitting it saves the translators work because the first part of the message is shared among two code paths. -- Thomas Rast trast@{inf,student}.ethz.ch

Re: [PATCH] die_with_status: use printf '%s\n', not echo

Matthieu Moy matthieu@grenoble-inp.fr writes: Thomas Rast tr...@inf.ethz.ch writes: + grep -v error Umm, doesn't that only test that _some_ line in the error does not contain a tab? Indeed. It does work as the error message is just a one-liner, but let's be robust anyway

Re: What's cooking in git.git (Aug 2013, #01; Thu, 1)

Junio C Hamano gits...@pobox.com writes: Thomas Rast tr...@inf.ethz.ch writes: Junio C Hamano gits...@pobox.com writes: * tr/log-full-diff-keep-true-parents (2013-08-01) 1 commit - log: use true parents for diff even when rewriting Output from git log --full-diff -- pathspec looked

Re: [PATCH] log: use true parents for diff when walking reflogs

for the noise. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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] cherry-pick: allow - as abbreviation of '@{-1}'

the commits. It will lead to shorter code, and it handles test_tick for you. It is documented in t/README and in a comment in t/test-lib-functions.sh. (You still need test_tick immediately before the cherry-pick!) -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send

Re: What's cooking in git.git (Aug 2013, #01; Thu, 1)

it, I can introduce a new flag that lets the user pick; it's pretty trivial. But it seems very strange to me. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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

Re: [PATCH v2] l10n: de.po: translate 99 new messages

Ralf Thielow ralf.thie...@gmail.com writes: Translate 99 new messages came from git.pot update in 28b3cff (l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com Acked-by: Thomas Rast tr...@inf.ethz.ch Thanks for your work! -- Thomas Rast

Re: [PATCH 00/11] blame/log -L: additional tests and bug fixes

quite a bit. As for the series, my tuits don't go further than a cursory read today, but from that it seems good. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: git replace: should it check for object type, and can it replace merges?

tree (these are the only valid modes) * Blobs don't point at anything. So yes: Should 'git replace' check the object types to ensure they are sensible? I think that would be a very good thing to check. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send

Re: [PATCH gitk 0/4] gitk support for git log -L

Jens Lehmann jens.lehm...@web.de writes: Am 29.07.2013 21:37, schrieb Thomas Rast: Thomas Rast tr...@inf.ethz.ch writes: Thomas Rast tr...@inf.ethz.ch writes: Now that git log -L has hit master, I figure it's time to discuss the corresponding change to gitk. Paul, any news on this? Any

[PATCH v2] log: use true parents for diff even when rewriting

u.kleine-koe...@pengutronix.de Helped-by: Junio C Hamano gits...@pobox.com Helped-by: Ramsay Jones ram...@ramsay1.demon.co.uk Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- New in this version: * Junio's and Ramsay's suggestions squashed * Moved the slab variable from file-static to within the struct

[PATCH] Rename advice.object_name_warning to objectNameWarning

We spell config variables in camelCase instead of with_underscores. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- I figure since we don't have the variable in any release yet *and* the worst possible outcome is that someone sees the advice message again, the consistency is worth the change

Re: [PATCH] l10n: de.po: translate 99 new messages

of sicher if you instead said Ihre Änderungen sind im Stash sicher. (Note that the ambiguity does not exist in English: the other meaning would be surely.) +Sie können jederzeit \git stash pop\ oder \git stash drop\ ausführen.\n [...] -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe

Re: [PATCH 2/2] Don't close pack fd when free'ing pack windows

://www.youtube.com/watch?v=fMeH7wqOwXA The comment starts at 13:55. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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 gitk 0/4] gitk support for git log -L

Thomas Rast tr...@inf.ethz.ch writes: Thomas Rast tr...@inf.ethz.ch writes: Now that git log -L has hit master, I figure it's time to discuss the corresponding change to gitk. Paul, any news on this? Any chance we can get it into the next release, since that will also be the first release

Re: [PATCH] log: use true parents for diff even when rewriting

Junio C Hamano gits...@pobox.com writes: Thomas Rast tr...@inf.ethz.ch writes: When using pathspec filtering in combination with diff-based log output, parent simplification happens before the diff is computed. The diff is therefore against the *simplified* parents. This works okay

Re: [PATCH 0/5] range-set and line-log bug fixes

Eric Sunshine sunsh...@sunshineco.com writes: While implementing multiple -L support for git-blame, I encountered several bugs in range-set and line-log resulting in crashes. This series fixes those bugs. Acked-by: Thomas Rast tr...@inf.ethz.ch -- Thomas Rast trast@{inf,student}.ethz.ch

Re: [PATCH gitk 0/4] gitk support for git log -L

Thomas Rast tr...@inf.ethz.ch writes: Now that git log -L has hit master, I figure it's time to discuss the corresponding change to gitk. Paul, any news on this? Any chance we can get it into the next release, since that will also be the first release to ship with 'git log -L'? -- Thomas

Re: [PATCH 5/6] blame-options.txt: place each -L option variation on its own line

git log -L '...:'maiTAB -- Thomas Rast trast@{inf,student}.ethz.ch -- 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: What's cooking in git.git (Jul 2013, #07; Sun, 21)

. In any case don't merge anything until we see that it solves git-imerge's problems, so that it has a user ;-) The next version will implement a stateless mode too, like Michael asked for (not writing MERGE_HEAD, etc.). -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list

Re: git log anomalities

pathspec (47a5247f), which is -- at this stage, after rewriting -- the parent. I suspect to fix this we'll need to separate the real from the rewritten parents, which might take a bit of work. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH/RFC] blame: accept multiple -L ranges

the functions appear in the source to correctly specify -L:foo -L:bar or similarly, -L/foo/,/^}/ -L/bar/,/^}/? What if we supported +/RE/ as the relative version? -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH/RFC] blame: accept multiple -L ranges

Junio C Hamano gits...@pobox.com writes: Thomas Rast tr...@inf.ethz.ch writes: Eric Sunshine sunsh...@sunshineco.com writes: The proposal currently is only for -L /RE/,whatever to behave in a relative fashion, beginning the search at the end of the last range specified via -L (or line 1

[PATCH] log: use true parents for diff even when rewriting

... (--graph internally kicks in parent simplification, much like --parents). Reported-by: Uwe Kleine-König u.kleine-koe...@pengutronix.de Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- Perhaps like this. It's getting a bit late, so I'm not sure if I'm missing another user of the true parent list

Re: [PATCH 0/6] fix blame -L regression; add tests

blame -L tests t8001/t8002 (blame): add blame -L :funcname tests blame-options.txt: place each -L option variation on its own line blame-options.txt: explain that -L start and end are optional Thanks, and except for the comment I just sent out, Acked-by: Thomas Rast tr...@inf.ethz.ch

Re: [PATCH 5/6] blame-options.txt: place each -L option variation on its own line

:: Documentation/git-p4.txt:171:--verbose, -v:: Documentation/git-p4.txt:282:--dry-run, -n:: -- Thomas Rast trast@{inf,student}.ethz.ch -- 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

Re: [PATCH v3 0/3] Switch German translation to G+E

) l10n: de.po: switch from pure German to German+English (part 3) Thanks, this one applied cleanly. Acked-by: Thomas Rast tr...@inf.ethz.ch -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: git svn fetch segfault on exit

that to break is a version mismatch. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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

[PATCH v2 1/2] apply, entry: speak of submodules instead of subprojects

(Expose subprojects as special files to git diff machinery, 2007-04-15), apparently before the terminology was settled. We can of course not change the patch format. Let's at least change the error messages to consistently call them submodule. Signed-off-by: Thomas Rast tr...@inf.ethz.ch Reviewed

[PATCH v2 2/2] show-branch: fix description of --date-order

The existing description reads as if it somehow applies a filter. Change it to explain that it is merely about the ordering. Message-proposed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- builtin/show-branch.c | 4 ++-- 1 file changed, 2 insertions(+), 2

Re: [PATCHv3 1/3] l10n: de.po: switch from pure German to German+English (part 1)

eingerichtet. Referenz %s ist mehrdeutig. These two lines apparently got wrapped by your MUA. There are more instances of the same damage. Can you send a fixed patch? -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body

[PATCH 1/2] apply, entry: speak of submodules instead of subprojects

(Expose subprojects as special files to git diff machinery, 2007-04-15), apparently before the terminology was settled. We can of course not change the patch format. Let's at least change the error messages to consistently call them submodule. Signed-off-by: Thomas Rast tr...@inf.ethz.ch

[PATCH 2/2] show-branch: fix description of --date-order

The existing description reads as if it somehow applies a filter. Change it to explain that it is merely about the ordering. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- builtin/show-branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/show-branch.c b/builtin

Re: [PATCH] git-log.txt: fix typesetting of example git-log -L invocation

. -git log -L '/int main/',/^}/:main.c:: +`git log -L '/int main/',/^}/:main.c`:: Shows how the function `main()` in the file 'main.c' evolved over time. Ack. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH 0/2] open() error checking

Junio C Hamano gits...@pobox.com writes: Thomas Rast tr...@inf.ethz.ch writes: I originally had a four-patch series to open 0/1/2 from /dev/null, but then I noticed that this was shot down in 2008: http://thread.gmane.org/gmane.comp.version-control.git/93605/focus=93896 The way I recall

[PATCH 2/2] git: ensure 0/1/2 are open in main()

we call sanitize_stdfds() during main git startup. Since these FDs are inherited, this covers all use of 'git foo ...', and all internal C commands when called directly. It does not fix shell/perl commands called directly. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- git.c | 7 +++ 1

[PATCH 1/2] daemon/shell: refactor redirection of 0/1/2 from /dev/null

-by: Thomas Rast tr...@inf.ethz.ch --- cache.h | 2 ++ daemon.c | 12 setup.c | 12 shell.c | 12 +++- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/cache.h b/cache.h index dd0fb33..f007724 100644 --- a/cache.h +++ b/cache.h @@ -425,6 +425,8

Re: [PATCH 1/2] git_mkstemps: correctly test return value of open()

Thomas Rast tr...@inf.ethz.ch writes: From: Dale R. Worley wor...@alum.mit.edu open() returns -1 on failure, and indeed 0 is a possible success value if the user closed stdin in our process. Fix the test. Signed-off-by: Thomas Rast tr...@inf.ethz.ch I see you have this in 'pu' without

Re: [PATCH 1/2] apply, entry: speak of submodules instead of subprojects

Jens Lehmann jens.lehm...@web.de writes: Am 16.07.2013 20:07, schrieb Jonathan Nieder: Thomas Rast wrote: There are only four (with some generous rounding) instances in the current source code where we speak of subproject instead of submodule. They are as follows: [...] Let's at least

Re: [PATCH 2/2] show-branch: fix description of --date-order

Jonathan Nieder jrnie...@gmail.com writes: Thomas Rast wrote: The existing description reads as if it somehow applies a filter. Change it to explain that it is merely about the ordering. [...] OPT_SET_INT(0, date-order, sort_order, -N_(show commits

Re: [PATCHv2 0/3] Switch German translation to G+E

of beer next time you come near Zurich! My favorite resolved ambiguity/clunky translation: -msgstr stellt den angegebenen Eintrag zur Eintragung bereit -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCHv2 1/3] l10n: de.po: switch from pure German to German+English (part 1)

to the glossary. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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: [PATCHv2 2/3] l10n: de.po: switch from pure German to German+English (part 2)

[head [limit]]] -msgstr git cherry [-v] [Übernahmezweig [Arbeitszweig [Limit]]] +msgstr git cherry [-v] [Upstream [Arbeitsbranch [Limit]]] Perhaps lose the Arbeits to reduce possible confusion -- AFAICT it is only used as a direct equivalent of work in worktree. -- Thomas Rast trast@{inf,student

[PATCH 0/2] open() error checking

you want to resurrect this? The worst part about it is that because we don't have a stderr to rely on, we can't simply die(stop playing mind games). Dale R. Worley (1): git_mkstemps: correctly test return value of open() Thomas Rast (1): run-command: dup_devnull(): guard against syscalls

[PATCH 1/2] git_mkstemps: correctly test return value of open()

From: Dale R. Worley wor...@alum.mit.edu open() returns -1 on failure, and indeed 0 is a possible success value if the user closed stdin in our process. Fix the test. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH 2/2] run-command: dup_devnull(): guard against syscalls failing

dup_devnull() did not check the return values of open() and dup2(). Fix this omission. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- run-command.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run-command.c b/run-command.c index aece872..1b7f88e 100644 --- a/run

Re: [PATCH/RFC] blame: accept multiple -L ranges

Junio C Hamano gits...@pobox.com writes: Thomas Rast tr...@inf.ethz.ch writes: If you define it that way, the output of git blame -L 4,6; git blame -L /A/,+20 is significantly different from git blame -L 4,6 -L /A/,+20 Not just in the presentation or any possible coalescing

Re: [PATCH 1/2] t9902: fix 'test A == B' to use = operator

Junio C Hamano gits...@pobox.com writes: Thomas Rast tr...@inf.ethz.ch writes: The == operator as an alias to = is not POSIX. This doesn't actually matter for the execution of the script, because it only runs when the shell is bash. However, it trips up test-lint, so it's nicer to use

Re: [PATCH 2/2] test-lint: detect 'export FOO=bar'

shells that have problems with 'export FOO=bar' to also fail on 'export FOO=' (i.e. set to empty string and export). -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH v2 2/2] range_set: fix coalescing bug when range is a subset of another

and fixing this. Acked-by: Thomas Rast tr...@inf.ethz.ch -- Thomas Rast trast@{inf,student}.ethz.ch -- 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: Git --file doesn't override $HOME in version 1.8.1.2

looked into the code yet. Probably it's simply following the usual code paths to discover a repo and read its config. However, with the --file option, it shouldn't. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH 0/3] merge -Xindex-only

committing. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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/RFC] blame: accept multiple -L ranges

the union of what each argument would blame individually? Doesn't that make it rather harder to explain? In any case, if you define it like that for blame, log -L should be changed to match. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe

Re: [PATCH/RFC] blame: accept multiple -L ranges

Junio C Hamano gits...@pobox.com writes: Eric Sunshine sunsh...@sunshineco.com writes: On Tue, Jul 9, 2013 at 1:42 PM, Thomas Rast tr...@inf.ethz.ch wrote: Junio C Hamano gits...@pobox.com writes: (2) In the ranges -L anything,/B/ -L /C/,anything, the beginning of the second range

Re: [PATCH 0/3] merge -Xindex-only

Michael Haggerty mhag...@alum.mit.edu writes: On 07/09/2013 02:08 PM, Thomas Rast wrote: Michael Haggerty mhag...@alum.mit.edu writes: Since you've already implemented a way to merge into the index (even an alternative index) without touching the working copy, I'll just cross my fingers

Re: [PATCH] t0000: do not use export X=Y

? -- Thomas Rast trast@{inf,student}.ethz.ch -- 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

[PATCH 2/2] test-lint: detect 'export FOO=bar'

Some shells do not understand the one-line construct, and instead need FOO=bar export FOO Detect this in the test-lint target. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- I wrote: Torsten Bögershausen tbo...@web.de writes: [...] - export HARNESS_ACTIVE=t

Re: [PATCH 0/3] merge -Xindex-only

Michael Haggerty mhag...@alum.mit.edu writes: [Resend because of address confusion in replied-to email.] On 07/07/2013 08:00 PM, Thomas Rast wrote: I recently looked into making merge-recursive more useful as a modular piece in various tasks, e.g. Michael's git-imerge and the experiments I

[PATCH 1/3] merge-recursive: remove dead conditional in update_stages()

650467c (merge-recursive: Consolidate different update_stages functions, 2011-08-11) changed the former argument 'clear' to always be true. Remove the useless conditional. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- merge-recursive.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions

[PATCH 0/3] merge -Xindex-only

not worth it just yet; for what I want to do with it, we need some more reshuffling of things. Thomas Rast (3): merge-recursive: remove dead conditional in update_stages() merge-recursive: untangle double meaning of o-call_depth merge-recursive: -Xindex-only to leave worktree unchanged

[PATCH 3/3] merge-recursive: -Xindex-only to leave worktree unchanged

Using the new no_worktree flag from the previous commit, we can teach merge-recursive to leave the worktree untouched. Expose this with a new strategy option so that scripts can use it. --- Documentation/merge-strategies.txt | 4 merge-recursive.c | 2 ++

[PATCH 2/3] merge-recursive: untangle double meaning of o-call_depth

o-call_depth has a double function: a nonzero call_depth means we want to construct virtual merge bases, but it also means we want to avoid touching the worktree. Introduce a new flag o-no_worktree for the latter. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- merge-recursive.c | 38

Re: --follow is ignored when used with --reverse

that is simply because --follow iis a horrible hack, known to be broken in many ways. I have it on my longer-term todo list to unify it with -L -M, which already does the Right Thing (more generally, not in the --reverse interaction, which it never occurred to me I should check). -- Thomas Rast trast@{inf

Re: [PATCH] perf-lib: fix start/stop of perf tests

disables this -- Thomas Rast trast@{inf,student}.ethz.ch -- 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 09/16] documentation: add documentation for the bitmap format

Vicent Martí tan...@gmail.com writes: On Tue, Jun 25, 2013 at 5:58 PM, Thomas Rast tr...@inf.ethz.ch wrote: Please document the RLW format here. Har har. I was going to comment on your review of the Ewah patchset, but might as well do it here: the only thing I know about Ewah bitmaps

Re: [PATCH 11/16] rev-list: add bitmap mode to speed up lists

. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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 09/16] documentation: add documentation for the bitmap format

Thomas Rast tr...@inf.ethz.ch writes: [...] The next word after `L_M` (if any) must again be a RLW, for the next chunk. For efficient appending to the bitstream, the EWAH stores a format to the last RLW in the stream. ^^ I have no idea what Freud did there, but pointer or some

Re: [PATCH 03/16] pack-objects: use a faster hash table

quadratic probing, or is there some other magic trick involved? Is the same also applicable to the other users of the big object hash table? (I assume Peff has already tried applying it there, but I'm still curious...) -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list

Re: [PATCH 02/16] sha1_file: refactor into `find_pack_object_pos`

(p, pos); + return sha1_entry_pos(index, stride, 0, lo, hi, p-num_objects, sha1); } Our house style prefers not having the braces in a single-line conditional. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH 10/16] pack-objects: use bitmaps when packing objects

on? When starting with the series from origin/master, git-am fails, and 'git am -3' tells me I don't have the necessary blobs (from the 'index' line above). Not that it's super hard to fix this up as long as it's in the Makefile only, but still. -- Thomas Rast trast@{inf,student}.ethz.ch

Re: [PATCH 09/16] documentation: add documentation for the bitmap format

the RLW format here. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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 08/16] ewah: compressed bitmap implementation

extrapolate that the data format requires one such specifier word in between of chunks of stuff, but it's not clear how exactly. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH 00/16] Speed up Counting Objects with bitmap data

test_cmp expect actual ' or some such. For bonus points, you could also add some light performance tests in t/perf/, just to show off ;-) -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH 11/16] rev-list: add bitmap mode to speed up lists

and can get somewhat slow in some cases, so it would be nice to make it really fast, too. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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

Re: Splitting a rev list into 2 sets

Francis Moreau francis.m...@gmail.com writes: On Thu, Jun 20, 2013 at 3:20 PM, Thomas Rast tr...@inf.ethz.ch wrote: positive=$(git rev-parse $@ | grep -v '^\^') negative=$(git rev-parse $@ | grep '^\^') boundary=$(git rev-list --boundary $positive ^master | sed -n 's/^-//p

Re: [PATCH] documentation: fix asterisks in fetch-options

with the remote.$name.fetch + variable) are overridden and not used. Wasn't this already fixed by 9eb4754 (fetch-options.txt: prevent a wildcard refspec from getting misformatted, 2013-06-07), currently in master? -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

that it has the same problem, too, though I'm still investigating the actual issue. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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

[PATCH v4 5/8] test-lib: verbose mode for only tests matching a pattern

-by: Jeff King p...@peff.net Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/README | 5 + t/t-basic.sh | 24 t/test-lib.sh| 31 +++ 3 files changed, 60 insertions(+) diff --git a/t/README b/t/README index ec52468..ec8ab79

[PATCH v4 4/8] test-lib: self-test that --verbose works

it unset leads to spurious test failures in the final summary, which come from the subtest. So we always set it. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/t-basic.sh | 37 - t/test-lib.sh| 2 ++ 2 files changed, 38 insertions(+), 1 deletion

[PATCH v4 1/8] test-lib: enable MALLOC_* for the actual tests

of the actual test snippet. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/test-lib.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh index eff3a65..35da859 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -337,8 +337,10 @@ test_eval_ () { test_run_

[PATCH v4 2/8] test-lib: refactor $GIT_SKIP_TESTS matching

It's already used twice, and we will have more of the same kind of matching in a minute. Helped-by: Johannes Sixt j...@kdbg.org Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/test-lib.sh | 41 - 1 file changed, 24 insertions(+), 17 deletions(-) diff

[PATCH v4 3/8] test-lib: rearrange start/end of test_expect_* and test_skip

This moves * the early setup part from test_skip to a new function test_start_ * the final common parts of test_expect_* to a new function test_finish_ to make the next commit more obvious. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/test-lib-functions.sh | 6 -- t/test-lib.sh

[PATCH v4 0/8] --valgrind improvements

files when not under $TEST_HARNESS, and these are seen and reported by aggregate-results. So this version changes 4/8 to set TEST_HARNESS, instead of unsetting it. Sorry for the trouble. Thomas Rast (8): test-lib: enable MALLOC_* for the actual tests test-lib: refactor $GIT_SKIP_TESTS

[PATCH v4 7/8] test-lib: allow prefixing a custom string before ok N etc.

it obvious. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/test-lib.sh | 27 +++ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index a926828..682459b 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -209,6 +209,9 @@ do

[PATCH v4 8/8] test-lib: support running tests under valgrind in parallel

(on the order of 20x under good conditions, and a large startup overhead at every git invocation) that redundantly running the non-valgrind tests in between is not that expensive. Helped-by: Jeff King p...@peff.net Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/test-lib.sh | 106

[PATCH v4 6/8] test-lib: valgrind for only tests matching a pattern

unless --verbose is also in effect. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/README | 5 + t/test-lib.sh | 36 +++- t/valgrind/valgrind.sh | 3 +++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/t/README b/t/README

<    1   2   3   4   5   6   7   >