Re: What's cooking in git.git (May 2013, #04; Wed, 15)

such a name. But if we're going there and deprecating some ways of naming refs, please also disallow some other funny things in the same go. Michael suggested this earlier in some thread: the fewer ways we have of legally spelling refnames, the more syntax is available for revision syntax. --

Re: [PATCH 2/6] test-lib: refactor $GIT_SKIP_TESTS matching

Junio C Hamano writes: > Thomas Rast writes: > >> Johannes Sixt writes: >> >>> Am 5/16/2013 22:50, schrieb Thomas Rast: >>>> +match_pattern_list () { >>>> + arg="$1" >>>> + shift >>>> + test -z "$*&qu

Re: [PATCH 2/6] test-lib: refactor $GIT_SKIP_TESTS matching

Johannes Sixt writes: > Am 5/16/2013 22:50, schrieb Thomas Rast: >> +match_pattern_list () { >> +arg="$1" >> +shift >> +test -z "$*" && return 1 >> +for pat in $@ > > You should have double-quotes around $@ he

Re: [PATCH 5/6] test-lib: allow prefixing a custom string before "ok N" etc.

Phil Hord writes: > On Thu, May 16, 2013 at 4:50 PM, Thomas Rast wrote: >> This is not really meant for external use, but allows the next commit >> to neatly distinguish between sub-tests and the main run. > > Maybe we do not care about standards for this library or for

[RFC PATCH 6/6] test-lib: support running tests under valgrind in parallel

lgrind is so big (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. Signed-off-by: Thomas Rast --- t/test-lib.sh | 60 +++

[PATCH 5/6] test-lib: allow prefixing a custom string before "ok N" etc.

This is not really meant for external use, but allows the next commit to neatly distinguish between sub-tests and the main run. Signed-off-by: Thomas Rast --- t/test-lib.sh | 27 +++ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/t/test-lib.sh b/t/test

[PATCH 3/6] test-lib: verbose mode for only tests matching a pattern

s arguably not *too* useful on its own, but makes the next patch easier to follow. Signed-off-by: Thomas Rast --- t/README | 5 + t/test-lib.sh | 29 + 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/t/README b/t/README index e669bb3..9c8f9b1 10

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

in effect. Signed-off-by: Thomas Rast --- t/README | 5 + t/test-lib.sh | 30 +- t/valgrind/valgrind.sh | 3 +++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/t/README b/t/README index 9c8f9b1..bffd484 100644 --- a/t/README

[PATCH 2/6] 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. Signed-off-by: Thomas Rast --- t/test-lib.sh | 41 - 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 22

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

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

[PATCH 0/6] --valgrind improvements

issue with the last patch that currently eludes me: if I combine --valgrind-parallel with any --valgrind=*, there are lots of errors as (apparently) the valgrind wrapper setups race against each other. However, without any --valgrind=* (thus defaulting to 'memcheck') this doesn't ha

Re: English/German terminology, git.git's de.po, and pro-git

can be reached, IMHO the first step must be to write/complete a glossary that matches *current usage* in pro-git. We can perhaps bikeshed about some glaring issues in the result, but remember that -- again assuming G+E is the conclusion -- any such change again either means a divergence between book and

Re: [PATCH 0/4] Coverage support revisited

Jens Lehmann writes: > Am 13.05.2013 23:27, schrieb Thomas Rast: >> Jens asked me at git-merge if coverage support was still available. >> Turns out it is, but there were some weirdnesses. So this should fix >> them. It is relly slow as you still have to run th

[PATCH 2/4] coverage: do not delete .gcno files before building

ue the other way too. Signed-off-by: Thomas Rast --- Makefile | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f98296b..99e4d09 100644 --- a/Makefile +++ b/Makefile @@ -2443,7 +2443,7 @@ profile-clean: $(RM) $(addsuffix *.gcda,$(add

[PATCH 3/4] coverage: set DEFAULT_TEST_TARGET to avoid using prove

get to 'test' so that we run under make, like we intended all along. Signed-off-by: Thomas Rast --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 99e4d09..153d24d 100644 --- a/Makefile +++ b/Makefile @@ -2551,7 +2551,7 @@

[PATCH 4/4] coverage: build coverage-untested-functions by default

Change the 'coverage' target to build coverage-untested-functions by default, so as to make it more discoverable. Signed-off-by: Thomas Rast --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 153d24d..6f9d1c7 100644 --- a/Make

[PATCH 0/4] Coverage support revisited

do ;-) Thomas Rast (4): coverage: split build target into compile and test coverage: do not delete .gcno files before building coverage: set DEFAULT_TEST_TARGET to avoid using prove coverage: build coverage-untested-functions by default Makefile | 21 + 1 file

[PATCH 1/4] coverage: split build target into compile and test

Confusingly, the coverage-build target in fact builds with gcov support _and runs tests_. Split it into two targets that actually are named after what they do. Signed-off-by: Thomas Rast --- Makefile | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b

Re: [PATCH] teach the user to be nice to git and let him say please sometimes

Heiko Voigt writes: > On Sun, May 12, 2013 at 02:19:34PM -0700, Junio C Hamano wrote: >> Heiko Voigt writes: >> >> > Signed-off-by: Heiko Voigt >> > Signed-off-by: Jonathan Nieder >> > Signed-off-by: Jens Lehmann >> > Signed-off-by: Thomas

English/German terminology, git.git's de.po, and pro-git

l.git/156226/focus=156373 http://thread.gmane.org/gmane.comp.version-control.git/196779/focus=196792 [2] https://github.com/ralfth/git-po-de/wiki/Glossary -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: [PATCH 4/4] fetch: opportunistically update tracking refs

Thomas Rast writes: > Jeff King writes: > >> When we run a regular "git fetch" without arguments, we >> update the tracking refs according to the configured >> refspec. However, when we run "git fetch origin master" (or >> "git pull origin

Re: [PATCH 4/4] fetch: opportunistically update tracking refs

pull or fetch. Michael also pointed out yesterday that short of git fetch origin master:refs/remotes/origin/master there is no way to fetch only one branch. -- 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: [ANN] git-tbdiff: topic branch diff

Thomas Rast writes: > Hi, > > Spawned by discussion here at git-merge, I created a script that diffs > the state of branches. > > You can grab it from > > https://github.com/trast/tbdiff.git > > The usage is > > git tbdiff A..B C..D BTW, I should

[ANN] git-tbdiff: topic branch diff

atch. Have fun, and let me know if it breaks! - Thomas [1] in imperative languages anyway [2] One part of that series, anyway. The different versions make a really good use-case for this tool. I pushed four versions of that series to git://github.com/trast/git.git as fc/remote-hg-[1234] so y

[PATCH] Support running an arbitrary git action through checkout

will just use the short form (-m) and this change is not expected to cause them any problems. [1] http://stevelosh.com/blog/2013/04/git-koans/ Cc: Steve Losh Cc: Jeff King Signed-off-by: Thomas Rast --- builtin/checkout.c | 21 + 1 file changed, 21 insertions(+) diff --git a

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

it doesn't have a wiki entry -- using "Beschränkung" in the same sentence is just confusing. How about Pfadspezifikationen ignorieren Einstellungen zum partiellen Auschecken All the ones I didn't quote here: Acked-by: Thomas Rast Thanks for your work! -- Thomas R

Re: [PATCH 4/4] fast-import: only store commit objects

Michael Haggerty writes: > On 05/03/2013 08:23 PM, Felipe Contreras wrote: >> On Fri, May 3, 2013 at 12:56 PM, Thomas Rast wrote: >>> Felipe Contreras writes: >> >>> How do we know that this doesn't break any users of fast-import? Your >>> c

Re: trouble on windows network share

< 0) + return error("access(%s, R_OK) failed immediately after rename(): %s", +filename, strerror(errno)); + out: if (adjust_shared_perm(filename)) return error("unable to set permission to '%s'", filename); -- 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: jn/config-ignore-inaccessible (Re: What's cooking in git.git (Apr 2013, #10; Mon, 29))

Jonathan Nieder writes: > Thomas Rast wrote: >> Junio C Hamano writes: > >>> * jn/config-ignore-inaccessible (2013-04-15) 1 commit >>> - config: allow inaccessible configuration under $HOME >>> >>> When $HOME is misconfigured to point at an un

Re: Add porcelain command to revert a single staged file to its HEAD state while preserving its staged state

nt (PowerShell) is arguably broken. All the while, there are several existing solutions that we consider more natural, and that generalize to other use-cases. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body

Re: trouble on windows network share

d AFAICS never got a reply)? } If it's a race condition between the write and the subsequent read in } the same process, then it would be solved by looking at the object } later. Does "git cat-file -p 6838761d549cf76033d2e9faf5954e62839eb25d" } work, or is the object forever inaccessible?

Re: Add porcelain command to revert a single staged file to its HEAD state while preserving its staged state

afer anyway, since it doesn't lose the formerly-staged state so easily (you have the reflog in case of any mistakes). -- 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 Mor

Re: What's cooking in git.git (Apr 2013, #10; Mon, 29)

or another, they both claim that it fails even with HOME unset(!) and even with a completely empty environment. I cannot reproduce this, but there might be another issue lurking? -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "unsubscribe git&quo

Re: [PATCH 4/4] fast-import: only store commit objects

f fast-import? Your comment isn't very reassuring: > the vast majority of them will never be used again So what's with the minority? In any case, if this does go in, please update the documentation to match, probably by copying the sentence from git-fast-export(1). -- Thomas Ras

Re: trouble on windows network share

strace log we could see exactly where it gives weird answers (or that it doesn't, and thus get clues to any possible git bugs). -- 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: Another use of "@"?

t;>>> git diff A/long-branch-name >>>> git reset --hard A/long-branch-name >>> >>> Perhaps >>> >>> git checkout long-bra >>> git diff A/!$ >>> git reset --hard !$ > > "diff" does not have to follow

Re: [PATCH/RFC] get_sha1: prefer 40-hex ref name over 40-hex SHA-1

git update-ref refs/tags/$REF $VAL && > + test `git rev-parse $REF 2>err` = $VAL && > + grep "refname.*ambiguous" err > +' Shouldn't these say s/20-hex/40-hex/? -- 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] Hold an 'unsigned long' chunk of the sha1 in obj_hash

2) 2.74(2.59+0.12) +0.7% 2.72(2.57+0.13) +0.2% 2.74(2.59+0.13) +0.8%. ------- -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the lin

Re: [PATCH] refs.c: interpret @ as HEAD

oking at *just* the alias, and resolving that to a SHA1, and going from there. So assuming U = @{u} and H = HEAD, you'd be allowed to say U^ or U..H but not HU or H@U or whatever contortionate syntax that would need. As for the collisions, not sure which one is better. Probably having the s

Re: [PATCH] refs.c: interpret @ as HEAD

e's no way to say git symbolic-ref U @{u} so that I can avoid that -- it's really clumsy to type on a Swiss German keyboard. We'd need some sort of ref-alias feature for that to work. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "

Re: [PATCH] unpack_entry: invalidate newly added cache entry in case of error

d_delta_base_cache() on every base object we have assembled. But the !delta_data error path remained unchanged, and now calls free() on a base that has already been entered in the cache. This means that there is a use-after-free if we later use the same base again. So remove that free(). Reported-by: N

Re: [PATCH v2 0/8] Some object db protection when add_submodule_odb is used

database_contaminated to 1 by default and ran > the test suite. It passed :) How does this interact with alternates set up by the user? It's not immediately obvious from the commit messages (hint hint) or the comments near ODB_LOCAL etc. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubs

Re: [PATCH] unpack_entry: invalidate newly added cache entry in case of error

e delta cache yet. (Observe that we pop from the cache in phase 1, so this is also true for the very first base.) So we make no further attempts to look up the bases in the cache, and just call add_delta_base_cache() on every base object we have assembled. But the !delta_data error path remained

Re: "git grep" parallelism question

ave the patches in jk/test-output (without those > patches the individual tests work but the reporting of aggregate results > doesn't). But that's been possible for quite some time now, using --root, or am I missing something? (Not that the fix as such is a bad idea, but ot

Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY

"$0" "$@" 2>&1; >echo $? > $BASE.exit) | tee $BASE.out > test "$(cat $BASE.exit)" = 0 Hmm, I initially was too lazy to review this change, and now it's biting me. The above is Makefile-quoted, which to the shell reads like a command su

Re: consistency problem on ZFS

kout next; git diff-files > Already on 'next' > :100644 100644 bd774cccaa14e061c3c26996567ee28f4f77ec80 > Mmagit.el > Already on 'next' > $ git-diff-files doesn't refresh the index. Why are you using it? It's the plumbing version of '

Re: [PATCH 1/2] git-svn: fix occasional "Failed to strip path" error on fetch next commit

baz/ > svn add baz/ > svn commit -mx > > echo x > fil.txt > svn add fil.txt > svn commit -mx > > cd ../.. > > git svn clone --stdlayout --preserve-empty-dirs "$url" testrepo.gitsvn Please add an actual regression test, probably

Re: [PATCH] inotify to minimize stat() calls

Thomas Rast writes: > Robert Zeh writes: > >> On Thu, Apr 25, 2013 at 3:18 AM, Thomas Rast wrote: >>> >>> I don't get this bit. The lstat() are run over all files listed in the >>> index. So shouldn't your daemon watch exactly those (or rath

Re: "git grep" parallelism question

sted things on a 2x6-core Xeon OS X machine and there the performance (for the hot-cache, worktree case, which should parallelize nicely) flatlines at 5 threads for no apparent reason. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "unsubscribe git&

Re: [PATCH] t/Makefile: remove smoke test targets

remove all of the smoke testing section in the makefile. > > Signed-off-by: John Keeping Indeed. I must have mis-rebased this commit or some such. Acked-by: Thomas Rast -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "unsubscribe git&quo

Re: [PATCH] clean: confirm before cleaning files and directories

an' with the '--force/-f' option. But if that's the real problem, wouldn't it be better to introduce something like clean.requireForce=interactive (or 'ask', or whatever you make up) which will be like clean.requireForce=true except that when on a TTY, we ask the u

Re: [PATCH] Hold an 'unsigned long' chunk of the sha1 in obj_hash

Junio C Hamano writes: > Thomas Rast writes: > >> So we take a slightly different approach, and trade some memory for >> better cache locality. > > Interesting. It feels somewhat bait-and-switch to reveal that the > above "some" turns out to be "double

Re: [PATCH 1/9] remote-bzr: trivial cleanups

spond well to reviews and criticism. Even the constructive fine-let's-do-the-work-for-him kind that Peff offered. And on top of that, remote helpers are written against an interface that was designed to allow working with external programs. So why is this in git.git? Why should we take any more

Re: [PATCH] inotify to minimize stat() calls

Robert Zeh writes: > On Thu, Apr 25, 2013 at 3:18 AM, Thomas Rast wrote: >> >> I don't get this bit. The lstat() are run over all files listed in the >> index. So shouldn't your daemon watch exactly those (or rather, all >> dirnames of such files)? > I

[PATCH] Hold an 'unsigned long' chunk of the sha1 in obj_hash

- 0001.1: rev-list --all 3.31(3.19+0.12) 3.21(3.09+0.11) -2.9%** 0001.2: rev-list --all --objects 27.99(27.70+0.26) 25.99(25.71+0.25) -7.1%*** ----- Signed-off-by: Thomas Ra

Re: [PATCH] remote-bzr: use proper push method

he results of pushing the way we > currently push are not really understood. Perhaps it's similar to a 'git push > --force', or perhaps it can potentially screw the repository. > > It's better to be safe and just do what bazaar does. Other than "this patch should pro

Re: [PATCH] inotify to minimize stat() calls

one is just based on my personal experience with messing with inotify; renaming directories is the "hard" case for that API. We may already cover this in the test suite, or we may not; but it must be tested. Other than that last point, focus your tests not on small tests but on the tes

Re: [BUG] Highly inconsistent diff UI

Ramkumar Ramachandra writes: > Thomas Rast wrote: >> I personally think we have enough magic revision syntax to last at least >> another decade. If you propose to add some, please make a patch that we >> can cook in next for a few release cycles and then conduct a st

Re: [PATCH 1/3] remote: add a test for extra arguments, according to docs

Junio C Hamano writes: > Thomas Rast writes: > >> +test_extra_arg () { >> +expect="success" >> +if test "z$1" = "z-f"; then >> +expect=failure >> +shift >> +fi >> +te

Re: [BUG] Highly inconsistent diff UI

can both be a SHA1 and a number of generations to go back. I personally think we have enough magic revision syntax to last at least another decade. If you propose to add some, please make a patch that we can cook in next for a few release cycles and then conduct a straw poll if people actually use it.

[PATCH 1/3] remote: add a test for extra arguments, according to docs

ests readable while still ensuring they pass as a whole, and will be removed in the final patch. Signed-off-by: Thomas Rast --- t/t5505-remote.sh | 27 +++ 1 file changed, 27 insertions(+) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 6579a86..764ee97 100755 ---

[PATCH 3/3] remote: 'show' and 'prune' take more than one remote

, we also remove the code supporting it. Signed-off-by: Thomas Rast --- Documentation/git-remote.txt | 4 ++-- t/t5505-remote.sh| 11 +++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index e8c

[PATCH 2/3] remote: check for superfluous arguments in 'git remote add'

The 'git remote add' subcommand did not check for superfluous command line arguments. Make it so. Signed-off-by: Thomas Rast --- builtin/remote.c | 2 +- t/t5505-remote.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c ind

[PATCH 0/3] git remote with superfluous arguments

Today I botched a cut&paste and ran git remote add git remote add origin only to notice, several commands later, that while it had succeeded, it had in fact added a remote called 'git' with an url of 'remote'. Some investigation yielded these fixes. Thomas Rast (3):

Re: [PATCH] send-email: support NNTP

l.stelm...@samsung.com (Łukasz Stelmach) writes: > It was <2013-04-24 śro 09:38>, when Thomas Rast wrote: >> Łukasz Stelmach writes: >>> + if ($email_protocol eq 'nntp') { >>> + $header = "Newsgroups: $to\n" . $header; >>&

Re: [PATCH] send-email: support NNTP

't need to run off and implement this, but I'm curious how hard you think it would be.) At least in the git@vger world with a lot of etiquette surrounding the use of Ccs, NNTP mode isn't very useful if you can't also send Ccs. But maybe you have another use-case where that is

Re: [PATCH] t4202 (log): add failing test for log with subtree

t trees. That should then help subtree users to get better logs. [1] the quoted example shows that you can't just go looking for identical trees in the general case, so it is really a heuristic -- 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] t4202 (log): add failing test for log with subtree

Ramkumar Ramachandra writes: > Thomas Rast wrote: >> [...] > > I think you've misunderstood the whole thing. The histories of M^1 > and M^2 are completely unrelated: they're from different projects > altogether. Considering the /ichi in M^2 a "rename"

Re: [PATCH] t4202 (log): add failing test for log with subtree

Thomas Rast writes: >> +test_expect_failure 'log pathspec in tree read into prefix' ' >> +git checkout --orphan subtree && >> +git rm -rf . && >> +echo foodle >ichi && > > 'ichi' also exists in M^1 beca

Re: [PATCH] t4202 (log): add failing test for log with subtree

-p $subtree_h) && > + git reset --hard $new_h && > + ( > + cd bar && > + git log --oneline ichi >../actual You need to use --follow, as otherwise the pathspec filtering is considered fixed. Note that as discussed in the rest o

Re: [PATCH] t4202 (log): add failing test for log with subtree

t merge of the subtree has the files only on one side. You can see this by comparing git log --oneline --follow gitk-git/gitk with git log --oneline -- gitk gitk-git/gitk -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "unsubscribe git" in th

Patch-to-mail notes resurrected

both to use them. It still fails to match some commits, so consider this WIP, but I think it's quite useful already. -- 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

Re: [PATCH 4/5] git-log.txt: rewrite note on why "--" may be required

Thomas Rast writes: > -- >8 -- > Subject: [PATCH] git-log(1): remove --full-line-diff description BTW, I generated this with your jc/format-patch, but it stopped working after fc/send-email-annotate made it into next; I need this on top. Am I missing something? -- >8 -- Subject: [

Re: [PATCH 4/5] git-log.txt: rewrite note on why "--" may be required

ted. Sigh. We should remove it. -- >8 -- Subject: [PATCH] git-log(1): remove --full-line-diff description This option is a remnant of an earlier log -L version, and not currently implemented. Remove it until (if at all) it is implemented again. Signed-off-by: Thomas Rast --- Documentation/git

Re: git log -p unexpected behaviour - security risk?

g a merge and comparing the result with what the merge gave you. But it's not something that you would want to run by default. [1] some things like --simplify-merges are actually another pass, but the default is to generate everything -- including diffs -- as we go. -- Thomas Rast trast@{in

Re: Some observations on log -L

already, but mainly for other curious readers): git://github.com/trast/git.git tr/gitk-line-log has a version of gitk that supports -L. I hacked it up yesterday, and while it seems to work, I want to play with it a little until I'm satisfied that I didn't break gitk for other uses.

Re: Git crash in Ubuntu 12.04

ll involved repos (including devs' workstations!) and then having the devs re-push what they had locally seems like a good strategy 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

Re: Bug with rev-list --reverse?

break how options work (for fear of breaking scripts). You could come up with a patch series that first starts emitting warnings whenever the user asks for behavior that will change, and later flips the default and removes the warning (the latter would be merged for 2.0 or so). -- Thomas Rast trast@

Re: [PATCH 1/6] transport-helper: clarify *:* refspec

Felipe Contreras writes: > On Thu, Apr 18, 2013 at 2:28 AM, Thomas Rast wrote: >> Felipe Contreras writes: >> >>> The *:* refspec doesn't work, and never has, clarify the code and >>> documentation to reflect that. This in effect reverts commit 9e76

Re: git rev-list --pretty=format:"" issue

r parameters... Also note that the pager is automatically disabled if you redirect stdout, so --no-pager is only required in some fringe cases, notably when attempting to run git under GDB. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "uns

Re: [PATCH 1/6] transport-helper: clarify *:* refspec

l2 HEAD server HEAD > -' So what's wrong with the tests? Do they fail to test what they claim (how?), test something that wasn't reasonable to begin with, or something entirely different? -- 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 (Apr 2013, #05; Mon, 15)

Junio C Hamano writes: > Thomas Rast writes: > >> The warning triggers in some cases where it shouldn't, relating to >> submodules: >> >> $ git submodule add gito...@git.csa.inf.ethz.ch:domjudge.git domjudge >> Adding existing repo at 'domjudg

Re: What's cooking in git.git (Apr 2013, #05; Mon, 15)

ted) # (use "git checkout -- ..." to discard changes in working directory) # # deleted:foo # no changes added to commit (use "git add" and/or "git commit -a") $ git add -A 'f*' $ git status # On branch master # Changes to be

Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

layed around a bit with this, and it seems > to be OK as long as one of those strings contain at least one format > specifier. C printf() only knows about the number and types of arguments from the format string, so *ignoring* arguments is not a problem for correctness. -- 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] l10n: de.po: translate 39 new messages

" and no context, I would probably infer that the original message related to 'reset'. Which it doesn't, so that would be confusing. "Zurücknehmen" works for me, or in the same vein you could try "widerrufen". You can add Acked-by: Thomas Ras

Re: What's cooking in git.git (Apr 2013, #05; Mon, 15)

's going on. But that was back in 2006. I should think that git.git has improved since; when I wrote my first patches in 2008, I was impressed with the readable history and extensive reviews. -- 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] read_revisions_from_stdin: make copies for handle_revision_arg

recorded in the object_array's 'name' field. Fix it by making a copy whenever read_revisions_from_stdin() passes an argument down the callchain. The other caller runs handle_revision_arg() on argv[], where it would be redundant to make a copy. Signed-off-by: Thomas Rast --- > So

Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

registriert" is not very nice; in the absence of context I would suggest "ausgetragen", but that problably collides with our use of "eintragen". Perhaps you can go the long way for this isolated use and just say "aus der Konfiguration entfernt" (and similarly for 'register'). In any case you should also add 'register' and 'unregister' to the glossary once you've settled on something. -- 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: Ensimag students projects, version 2013

that hard. (Peff?) * Allow git send-email --cc 'f...@example.com, b...@example.com' instead of git send-email --cc f...@example.com --cc b...@example.com That would be really nice. Bonus points if it handles continuation lines etc. correctly, so that it's even easier to

Re: [PATCH v3] cherry-pick: make sure all input objects are commits

ENAME)) + if (handle_revision_arg(xstrdup(sb.buf), revs, 0, + REVARG_CANNOT_BE_FILENAME)) die("bad revision '%s'", sb.buf); } if (seen_dashdash) -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe

Re: [PATCH] t/test-lib.sh: fix TRASH_DIRECTORY handling

27;s later patches for violating > my assumptions. :) > > Definitely: > > Acked-by: Jeff King Indeed, your blame assignment seems correct :-) Acked-by: Thomas Rast > -- >8 -- > Subject: [PATCH] t/test-lib.sh: drop "$test" variable > > The $test variab

Re: [PATCH] branch: colour upstream branches

->merge[0]->dst, 0); > + if (want_color(branch_use_color)) > + strbuf_addf(stat, "[%s%s%s] ", > + GIT_COLOR_BLUE, ref, > GIT_COLOR_RESET); AFAICS you are hardcoding the color? The other bits of branch colors are configurable thr

[PATCH 4/4] log -L: improve comments in process_all_files()

The funny range assignment in process_all_files() had me sidetracked while investigating what led to the previous commit. Let's improve the comments. Signed-off-by: Thomas Rast --- line-log.c | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/line-lo

[PATCH 3/4] log -L: store the path instead of a diff_filespec

t is now safe to overwrite the path in the copy. There's one only somewhat related change: the comment in process_all_files() explains the reasoning behind using 'range' there. That bit of half-correct code had me sidetracked for a while. Signed-off-by: Thomas Rast --- line-log.

[PATCH 1/4] t4211: pass -M to 'git log -M -L...' test

-commit e6da343666244ea9e67cbe3f3bd26da860f9fe0e +commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2 Author: Thomas Rast -Date: Thu Feb 28 10:49:28 2013 +0100 +Date: Thu Feb 28 10:45:16 2013 +0100 -move file +touch both functions -diff --git a/b.c b/b.c /dev/null -+++ b/b.c -@@

[PATCH 2/4] log -L: test merge of parallel modify/rename

This tests a toy example of a history like * Merge | \ | * Modify foo | | * | Rename foo->bar | / * Create foo Current log -L fails on this; we'll fix it in the next commit. Signed-off-by: Thomas Rast --- t/t4211-line-log.sh | 16 +++-

[PATCH 0/4] fix log -L -M

e with e.g. git log -M -L:cmd_format_patch:builtin/log.c in any git.git. Thomas Rast (4): t4211: pass -M to 'git log -M -L...' test log -L: test merge of parallel modify/rename log -L: store the path instead of a diff_filespec log -L: improve comments

Re: What's cooking in git.git (Apr 2013, #02; Fri, 5)

ly don't pass -M. So please hold off merging, I'll try to get this fixed this weekend. Sorry for the trouble! -- 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 crash in Ubuntu 12.04

nd (as a file) you can use gdb $(which git) the_coredump_file and then in the GDB prompt, enter 'backtrace' and paste its output, to give us an idea what is going on. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body

Re: [PATCH v4] transport-helper: report errors properly

3 fatal: Error while running fast-export not ok 21 - proper failure checks for pushing I haven't been able to reproduce outside of valgrind tests. Is this an expected issue, caused by overrunning the sleep somehow? If so, can you increase the sleep delay under valgrind so as to not c

<    1   2   3   4   5   6   7   >