Heya, Either way, some explanation would be nice. -- Cheers, Sverre Rabbelier --

There were some useful nuggets in the "Tests in Cygwin" thread from May last year that I've dug out and improved. This series adds support for multiple test prerequisite, and improves the t/README documentation by adding a "Prerequisites" section. There's also a small fix to the raw test output. Ævar Arnfjörð Bjarmason (3): test-lib: Add support for multiple test prerequisites test-lib: Print missing prerequisites in test output t/README: Document the predefined test prerequisites ...

The README for the test library suggested that you grep the test-lib.sh for test_set_prereq to see what the preset prerequisites were. Remove that bit, and write a section explaining all the preset prerequisites. Most of the text was lifted from from Junio C Hamano and Johannes Sixt, See the "Tests in Cygwin" thread in May 2009 for the originals: http://thread.gmane.org/gmane.comp.version-control.git/116729/focus=118385 ...

For consistency with other git commands, let the prune subcommand of git notes accept the long options --dry-run and --verbose for the respective short ones -n and -v. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> --- Documentation/git-notes.txt | 2 ++ builtin/notes.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 5540af5..2981d8c 100644 --- ...

Indeed. Adding a helptext parameter to OPT__DRY_RUN à la OPT__COLOR would make it usable here as well as in commit.c and fetch.c. Similar changes could help OPT__VERBOSE and OPT__QUIET. Their standard helptexts don't add a lot of information.. René --

Yes that works. I thought that -j $n would mean that make would use $n jobs to complete the first target, then move onto the next. Not execute them all in paralell. Thanks, and I have no idea about those Makefile/Perl changes. --

You are asking make to simultaneously build and unbuild everything. It does not really surprise me that it gets confused. Does while nice -n 30 make -j 15 clean CFLAGS=-O0 CC=gcc && nice -n 30 make -j 15 all CFLAGS=-O0 CC=gcc do : done Maybe something like the following is needed to protect against interrupted builds (not the problem you reported, but this reminds me). diff --git a/perl/Makefile b/perl/Makefile index 4ab21d6..eef7ee5 100644 --- a/perl/Makefile +++ ...

git checkout allows one to checkout a particular version of a certain path in the working directory. Are there accessible plumbing commands that can be used to accomplish the same thing, but change the target directory. For example, if I wanted to checkout a certain path, but wanted to check it out somewhere external to my working directory / repository? Thanks, Josh --

Hi, I have a script that sends an email to a developer when someone applies their patch (I know there are other server-side hooks that can be used for this, but there are infrastructure reasons why these can't be used easily). Among other things my script tries to take the URL of the remote and convert it to a http URL that is pointing to our internal server running gitweb. The conversion is a simple s|ssh://|http://to-gitweb| At the moment the script parses the output of 'git remote show ...

Signed-off-by: Elijah Newren <newren@gmail.com> --- t/t5520-pull.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 319e389..8f76829 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -160,4 +160,63 @@ test_expect_success 'pull --rebase works on branch yet to be born' ' test_cmp expect actual ' +test_expect_success 'setup for detecting upstreamed changes' ...

Signed-off-by: Asgeir S. Nilsen <asgeir@twingine.no> --- contrib/ciabot/ciabot.sh | 2 +- contrib/examples/git-checkout.sh | 2 +- contrib/examples/git-clean.sh | 2 +- contrib/examples/git-clone.sh | 2 +- contrib/examples/git-commit.sh | 2 +- contrib/examples/git-fetch.sh | 2 +- contrib/examples/git-gc.sh | 2 +- contrib/examples/git-ls-remote.sh | 2 +- contrib/examples/git-merge.sh | 2 +- ...

Hello, I want to rewrite a program totally from scratch rather than branching from current one. So I created a new repo for it and do the development there. Now it's finished and I want to replace the old program with it. Is it possible to replace the master branch of the old repo with the code in this new repo? I want to move the old code to a separate branch for backup, and replace the master branch with the master branch of the new repo. Since git rm -r * than git add all new files will lost ...

Thank you for the detailed answer! It's really useful. Now I fetch the new source code to a new branch. Later I plan to replace master with merge --ours when it's ready. Thanks --

The "popular support" needs to be qualified. If you ask any random person "Is it a good thing if software package X supports i18n?", the answer would always be "yes"; popular support in that sense doesn't mean much. I am more worried about unintended consequence of this particular execution. For example, I would want to be absolutely sure that we won't break plumbing output in 'next' and the proposed mechanism helps others That is one good example. Perhaps we can get a list of messages ...

That's news to me. I'd assumed that it was mostly on track, i.e. that it would get merged down after cooking for a while in pu. However, if it's a matter of gathering popular support maybe I should change my strategy a bit. Perhaps it would help if I sent the entire series as it is in pu now to the list along with a cover letter explaining the main implications of merging it? All the RFCs so far have either focused on discussing the idea without the implementation, or small parts of the ...

I don't mean to bombard you with E-Mails, but hopefully this one is a bit more to the point. As I'm sure you've gathered by now I'm keen to get this into Git. I'm also fully prepared to address any specific concerns about the series before it gets merged. However, and maybe I'm just dense, I can't really see some unambiguous things about the series that I could improve from your comments. So let's try to clear them up, shall we? My mental plan for this series has basically been as ...

git-index-pack can rebuild the index for a pack file. Not sure if it should be done automagically, but the file is not completely useless. René --

So, should I write the above into the commit message? -- Regards! Bo ---------------------------- My blog: http://blog.morebits.org Why Git: http://www.whygitisbetterthanx.com/ --

Hmm... I do not see anything you added to this header file that needs such a forward declaration. Other files you added that include diffcore.h Isn't "range" too generic a term? Unless you make this as a static declaration only visible to functions where "range" can only mean "line ranges" in their context, that is. --

When I first read this, I thought you were saying these helpers already existed. This is where the rationale goes, anyway, so maybe: Add new test_file_must_not_exist et al helpers for use by tests to more loudly diagnose failures that manifest themselves by the existence or nonexistence of a file or directory. So now you can use test_file_must_exist foo "so there" from your test, and when it fails due to foo being absent or being a symlink instead, instead of silence you ...

When i experimenting with it with test repos - it is working OK. So, i believe it will be very difficult to reproduce. I'm still having this problem with two repos of mine, but as it is not common, i gotta dig deeper there. Thanks, Eugene --

I'm not very fluent in Tcl, but I don't think this runs the command through a shell (pstree agrees with me). That will work in most cases, so that may be acceptable, but if you want to have full compatibility with what "git blame" does (by using a shell) and allow e.g. textconv = LANG=C some-command or textconv = cd ../; do-whatever which are already managed by "git blame" and are OK with my version, it's not going to do it. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ --

Nitpick: git-for-each-ref has `--format' option, no need for `cut'. -- Jakub Narebski Poland ShadeHawk on #git --

On Thu, Aug 5, 2010 at 4:33 PM, Ivan Kanis Try "git pack-objects --all --stdout > /dev/null" on the repo on server to see if it uses the same amount of memory you saw in cloning. You can then try debugging that command if it does. -- Duy --

There is a practical issue in that "struct foo *" can be used with just a forward declaration (or no declaration at all), whereas "foo *" requires the declaration of foo be visible. This is especially handy given C's use of #include, because in cases where there are circular type references, it can be very annoying to get things #included in the right order; being able to use a forward declaration instead of #include makes it easy to break such loops. One can still use "struct foo *" even if ...

I agree, thats much better. The original hate was on "struct foo foo". For some reason, I still prefer the version without the typedef, I agree here too. By the way, my comments were mostly against specifically "typedef foo struct foo", since that what was specifically mentioned. --

We can *store* it without problems, the problem is with *interpretation* by porcelain (and some plumbing). -- Jakub Narebski Poland ShadeHawk on #git --

Something other than the fact that -0400 should be -0500? Or are you talking about an issue with the software you are using to create the dates? -brandon --

The problem is that git was written with leaky abstractions. --

On Fri, Aug 6, 2010 at 16:00, Brandon Casey --

On Thu, Aug 5, 2010 at 5:58 PM, Ævar Arnfjörð Bjarmason Cool, it works! (The 13:00 should have been 12:00, but there's some DST weirdness at work.) Can you check what git-fsck has to say about the repos, on 32- & 64-bit machines? --Joel --

What happens if the command modifies the worktree and/or the index? -- Hannes --

Most of this patch is Subversion code. The rest, which is my own doing, I place in the public domain. You may freely use, modify, distribute, and relicense it. .gitignore | 5 + Makefile | 35 +++ dump_editor.c | 9 +- svn17_compat.c | 842 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ svn17_compat.h | 179 ++++++++++++ svnrdump.c | 5 +- svntest/main.py | 17 +- 7 files changed, 1076 insertions(+), 16 deletions(-) create mode 100644 ...

Thanks; the patch makes sense to me. --

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> shortlog already runs a repository search unconditionally; running such a search earlier is not very risky. Without this change, the “[pager] shortlog” configuration is not respected at all: “git shortlog” unconditionally paginates. The tests are a bit slow. Running the full battery like this for all built-in commands would be counterproductive; the intent is rather to test shortlog as a representative example command ...

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> ls-remote already runs a repository search unconditionally to learn about remote nicknames and "[url] insteadof" shortcuts. Run that search a little sooner, and now one can try [pager] ls-remote to automatically paginate ls-remote output, or use repository-local [core] pager = whatever with "git --paginate ls-remote <url>". Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano ...

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> git grep already runs a repository search unconditionally, even when the --no-index option is supplied; running such a search earlier is not very risky. Just like with shortlog, without this change, the “[pager] grep” configuration is not respected at all. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Aside from rewriting the ...

Here’s a quick fix from the nd/setup series. Tested against master, though it probably should be against maint. Jonathan Nieder (2): check-ref-format: split off functions for subcommands check-ref-format --branch: run repository search builtin/check-ref-format.c | 44 ++++++++++++++++++++++++++---------------- t/t1402-check-ref-format.sh | 17 ++++++++++++++++ 2 files changed, 44 insertions(+), 17 deletions(-) --

The code for each subcommand should be easier to read and manipulate this way. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- builtin/check-ref-format.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index b106c65..8707ee9 100644 --- a/builtin/check-ref-format.c +++ b/builtin/check-ref-format.c @@ -33,28 +33,36 @@ static void collapse_slashes(char *dst, ...

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> In the spirit of v1.4.2-rc3~34^2^2 (Call setup_git_directory() much earlier, 2006-07-28), let run_builtin() take care of searching for a repository for built-ins that want to make use of one if present. So now you can mark your command with RUN_SETUP_GENTLY and use nongit = !startup_info->have_repository; in place of prefix = setup_git_directory_gently(&nongit); and everything will be the same, except the repository is discovered a ...

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Part of a campaign to make repository-local configuration available early (simplifying the startup sequence for built-in commands). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- snuck in a little vertical compression while at it ;-) builtin/var.c | 9 ++------- git.c | 2 +- 2 files changed, 3 insertions(+), 8 ...

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> As v1.7.2~16^2 (git --paginate: paginate external commands again, 2010-07-14) explains, builtins (like git config) that do not use RUN_SETUP are not finding GIT_DIR set correctly when it is time to launch the pager from run_builtin(). If they were to search for a repository sooner, then the outcome of such early repository accesses would be more predictable and reliable. The cmd_*() functions learn whether a repository was found through ...