gmane.comp.version-control.git

Re: [PATCH] Implement git clone -v

Miklos Vajna — 2008-10-07T19:39:56

Yes, it does. I'm not sure how to test it from the testsuite, maybe redirect the output to a file and grep in it? It's ugly, that's why I did not do so, but if you think a testcase is a musthave for this feature then that's the way to go, I guess.

[RFC] git rev-contains [Was: merge -s ffonly]

Uwe Kleine-König — 2008-10-07T18:58:15

Hello, I already wrote similar tests and I wonder if this couldn't be done in a new builtin command more effectively. Something like git rev-contains HEAD "$1" . I expect it to be faster and maybe it prevents a command line overflow?! (I remember something like 32000 chars max in a command, but I could not trigger that with bash.) Best regards Uwe

Re: [QGIT PATCH] Add safeguards to Git::userInfo()

Marco Costalba — 2008-10-07T18:28:55

Browsing git-config docs I would think that this variable is needed so that git-config knows where to look for the git global configs file that is under user $HOME directory, see the [FILES] section in git config docs. Thanks Marco

Re: [PATCH] Fix a few typos in relnotes

Shawn O. Pearce — 2008-10-07T18:27:21

Wow. I really cannot type. Thanks. :-)

Re: [QGIT PATCH] Add safeguards to Git::userInfo()

Abdelrazak Younes — 2008-10-07T18:20:04

Right! I see... but the only variable I have is HOMEPATH: HOMEPATH=\Users\abdel So I guess this was set by msysgit at installation time. But I see this variable only at the console (after typing 'set'), I don't see it in the user environment variable nor in the system one. So I guess the fix would be for msysgit to create this entry? Thanks, Abdel.

[PATCH] Fix a few typos in relnotes

Mikael Magnusson — 2008-10-07T18:15:25

--- Documentation/RelNotes-1.6.0.3.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/RelNotes-1.6.0.3.txt b/Documentation/RelNotes-1.6.0.3.txt index edd5e45..6cf8ae4 100644 --- a/Documentation/RelNotes-1.6.0.3.txt +++ b/Documentation/RelNotes-1.6.0.3.txt < at >< at > -53,7 +53,7 < at >< at > Fixes since v1.6.0.2 * Stale temporary files under $GIT_DIR/objects/pack are now cleaned up automatically by "git prune". -* "git merge" once agrain removes directories after the last file has +* "git merge" once again removes directories after the last file has been removed from it during the merge. * "git blame -C -C" no longer segfaults while trying to pass blame if < at >< at > -68,10 +68,10 < at >< at > Fixes since v1.6.0.2 * The "git commit" error message when there are still unmerged files present was clarified to match "git write-tree". -* Some segfaults due to uncaught NULL pointers were fixed multiple +* Some segfaults due to uncaught NULL pointers were fixed in multiple tools such as apply, reset, update-index. -* Solaris bulds now default to OLD_ICONV=1 to avoid compile warnings. +* Solaris builds now default to OLD_ICONV=1 to avoid compile warnings. * "Git.pm" tests relied on unnecessarily more recent version of Perl. < at >< at > -80,7 +80,7 < at >< at > Fixes since v1.6.0.2 * "gitweb" triggered undef warnings on missing trees. * "gitweb" now removes PATH_INFO from its URLs so users don't have - to manually set the url in the gitweb configuration. + to manually set the URL in the gitweb configuration. * Bash completion removed support for legacy "git-fetch", "git-push" and "git-pull" as these are no longer installed. Dashless form

Re: [QGIT PATCH] Add safeguards to Git::userInfo()

Marco Costalba — 2008-10-07T18:03:29

Form git-config(1) docs: This command will fail if: -The config file is invalid, ...... -you use --global option without $HOME being properly set. So please try to comment out following line --- a/src/git.cpp +++ b/src/git.cpp < at >< at > -345,7 +345,7 < at >< at > void Git::userInfo(SList info) { info.clear(); info << "Environment" << user << email; -errorReportingEnabled = false; // 'git config' could fail, see docs +//errorReportingEnabled = false; // 'git config' could fail, see docs run("git config user.name", &user); run("git config user.email", &email); run from double click and you probably will see an error message box where git says $HOME is not set (I can reproduce this now). So what I think is that when you run from command line there is the $HOME variable set and command does not fails. Marco

Re: [xfs-masters] git://oss.sgi.com broke

Andrew Morton — 2008-10-07T17:39:56

It seems OK now, thanks.

Re: [QGIT PATCH] Add safeguards to Git::userInfo()

Abdelrazak Younes — 2008-10-07T17:38:57

So how do you explain this: C:\>git config --global user.name Abdelrazak Younes C:\>git config user.name Abdelrazak Younes I get the same result in any directory, git repo or not. FYI, I never set the name locally, just once and globally. Abdel.

Re: git://oss.sgi.com broke

Andrew Morton — 2008-10-07T17:32:08

Well I was kinda attached to the old format but my world wouldn't end if it went away. Judging from the Next/Trees contents, I suspect that Stephen uses the old convenient/compact/one-per-file form too.

Re: Git and tagging hook

Kristis Makris — 2008-10-07T17:30:02

Why would they cull that other list, if the usual action is to "Reply All" ?

Re: Git and tagging hook

Jakub Narebski — 2008-10-07T17:28:13

If you are talking about taging locally, you can simply make an alias or do something after tagging. Search archives for description when it is worth to add a hook, and when it is not.

Re: Git and tagging hook

Kristis Makris — 2008-10-07T17:13:33

But the post-receive is NOT executed when I apply a tag. I want the integration when I apply the tag to a local repository, NOT only when I push/pull. On Mon, 2008-10-06 at 09:17 +0200, Andreas Ericsson wrote:

Re: [QGIT PATCH] Add safeguards to Git::userInfo()

Abdelrazak Younes — 2008-10-07T17:12:52

Yes, I know that but what is troublesome is that the user and email are not empty when git config is called outside of qgit. What is even more troublesome is that the two calls to 'git config --global user.xxx' fail (but don't fail when called manually at the command line). Abdel.

Re: [QGit bug] git user settings not retrieved when launched for Windows explorer

Abdelrazak Younes — 2008-10-07T17:08:14

OK. No, as I said, 'git config user.name' is working just fine outside git directory. Abdel.

Re: [QGIT PATCH] Add safeguards to Git::userInfo()

Marco Costalba — 2008-10-07T16:55:26

Yes ! it is like this, I have finally had the possibility to test. git config does not returns user and mail if run outside git dir because user and mail are local set.

Re: [QGIT PATCH] Add safeguards to Git::userInfo()

Marco Costalba — 2008-10-07T16:50:46

An empty user and email it does not mean failure. Again, I would think that is git config that returns no data (without failing) if it is run from outside git directory.

Re: Repairing fatal: ref HEAD is not a symbolic ref (git checkout of svn remote)

Jeff Kowalczyk — 2008-10-07T16:49:34

Thanks, and the other svn remotes are working fine. I still have the problem on the svn remote 'branches/1.2'. The following illustrates: (1.2_mybranch) $ git checkout 1.2 Note: moving to "1.2" which isn't a local branch If you want to create a new branch from this checkout, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b HEAD is now at 76c7af2... Minor changes to CONTRIBUTORS (76c7af2...) $ git svn fetch MCONTRIBUTORS MLedgerSMB/AM.pm r2353 = ddd452af128f9b4698a1c1d6cc7fe2f23a0e6c90 (1.2) MLedgerSMB/AM.pm r2354 = fc6857004eeabf6963a9b2856f51db8842c00b70 (1.2) Segmentation fault (fc68570...) $ git checkout 1.2_print_pdf_default Previous HEAD position was fc68570... (commit message snip) Switched to branch "1.2_print_pdf_default" (1.2_print_pdf_default) $ git svn rebase First, rewinding head to replay your work on top of it... Applying: naive replacement to option selected value="pdf" where PDF is format option, Segmentation fault (76c7af2...) $ git svn rebase fatal: ref HEAD is not a symbolic ref First, rewinding head to replay your work on top of it... Fast-forwarded HEAD to refs/remotes/1.2. Segmentation fault This last git svn rebase on 'branches/1.2' (whether it's correct procedure or not for a svn remote) used to work without the error until I issued that one command (git checkout 4a3d99c0c9). Thanks for any suggestions.

Re: [QGit bug] git user settings not retrieved when launched for Windows explorer

Marco Costalba — 2008-10-07T16:48:21

Hi Abdel, I would think it is correct to return isErrorExit == false The problem is that it seems git config return empty data if run from outside git directory...isn't it ? Marco

Re: [PATCH 0/4] diff text conversion filter

Johannes Sixt — 2008-10-07T16:15:24

Jeff King schrieb: I think you are complicating things. We already have diff.doc.command ms-word-diff-script and with your 4-patch-series-under-discussion we would have diff.doc.texconv antiword and that should be sufficient. I'm proposing this heuristics: * If only textconv is given, all porcelains pick it. * If only command is given, all porcelains pick it. * If both are given, then - git log picks textconv. - git show and git diff: . if exactly one pathspec was given, pick command; . otherwise pick textconv Plumbing never picks any of them, just like today, nor should git format-patch. The are other porcelains that could be sorted into this list, like git blame and (the summary line of) git commit. BTW, please don't take git-gui as an example that would lauch MS-Word on each diff. (Neither would gitk.) Both rely on plumbing, and that's good. gitk has a menu entry "External diff", where the diff.doc.command could be hooked into.

[PATCH] git rm: refresh index before up-to-date check

Johannes Schindelin — 2008-10-07T16:08:21

Since "git rm" is supposed to be porcelain, we should convince it to be user friendly by refreshing the index itself. Signed-off-by: Johannes Schindelin gmx.de> --- builtin-rm.c | 1 + t/t3600-rm.sh | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/builtin-rm.c b/builtin-rm.c index 50ae6d5..e06640c 100644 --- a/builtin-rm.c +++ b/builtin-rm.c < at >< at > -137,6 +137,7 < at >< at > int cmd_rm(int argc, const char **argv, const char *prefix) if (read_cache() < 0) die("index file corrupt"); +refresh_cache(REFRESH_QUIET); pathspec = get_pathspec(prefix, argv); seen = NULL; diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 558c80e..66aca99 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh < at >< at > -219,14 +219,23 < at >< at > test_expect_success 'Remove nonexistent file returns nonzero exit status' ' test_expect_success 'Call "rm" from outside the work tree' ' mkdir repo && -cd repo && -git init && -echo something > somefile && -git add somefile && -git commit -m "add a file" && -(cd .. && - git --git-dir=repo/.git --work-tree=repo rm somefile) && -test_must_fail git ls-files --error-unmatch somefile +(cd repo && + git init && + echo something > somefile && + git add somefile && + git commit -m "add a file" && + (cd .. && + git --git-dir=repo/.git --work-tree=repo rm somefile) && +test_must_fail git ls-files --error-unmatch somefile) +' + +test_expect_success 'refresh index before checking if it is up-to-date' ' + +git reset --hard && +test-chmtime -86400 frotz/nitfol && +git rm frotz/nitfol && +test ! -f frotz/nitfol + ' test_done