git mailing list

FromSubjectsort iconDate
Scott R Parish
Re: [PATCH] use only the PATH for exec'ing git commands
What can i do here to better accommodate MingW32? You're right, just because the original code did it this way isn't a good excuse for me not to do it better. sRp -
Oct 22, 6:12 pm 2007
Alex Riesen
Re: [PATCH] use only the PATH for exec'ing git commands
someone here mentioned "higher abstractions". Maybe he meant moving the routines operating on path names and path lists out of the generic code into platform specific (like compat/). Maybe he was even going to do that himself, but I could be mistaken -
Oct 22, 6:40 pm 2007
Johannes Schindelin
Re: [PATCH] use only the PATH for exec'ing git commands
Hi, That someone may well have mentioned that term, but what he meant was special case those code paths which have to be treated differently for Windows, and Windows alone. (Yeah, I know, a response to that was that Nokia phones have drive letters, too, but that was an invalid objection to that particular statement, since Nokia phones expect the full path at any time, so I did not even bother answering to that mail. Well, in a way, I guess I just did.) All this boils down to adding c...
Oct 22, 7:34 pm 2007
Alex Riesen
[PATCH] More updates and corrections to the russian translat...
In particular many screw-ups after po regeneration were fixed. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> --- po/ru.po | 362 ++++++++++++++++++++++---------------------------------------- 1 files changed, 127 insertions(+), 235 deletions(-) diff --git a/po/ru.po b/po/ru.po index ed5b67a..b8e9447 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-10-10 04:04-0400\n" -"PO-Revision-...
Oct 22, 4:28 pm 2007
Scott R Parish
Re: [PATCH] use only the PATH for exec'ing git commands
The original code was already doing both of these things (see git.c's prepend_to_path()) sRp -
Oct 22, 3:59 pm 2007
Scott R Parish
Re: [PATCH] use only the PATH for exec'ing git commands
The original code was already doing both of these things (see git.c's prepend_to_path()) sRp -
Oct 22, 3:59 pm 2007
Alex Riesen
Re: [PATCH] use only the PATH for exec'ing git commands
Well, would be nice if your code was better in this respect. Anyway, I suspect the mingw people will trash the code anyway sometime (or not, which is just as well - it is a rare case). -
Oct 22, 4:57 pm 2007
racin
(No subject)
Hello, I found the following on the development version of git.el: saving non-git-managed files in Emacs threw an error. It is due to a simple error in the call to condition-case in a recently added function, git-update-save-file. I attached the patch for your convenience. Regards, Matthieu Lemerre PS: Please Cc me when you ackwowledge; I'm not subscribed to the list. As a matter of fact, I found the bug only because I didn't find git.el for my distribution (debian) so I got directly f...
Oct 22, 2:16 pm 2007
Scott R Parish
[PATCH] "current_exec_path" is a misleading name, use "argv_...
Signed-off-by: Scott R Parish <srp@srparish.net> --- exec_cmd.c | 12 ++++++------ exec_cmd.h | 2 +- git.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/exec_cmd.c b/exec_cmd.c index 9b74ed2..8b681d0 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -5,11 +5,11 @@ extern char **environ; static const char *builtin_exec_path = GIT_EXEC_PATH; -static const char *current_exec_path; +static const char *argv_exec_path = 0; -void git_set_exec_path(...
Oct 22, 1:01 pm 2007
Scott R Parish
[PATCH] use only the PATH for exec'ing git commands
We need to correctly set up PATH for non-c based git commands. Since we already do this, we can just use that PATH and execvp, instead of looping over the paths with execve. This patch adds a setup_path() function to exec_cmd.c, which sets the PATH order correctly for our search order. execv_git_cmd() is stripped down to setting up argv and calling execvp(). git.c's main() only only needs to call setup_path(). Signed-off-by: Scott R Parish <srp@srparish.net> --- exec_cmd.c | 122 +++++++...
Oct 22, 1:01 pm 2007
Alex Riesen
Re: [PATCH] use only the PATH for exec'ing git commands
the default PATH is platform-dependent. Git is multi-platform. You should consider putting the path list somewhere in Makefile, -
Oct 22, 3:01 pm 2007
Eric Merritt
Re: [PATCH] use only the PATH for exec'ing git commands
This static configuration that you describe is one of the things this patch is designed to strip out. Compile time configuration breaks down completly if you don't deploy to the path defined when the system was compiled. Thats a problem. -
Oct 22, 3:25 pm 2007
Johannes Schindelin Oct 22, 1:44 pm 2007
J. Bruce Fields
odd behavior with concurrent fetch/checkout
Just now I checked out a topic branch in my working repo: git checkout server-xprt-switch and while waiting for it to complete (I just started work and caches were all cold), I ran a git fetch origin in another window to update from Linus. The git fetch gave a warning: remote: Generating pack... remote: Counting objects: 7550 remote: Done counting 12885 objects. remote: Result has 8400 objects. remote: Deltifying 8400 objects... remote: 100% (8400/8400) done Indexing 8400 ob...
Oct 22, 12:51 pm 2007
J. Bruce Fields
Re: odd behavior with concurrent fetch/checkout
By the way, I should have said--this is with git version 1.5.3.4.208.gc990. -
Oct 22, 3:46 pm 2007
Jan Wielemaker
git filter-branch --subdirectory-filter error
Hi, Finished a big re-shuffle of a big project, while other developers continued. Worked really well. Thanks guys! But now I have two top directories and I want to create two new repositories, each containing one of these directories (because the one holds copyrighted data and we want the other to become public software). So, I happily run $ git filter-branch --subdirectory-filter RDF HEAD Where RDF is an existing directory. I get: Rewrite 95807fe01c39d3092e3ac3a98061711323154d77 (1/12)fat...
Oct 22, 6:27 am 2007
Johannes Schindelin
Re: git filter-branch --subdirectory-filter error
Hi, I guess that 95807fe01 is the parent of a commit adding the RDF/ directory. The subdirectory filter does not look kindly upon a history where some commits lack the subdirectory in question. However, this should work: git filter-branch --subdirectory--filter RDF 95807fe01..HEAD Hth, Dscho -
Oct 22, 7:20 am 2007
Jan Wielemaker
Re: git filter-branch --subdirectory-filter error
Dscho, Thanks, but ... hmmm. $ git filter-branch --subdirectory-filter RDF 95807fe01c39d3092e3ac3a98061711323154d77..HEAD Rewrite 0a43c802dd60f53d48136a32526a4b2a5f0d43e5 (1/11)fatal: Not a valid object name 0a43c802dd60f53d48136a32526a4b2a5f0d43e5:RDF Could not initialize the index $ git show 0a43c802dd60f53d48136a32526a4b2a5f0d43e5 commit 0a43c802dd60f53d48136a32526a4b2a5f0d43e5 Merge: 49fa961... 95807fe... Author: XXX Date: Thu Oct 18 17:45:26 2007 +0200 Merge branch 'master...
Oct 22, 7:37 am 2007
Johannes Schindelin
Re: git filter-branch --subdirectory-filter error
Hi, It sure sounds pretty tricky. (IOW I'm probably unable to help more...) Ciao, Dscho -
Oct 22, 9:44 am 2007
Andy C
Linear time/space rename logic for *inexact* case
I just subscribed to this list, so sorry I can't respond to the threads already started here. I'm the guy that was mailing Linus about this algorithm to do similarity detection in linear time, mentioned here: Subject: [PATCH] Split out "exact content match" phase of rename detection http://marc.info/?l=git&m=119299209323278&w=2 Subject: [PATCH, take 1] Linear-time/space rename logic (exact renames http://marc.info/?l=git&m=119301122908852&w=2 Jeff, in this message http...
Oct 22, 5:40 am 2007
Jeff King
Re: Linear time/space rename logic for *inexact* case
OK, makes sense (that's what I was trying to propose near the end of my Ah, very clever. I think that should have nice behavior most of the time, though I wonder about a pathological case where we have many files, all very similar to each other, and then have a commit where they all start to diverge, but just by a small amount, while getting moved. We would end up with an artificially low score between renamed files (because we've thrown out all of the commonality) which may lead us to believe ...
Oct 22, 6:34 am 2007
Andy C
Re: Linear time/space rename logic for *inexact* case
Well I do adjust the file sizes when pruning. In the .py demo code you can see it at these lines: for f in filelist: sizes[f] -= 1 The similarity metric depends on the sizes, so that way it won't get out of whack if there are a lot of frequently occurring lines. I did mention that pathological case to Linus. The worst thing is if you have N adds and N deletes and every single file is identical. Well the convenient thing is that the pruning handles this gracefully. *Every* l...
Oct 22, 7:47 pm 2007
Andy C
Re: Linear time/space rename logic for *inexact* case
I think I can make this a lot clearer than I did, while glossing over some details and the line_threshold parameter. 1) Make a "left index" and a "right index" out of the 2 sets of files, { line => [list of docs] }. 2) Remove any lines that appear in more than one doc from the left index. Do the same for the right index. (this corresponds to line_threshold=1 case) 3) For all lines, if the line appears in *both* the left index and the right index, increment the count of the (row=doc from...
Oct 22, 6:09 am 2007
Scott R Parish
[PATCH] s/pattern/prefix/ in help's list_commands
list_commands() currently accepts and ignores a "pattern" argument, and then hard codes a prefix as well as some magic numbers. This renames the arg from pattern to prefix and uses that instead of the hardcoded stuff. Signed-off-by: Scott R Parish <srp@srparish.net> --- help.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/help.c b/help.c index b0d2dd4..950f62d 100644 --- a/help.c +++ b/help.c @@ -93,11 +93,12 @@ static void pretty_print_string_lis...
Oct 22, 4:51 am 2007
Scott R Parish
[PATCH] "git" calls help_unknown_cmd(""); "git help" and "gi...
Signed-off-by: Scott R Parish <srp@srparish.net> --- git.c | 5 ++--- help.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/git.c b/git.c index 853e66c..e1c99e3 100644 --- a/git.c +++ b/git.c @@ -445,9 +445,8 @@ int main(int argc, const char **argv) if (!prefixcmp(argv[0], "--")) argv[0] += 2; } else { - /* Default command: "help" */ - argv[0] = "help"; - argc = 1; + /* The user didn't specify a command; give them help */ + help_unknown...
Oct 22, 4:32 am 2007
Pierre Habouzit
[PATCH] Add some fancy colors in the test library when termi...
Signed-off-by: Pierre Habouzit <madcoder@debian.org> --- Maybe this is just me, but I don't find the output of the test-suite easy to watch while scrolling. This puts some colors in proper places. * end-test summaries are in green or red depending on the sucess of the tests. * errors are in red. * skipped tests and other things that tests `say` are in brown (now you can _see_ that your testsuite skips some tests on purpose, I only noticed recently that I missed part of t...
Oct 22, 4:13 am 2007
Johannes Sixt
Re: [PATCH] Add some fancy colors in the test library when t...
test "x$TERM" != "xdumb" && tput hpa 60 >/dev/null 2>&1 && tput setaf 1 >/dev/null 2>&1 && color=t What if tput is not available, like on Windows? How about this (at the end of the file, so it can obey --no-color): if test "$color"; then say_color () { test "$1" != '-1' && tput setaf "$1" shift echo "* $*" tput op } else say_color() { shift echo "* $*" } color=; shift ;; -- Hannes "We don't need no do...
Oct 22, 4:53 am 2007
Pierre Habouzit
Re: [PATCH] Add some fancy colors in the test library when t...
I answered to it already in my first mail: if tput isn't available, the command fails, and $? is non 0. and nocolor is set. Or color isn't set to 't' for your proposal. --=20 =C2=B7O=C2=B7 Pierre Habouzit =C2=B7=C2=B7O madcoder@debia= n.org OOO http://www.madism.org
Oct 22, 7:24 am 2007
Johannes Sixt
Re: [PATCH] Add some fancy colors in the test library when t...
I was too terse, sorry. I wanted to point out that if tput is not available, the second invocation will leave "tput: command not found" behind on stderr. Therefore, I proposed to make the definition of say_color() different depending on whether $color is set or not. Then you don't need to test for $color twice inside the function. -- Hannes -
Oct 22, 7:35 am 2007
Pierre Habouzit
Re: [PATCH] Add some fancy colors in the test library when t...
Right we can do that. I'll try to rework the patch. and no it shouldn't leave tput: command not found as I 2>/dev/null and I think the shell doesn't print that in that case. At least my zsh doesn't. --=20 =C2=B7O=C2=B7 Pierre Habouzit =C2=B7=C2=B7O madcoder@debia= n.org OOO http://www.madism.org
Oct 22, 8:11 am 2007
Johannes Sixt
Re: [PATCH] Add some fancy colors in the test library when t...
^^^^^^^^ There is no 2>/dev/null. Am I missing something? -- Hannes -
Oct 22, 8:18 am 2007
Pierre Habouzit
Re: [PATCH] Add some fancy colors in the test library when t...
Oooh, good catch :P it should be guarded by a [ "$nocolor" =3D 0 ] I was. --=20 =C2=B7O=C2=B7 Pierre Habouzit =C2=B7=C2=B7O madcoder@debia= n.org OOO http://www.madism.org
Oct 22, 9:45 am 2007
Scott R Parish
[PATCH] don't set-group-id on directories on apple
"git init --shared=all" was failing because chmod was returning EPERM. According to the man page, the set-group-id behavior is already default: man 2 mkdir: The directory's group ID is set to that of the parent directory in which it is created. Signed-off-by: Scott R Parish <srp@srparish.net> --- path.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/path.c b/path.c index 4260952..4089753 100644 --- a/path.c +++ b/path.c @@ -282,8 +282,10 @@ int adjust_...
Oct 22, 3:55 am 2007
Johannes Schindelin
Re: [PATCH] don't set-group-id on directories on apple
Hi, Not here. This is git version 1.5.3.rc4.1716.gc3498, and "uname -a" says Darwin michael-stirrats-mac-mini.local 8.10.0 Darwin Kernel Version 8.10.0: Wed May 23 16:50:59 PDT 2007; root:xnu-792.21.3~1/RELEASE_PPC Power Macintosh powerpc Is it possible that you have stricter permission settings? Or that you try to re-initialise a repository that somebody else initialised originally? Ciao, Dscho -
Oct 22, 10:16 am 2007
Scott Parish
Re: [PATCH] don't set-group-id on directories on apple
This is a possibility, but i have no idea what that might be. I've tried googling around without any luck (except for a post about No, this was a failure when running tests (t1301-shared-repo.sh) sRp -- Scott Parish http://srparish.net/ -
Oct 22, 10:29 am 2007
Karl
Re: [PATCH] Let users override name of per-directory ignore ...
I agree with what you're trying to do, but you're ignoring the fact that Subversion's ignore patterns (and possibly cvs's too -- I haven't checked) are not recursive, while the patterns in .gitignore are recursive per default. So using ignore patterns directly from Subversion ignores more files under git than the same patterns did under Subversion. One possible way to solve that would be to optionally have non-recursive per-directory ignore files. I haven't looked at how this is implemented, tho...
Oct 22, 6:50 am 2007
Andreas Ericsson
Re: [PATCH] Let users override name of per-directory ignore ...
Yes, I just got bitten by this. The top-level .cvsignore file ignores Makefile (since it's generated from ./configure), but Makefile exists in several subdirectories where it's *not* generated, but adding !Makefile to all those places doesn't sit too well with some of the project maintainers, and cvs doesn't grok /Makefile to mean "toplevel Makefile" I'll have a look at it. Thanks for the review. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB ...
Oct 22, 7:18 am 2007
Johannes Schindelin
Re: [PATCH] git-format-patch: Don't number patches when ther...
Hi, I think you should not use "-n" if you do not want to have the numbers. In circumstances as yours, where you can have patch series larger than one, I imagine that the "[PATCH 1/1]" bears an important information, which is not present in "[PATCH]": this patch series contains only one patch. IOW I do not like your patch: too much DWIDNS (Do What I Did NOT Say) for me. Ciao, Dscho -
Oct 22, 5:44 am 2007
Andreas Ericsson
Re: [PATCH] git-format-patch: Don't number patches when ther...
This stems from creating scripts around it where I only want to see the numbers if there is more than a single patch. Currently I can't do that without running git-format-patch twice or re-implementing the revision parsing machinery to count revisions prior to passing arguments to That's sort of implicit in [PATCH], since all patch-series added by the tool I'm scripting will have [PATCH n/m], while I'd prefer for Would a separate option be acceptable to you? It doesn't have to be fancy ...
Oct 22, 6:14 am 2007
Johannes Schindelin
Re: [PATCH] git-format-patch: Don't number patches when ther...
Hi, Why not have something as simple as numbered= test $(git rev-list $options | wc -l) -gt 1 && numbered=-n [...] git format-patch $numbered $options At the moment, the semantics of "--numbered" is really clear and precise. And I really like that. It makes for less surprises. Ciao, Dscho -
Oct 22, 6:22 am 2007
Andreas Ericsson
Re: [PATCH] git-format-patch: Don't number patches when ther...
Because 23498~12 != 23498~12..HEAD to git rev-list, but it is to git-format-patch, meaning I'll have to duplicate the logic in every script that's supposed to use it or risk introducing a third way of Semantics could be equally clear for --numbered-if-multiple. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 -
Oct 22, 7:13 am 2007
Brian Dessent
Re: [PATCH] Be nice with compilers that do not support runti...
According to the NEWS file, $(call) was added to GNU make v3.78, released 1999-09-22. Brian -
Oct 22, 2:52 am 2007
Shawn O. Pearce
What's cooking in git/spearce.git (topics)
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The topics list the commits in reverse chronological order. * cc/skip (Mon Oct 22 07:49:39 2007 +0200) 9 commits - Bisect: add a "bisect replay" test case. - Bisect: add "bisect skip" to the documentation. - Bisect: factorise "bisect_{bad,good,skip}" into "bisect_state". - Bisect: factorise some logging into "bisect_write". - Bisect: factorise "bisect_write_...
Oct 22, 2:32 am 2007
Steffen Prohaska
Re: What's cooking in git/spearce.git (topics)
It's not ready for next. Especially the last patch in the list changes the existing behaviour in a way that might be unexpected by longtime git users. And maybe we even need for the 1.6 cycle I planned to draw a conclusion from the discussion in http://marc.info/?l=git&m=119286893014690&w=2 and send an updated proposal based on what I learnt. But unfortunately I didn't have time yet. My impression now is that the details of the behaviour of "git push" are hard to understand and s...
Oct 22, 11:27 am 2007
Pierre Habouzit
Re: What's cooking in git/spearce.git (topics)
You also can ask me to resubmit them when the first round of parseopt is merged. I'm actually waiting for that before I work on it again (that's not the sole reason, $work ate my time as well, so I'm not pressuring ;P) and I can send those again when things are more ready for them. Like I said to you on IRC, I intend to hack a way to ask parse-options to dump its options in a machine parseable way, to help {z,ba}sh completions authors. And obviously I intend to migrate even more builtins :) ...
Oct 22, 3:24 am 2007
Jeff King
Re: What's cooking in git/spearce.git (topics)
Hrm, the problem is that it's not favoring basenames anymore. But I think it is because the loop in find_identical_files is inside out. For every source file, it picks the best destination file. But I think we want to do the opposite: for every destination file, pick the best source file. Otherwise, if a non-basename source file is connected with a particular destination file, we no longer try that destination file again. Patch is below (please just squash with the one from Linus). diff --git ...
Oct 22, 3:16 am 2007
Jeff King
Re: What's cooking in git/spearce.git (topics)
I will eventually get around to rewriting this (it seems the list comments have died down), but it is much more interesting to play with Linus' rename stuff tonight. :) If somebody else wants to take a stab, please go ahead. -Peff -
Oct 22, 2:59 am 2007
Shawn O. Pearce
What's in git/spearce.git (stable)
For those who may be new to the git/spearce.git concept I'm filling in for Junio and have published a tree on repo.or.cz: git://repo.or.cz/git/spearce.git http://repo.or.cz/r/git/spearce.git ------ * The 'maint' branch has these fixes since the last announcement. Alex Bennee (1): Ensure we add directories in the correct order Andrew Clausen (1): helpful error message when send-pack finds no refs in common. Brian Gernhardt (1): cvsserver: Use exit 1 instead of die when req_Ro...
Oct 22, 2:11 am 2007
Christian Couder
[PATCH 9/9] Bisect: add a "bisect replay" test case.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- t/t6030-bisect-porcelain.sh | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index db82259..16d0c4a 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -167,6 +167,13 @@ test_expect_success 'bisect skip: add line and then a new test' ' git bisect skip && git bisect good > my_bisect_log.txt && ...
Oct 22, 1:49 am 2007
Christian Couder
[PATCH 8/9] Bisect: add "bisect skip" to the documentation.
Also fix "bisect bad" and "bisect good" short usage description. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- Documentation/git-bisect.txt | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 1072fb8..785f381 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -16,8 +16,9 @@ The command takes various subcommands, and different options depend...
Oct 22, 1:49 am 2007
previous daytodaynext day
October 21, 2007October 22, 2007October 23, 2007