Re: "git checkout" safety feature

2018-11-04 Thread Matthias Urlichs
– like "alias rm rm -i". -- -- Matthias Urlichs signature.asc Description: OpenPGP digital signature

"git checkout" obliterates not-yet-ignored files

2018-11-04 Thread Matthias Urlichs
es will be obliterated. IMHO that's a bug – .gitignore should only be used for (not) adding non-version-controlled files. It does not tell git to ignore changes (in files that *are* under version control), and thus it should not allow any git command to simply overwrite a file. -- -- M

"git checkout" safety feature

2018-11-04 Thread Matthias Urlichs
o so in half an hour ;-) -- -- Matthias Urlichs signature.asc Description: OpenPGP digital signature

Re: Shallow clones with explicit history cutoff?

2014-08-22 Thread Matthias Urlichs
Hi, Duy Nguyen: > On Thu, Aug 21, 2014 at 10:39 PM, Matthias Urlichs > wrote: > > What I would like to have, instead, is a version of shallow cloning which > > cuts off not at a pre-determined depth, but at a given branch (or set of > > branches). In other words, given

Shallow clones with explicit history cutoff?

2014-08-21 Thread Matthias Urlichs
asonable chance of landing in git and (b) nobody beats me to it. ;-) -- -- Matthias Urlichs -- 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

SVN import issue

2005-08-26 Thread Matthias Urlichs
SVN merge looks like. Nothing stops a SVN check-in from touching multiple branches at the same time, though in practice that doesn't happen. The mapping of SVN revision numbers to git SHA1s could get a bit annoying because incremental imports need to work. Personally I'd use a .svnm

Re: [RFC] Looking at multiple ancestors in merge

2005-08-25 Thread Matthias Urlichs
a merge base per file instead of globally. I suspect that many of the problem cases simply go away when you do that. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - Jones' Second

SVN import

2005-08-19 Thread Matthias Urlichs
Quick note: I'm working on importing from SVN. My current main problem is that SVN's Perl interface leaks server connections (apparently nobody has used it for any real work yet), which is of course *bad*, and kindof prevents me from finishing the job today. :-/ -- Matthias Urlichs

Re: Subject: [PATCH] Updates to glossary

2005-08-18 Thread Matthias Urlichs
Hi, Johannes Schindelin wrote: > Subject: Subject: [PATCH] Updates to glossary Something is stuttering here -- one "Subject:" is quite sufficient. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. R

Re: Small team cogito/git setup

2005-08-18 Thread Matthias Urlichs
that it avoids duplicate work and shifting blame for broken software, particularly if you have a test suite. My workflow is "develop, test, check-in, pull-and-merge, test-if-merged, push". That tends to yield a saner change history, and requires less work, than doing it for every co-worke

Re: Git 1.0 Synopis (Draft v4)

2005-08-18 Thread Matthias Urlichs
t to teaching it about parsing the index file. Technically, that would require a stable libgit.so or so. In reality, however, I don't know when I last had a tree which wasn't fully populated, but it's been a while, and it's something that can be readily fixed by "git-checkout-ca

Re: [PATCH] Add merge detection to git-cvsimport

2005-08-17 Thread Matthias Urlichs
Hi, Martin Langhoff wrote: > this one is the > most likely one to be from a bug in cvsps or the cvsimport logic. That's not a bug in the import logic, just a failure of the CVS-merging person to be consistent. (Which is hardly news. :-/ ) -- Matthias Urlichs | {M:U} IT Design

Re: gitk with hyperspace support

2005-08-17 Thread Matthias Urlichs
ars directly below a node, you don't get that problem. Another point I just noticed: The arrows should be directly below each other, if at all possible; i.e. the one pointing up should be in the same column as the corresponding arrow pointing down. -- Matthias Urlichs | {M:U} IT D

Re: gitk with hyperspace support

2005-08-17 Thread Matthias Urlichs
tcommitlines file23" Another problem: when I click on a line, I get the parent and *all* its children, not just the child(ren) on the other end of the segment I was clicking on. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was select

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Matthias Urlichs
after finding the relevant heads manually, you can use .git/info/grafts to fake it. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - As crazy as hauling timber into the woods.

[PATCH] cvsgit fixes: spaces in filenames and CVS server dialog woes

2005-08-15 Thread Matthias Urlichs
{ + } elsif($state == 9 and /^\s+(.+?):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) { my $fn = $1; $fn =~ s#^/+##; push(@old,$fn); + print "Delete $fn\n" if $opt_v; } elsif($state == 9 and /^\s*$/) { $s

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Matthias Urlichs
subtrees from one CVS repository into a different one). -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - I hope you will find the courage to keep on living despite the existence of this fea

Re: [RFC][PATCH] Rewriting revs in place in push target repository

2005-08-14 Thread Matthias Urlichs
c in any real conditions? > > if you journal metadata only you can see a file extended w/o having > the block flushed ??? but the file is *not* extended. Also, whether or not a block is flushed should only matter if the machine crashes ..? -- Matthias Urlichs | {M:U} IT Design

Re: [PATCH] Debian packaging for 0.99.4

2005-08-13 Thread Matthias Urlichs
Hi, Ryan Anderson: > > #!/bin/sh > echo "Don't get a git - use gt! Ouch. > echo "Don't get a git - use gt!" >&2 if at all. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The

Re: gitweb - feature request

2005-08-12 Thread Matthias Urlichs
the old RSS, then trim appropriately. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - You judge the acts of others only by their intentions. - To unsubscribe from this list: send the line &q

Re: [PATCH] fetch-pack: start multi-head pulling.

2005-08-12 Thread Matthias Urlichs
Hi, Junio C Hamano wrote: > I have been trying, admittably perhaps not very successfully, to > stay away from bashism in the core GIT scripts. We should probably use #!/bin/bash for scripts with bashisms... -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disc

Re: [PATCH] Debian packaging for 0.99.4

2005-08-12 Thread Matthias Urlichs
Hi, Martin Langhoff: > It is correct to have Architecture: i386, as you'd naturally have > multiple binary packages. However, git(-t)k doesn't contain any i386 code, just a tk script. > Packages with arch 'all' are interpreted languages. Exactly. ;-) -- Matthias

[PATCH] more Debian packaging fixes

2005-08-12 Thread Matthias Urlichs
git-tk should be architecture independent. git-core forgot to depend on perl. Signed-Off-By: Matthias Urlichs <[EMAIL PROTECTED]> --- Hi, Junio C Hamano: > Matthias Urlichs <[EMAIL PROTECTED]> writes: > > > - Split gitk off to its own package; > > it needs tk in

Re: [PATCH] Debian packaging for 0.99.4

2005-08-12 Thread Matthias Urlichs
a quick way to type an ä. Or α. Or ૐ. ;-) -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - The hope that springs eternal Springs right up your behind. -- Ian Drury, &q

Re: [PATCH] Debian packaging for 0.99.4

2005-08-12 Thread Matthias Urlichs
name? IIRC, that's against Policy too, because different users on the system might have different expectations WRT which git is git. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - -

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Matthias Urlichs
usr/bin/gitscm (or whatever) if they want to use the "normal" name... that's probably the only solution which would work reasonably well without being too much hassle to implement. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The q

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Matthias Urlichs
e installed, via the existing "alternatives" system. (The install scripts to Gnu Interactive Tools should of course do the same thing.) -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de -

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Matthias Urlichs
quick grep told me). I'd vote to keep the scripts in the default build, so that people who like to compile their own package (i.e. everybody _except_ the Debian packager ;-) get to keep their git and cg scripts. A small Debian-specific patch to rename the offending scripts (and drop the Conf

Re: [PATCH] Teach git push .git/branches shorthand

2005-08-11 Thread Matthias Urlichs
kernel.org:/pub/scm/git/git.git/ >>Fetch-Reference: master:ko-master pu:ko-pu rc:ko-rc >>Push-Reference: master pu rc idea. A lot. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.

gitk: integer overflow

2005-08-11 Thread Matthias Urlichs
bits ..? -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - You know things are bad when you're surrounded by four lawyers, and none of them is yours. - To unsubscribe from this list:

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Matthias Urlichs
t and can't run all the "git xxx" commands we talk about here. Same with cgvg, cogito, and cg. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - The girl who remember

[PATCH] update Debian packaging for cogito

2005-08-11 Thread Matthias Urlichs
Cleaned up Debian files. + * Conflict with cgvg instead of not installing cg. + * Pass prefix=/usr to "make install". + + -- Matthias Urlichs <[EMAIL PROTECTED]> Thu, 11 Aug 2005 12:17:32 +0200 + cogito (0.12.1-1) stable; urgency=low * new version 0.12.1 (needed in order

Re: [PATCH] Debian packaging for 0.99.4

2005-08-10 Thread Matthias Urlichs
Hi, Martin Langhoff: > On 8/11/05, Matthias Urlichs <[EMAIL PROTECTED]> wrote: > > Debian packaging fixes for 0.99.4: > > Is this anywhere in the archive? > Cogito 0.12.1 (which includes git) has been packaged by Sebastian Kuzminsky <[EMAIL PROTECTED]>; it's

[PATCH] Debian packaging for 0.99.4

2005-08-10 Thread Matthias Urlichs
elog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-core (0.99.4-1) unstable; urgency=low + + * Lots and lots of changes. + + -- Matthias Urlichs <[EMAIL PROTECTED]> Wed, 10 Aug 2005 23:18:34 +0200 + git-core (0.99-2) unstable; urgency=low * Co

Re: Template files location

2005-08-10 Thread Matthias Urlichs
otherwise. I don't see why git should be different. Why make *everybody* unhappy if we can avoid it? -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - Grain grows best in shit

Re: Request for help from binary packaging people.

2005-08-10 Thread Matthias Urlichs
s are not installed? If some scripts break, that's a Bad Thing, and would require those packages to be moved to Depends:. > Earlier I said that > the Debian side is reasonably accurate to the best of my knowledge, but I > would appreciate it if somebody ran lintian on it. Will do

Re: [PATCH 1/3] Add git-send-email-script - tool to send emails from git-format-patch-script

2005-08-03 Thread Matthias Urlichs
e: header and add a second for each email. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - Be careful whilst playing under the anvil tree. - To unsubscribe from this list: send the line &

Re: [PATCH 1/3] Add git-send-email-script - tool to send emails from git-format-patch-script

2005-08-01 Thread Matthias Urlichs
Hi, Junio C Hamano wrote: > Also, I wonder if running lc() to downcase the local-part[*] is > safe/allowed/correct mostly/no/no. It's unlikely to be a real-life problem, but we still shouldn't do it. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED]

Re: git diffs

2005-08-01 Thread Matthias Urlichs
to (but slower than) git checkout -f -b merge-branch master ? -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - You can tell it's going to be a rotten day when the bird sing

Re: [PATCH 1/3] Add git-send-email-script - tool to send emails from git-format-patch-script

2005-07-31 Thread Matthias Urlichs
necessary. As it is, patch N hangs off patch N-1 in my email threading view, which gets slightly cumbersome if N>10. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - Nothing makes a per

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-07-30 Thread Matthias Urlichs
Hi, Junio C Hamano wrote: > Introduce a new file $GIT_DIR/info/grafts Nice work. Has anybody git-imported the old tarfile+patch history yet? If not, I'll do it over the weekend. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was

Re: [PATCH 2/2] Unify usage strings declaration

2005-07-29 Thread Matthias Urlichs
is one of the reasons optimizing compiled C is somewhat more challenging than, say, FORTRAN. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - Giving every man a vote has no more made m

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-07-29 Thread Matthias Urlichs
the remote branch, or maybe the remote repo is *not* under my direct control, e.g. a shared-master style setup. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - :munch: vt. [often confused

[PATCH] document git-rev-list better

2005-07-29 Thread Matthias Urlichs
Document new (and not-so-new) flags of git-rev-list. Signed-off-By: Matthias Urlichs <[EMAIL PROTECTED]> --- diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -9,14 +9,35 @@ git-re

Re: [RFC] extending git-ls-files --exclude.

2005-07-29 Thread Matthias Urlichs
Hi, Petr Baudis: > Dear diary, on Thu, Jul 28, 2005 at 09:25:45PM CEST, I got a letter > where Matthias Urlichs <[EMAIL PROTECTED]> told me that... > > Hi, A Large Angry SCM wrote: > > > > > So you're arguing for "last match wins" versus "fir

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-07-28 Thread Matthias Urlichs
le use different porcelains. At minimum, you'd send the old branch head with the new one, and let the server not overwrite it if it changed in the meantime. Then, you'd kill porcelain writers who don't verify that the old head is a(n indirect) parent of the new one. ;-) -- Matthi

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-07-28 Thread Matthias Urlichs
rent people run "git repack". Not everybody has 100-GB disks and multi-MB Internet pipes to play with... -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - On ability: A d

Re: [RFC] extending git-ls-files --exclude.

2005-07-28 Thread Matthias Urlichs
nyway, so why ... oh, HTML files are junked, OK, so ... now ... umm, what did I want to find out in the first place?") It gets even more confusing when you're lazy and omit the .html suffix in the second line. YMMV, and all that. -- Matthias Urlichs | {M:U} IT Design @ m-u

Re: [PATCH/RFC] "Recursive Make considered harmful"

2005-07-28 Thread Matthias Urlichs
Hi, Petr Baudis wrote: > having all the targets for all the subdirectories in a > single file sounds nightmarish which is why you'd include Makefile[.inc] snippets from subdirectories instead. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer

Re: [PATCH/RFC] "Recursive Make considered harmful"

2005-07-28 Thread Matthias Urlichs
er mess (which includes yet another Debian package for Cogito ;-). -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - A zealot's stones will break my bones, but gods will never hurt me.

Re: [PATCH] git-cvsimport-script: parse multidigit revisions

2005-07-25 Thread Matthias Urlichs
to rearrange stuff in a way the CVS utilities don't understand, so any higher-level access than "grab a bunch of files by their revision number and stick them into a commit" don't work in real life. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Di

Re: Problems Importing a CVS tree into FAUmachine

2005-07-25 Thread Matthias Urlichs
ut/Pic3.ppm:INITIAL->1.1 > If there's no lib/pattern-matcher/input/Pic0.ppm,v nor lib/pattern-matcher/input/Attic/Pic0.ppm,v file ... > But I see the PatchSet if I run cvsps manually. Very strange. > ... then, congratulations, you've found a bug in cvsps. Please talk to it

Re: "git cvsimport" with branches?

2005-07-17 Thread Matthias Urlichs
s lost. Umm, exactly what did you do to visualize that? "gitk origin" obvioously shows only one branch, because CVS doesn't have merge infe. Use "gitk $(cat .git/revs/heads/*)" to show everything. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECT

Re: [PATCH] git-diff-*: Allow "--name-only -z" as alias for "--name-only-z"

2005-07-14 Thread Matthias Urlichs
> Hmm? > Sure -- assuming I find some time to actually do it over the next few days. The problem is that this has been a problem lately. :-/ -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.nori

Re: [PATCH] git-diff-*: Allow "--name-only -z" as alias for "--name-only-z"

2005-07-14 Thread Matthias Urlichs
Hi, Junio C Hamano: > I've considered it, but what happens if you give -z first and > then name-only? > Exactly the same thing as vice versa. Or, even more exactly, my patch *makes* that happen. ;-) -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] D

[PATCH] git-diff-*: Allow "--name-only -z" as alias for "--name-only-z"

2005-07-14 Thread Matthias Urlichs
rgv) continue; } if (!strcmp(arg, "-z")) { - diff_output_format = DIFF_FORMAT_MACHINE; + if (diff_output_format == DIFF_FORMAT_NAME) + diff_output_format = DIFF_FORMAT_NAME_Z; +

Re: Patch to make README more newbie-friendly

2005-07-14 Thread Matthias Urlichs
erge two The first merge fast-forwards your master tree to "one"; the second creates a conflict (lines were added at the same location) which you'll have to resolve (edit the file). vi testfile echo Merged one and two | cg-commit gitk -- Matthias Urlichs | {M:U} IT Design @ m-u-i

Re: [RFC PATCH] cogito --- don't overwrite metadata files in place (breaks CoW use)

2005-07-13 Thread Matthias Urlichs
esac fi first. > # dangling link, just poke as-is > echo "$1" > "$DEST" You should remove "DEST first. Otherwise, under Linux, you'll magically create the file the symlink points to, which may not be what y

Re: Is cogito really this inefficient

2005-07-13 Thread Matthias Urlichs
ted as it finds that the files are in sync, so expect this to be significantly faster the next time around. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - Praise the sea; on shore

Re: [PATCH] stgit: allow spaces in filenames

2005-07-13 Thread Matthias Urlichs
Hi, Bryan Larsen wrote: > + r=os.spawnvp(os.P_WAIT, args_l[0], args_l + args[i:min(i+1000, > len(args))]) The max length for argv is 32k IIRC, so 1000 is 28-byte file names. That's probably not enough. I't suggest using chunks of 100. -- Matthias Urlichs | {M:U} IT De

Re: [RFC PATCH] cogito --- don't overwrite metadata files in place (breaks CoW use)

2005-07-13 Thread Matthias Urlichs
Hi, Chris Wedgwood wrote: > Symlink'd trees don't really make sense to me (they seem fragile and > somewhat pointless) but perhaps I'm missing something? You are ;-) the tree itsels is no symlinked, but HEAD points to refs/heads/ by default. Don't clobber that, ple

Re: Compilation troubles

2005-07-12 Thread Matthias Urlichs
Hi, Dan Kohn wrote: > UBUNTU 5.04 You want zlib1g-dev, libssl-dev, asciidoc, xmlto, libcurl3-dev. I'll prepare a patch to do a simple set of Debian packages (so that "make debian" works) for git(k)/cogito. I already use them locally, but that branch is too unclean. :-/ --

Re: [PATCH] git-cvsimport-script: parse multidigit revisions

2005-07-12 Thread Matthias Urlichs
Hi, Sven Verdoolaege: > Previously, git-cvsimport-script would fail > on revisions with more than one digit. > Ouch. Thanks. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - W

Re: Bootstrapping into git, commit gripes at me

2005-07-12 Thread Matthias Urlichs
hecked out. * If HEAD is not a symlink, then switching to a branch HEAD is not a part of should emit a warning. ("fsck to find the dangling commits" is not an answer ;-) Ideas like * remember the branch to un-seek back to or * treat HEAD as read-only when there's a seek active se

Re: Why is there no git-update-cache --modified (aka I give up)

2005-07-12 Thread Matthias Urlichs
Hi, Marc Singer wrote: > # git-update-cache `git-diff-cache | cut -f2` g-d-c should have an option to print file names only. All that cutting and argument-backtick-ing gets pretty nasty when there are a lot of files, or if they contain special characters. -- Matthias Urlichs | {M:U}

Re: [PATCH 3/6] git-gnu-progs-Makefile: git Makefile update

2005-07-12 Thread Matthias Urlichs
d symlink them with their "real" names there. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - Go directly to jail. Do not pass Go, do not collect $200. - To unsubscribe from th

[PATCH] document CVS vs. git tags

2005-07-12 Thread Matthias Urlichs
CVS uses tags for lots of things. Git doesn't. Document that, so people may understand. diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt --- a/Documentation/cvs-migration.txt +++ b/Documentation/cvs-migration.txt @@ -230,3 +230,33 @@ that contain this changed "if" sta

Re: How to get a directory filled with v2.6.11?

2005-07-11 Thread Matthias Urlichs
Hi, Marc Singer wrote: > v2.6.11, 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c You can create your own parent-less commit for that tree. (It's what I did...) -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really

Re: Bootstrapping into git, commit gripes at me

2005-07-09 Thread Matthias Urlichs
problems. I'd suggest that you apply the patch to whatever version it is based on... > o Is there a way to force git to apply and safe the rejects? Well, you can use "patch -p1 ..." directly, and manually add the files it created to the object cache. Personally I wouldn't, i

Re: Tags

2005-07-06 Thread Matthias Urlichs
in one bag and then say "gitk bad ^good". OTOH, I dunno whether the core tools really need to understand that. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - If at firs

Re: cvsimport: rewritten in Perl

2005-07-06 Thread Matthias Urlichs
of Python programming is that I tend not to see this kind of problem any more, because in Python it Simply Doesn't Happen. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - Conscience

Merging and parents

2005-07-05 Thread Matthias Urlichs
.. OK, document) the problem? -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - I'm thankful I didn't believe in God, because it would have been another thing for me to conquer.

Re: [PATCH] cvsimport: rewritten in Perl

2005-07-04 Thread Matthias Urlichs
an argument (compression level), cvsps' -Z doesn't) that may not actually make sense. *Shrug* I'm too happy when other people improve my tools to get hung up on details like that. ;-) -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote

Re: [PATCH] cvsimport: rewritten in Perl

2005-07-04 Thread Matthias Urlichs
Hi, Sven Verdoolaege: > Why not an explicit '-z' option as in the current git-cvsimport-script ? Because my code doesn't support compressed cvs connections: a -z that doesn't work except for the rlog part would be a lie. Feel free to add that code. ;-) -- Matthias

Re: [PATCH] Add DEST Makefile variable

2005-04-21 Thread Matthias Urlichs
install foobar $(DESTDIR)$(BINDIR)/ > That doesn't make sense; if you set DESTDIR, you are not going to install in $HOME. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe git" in the body of

Re: [PATCH] Missing linefeeds

2005-04-21 Thread Matthias Urlichs
Hi, Petr Baudis: > Why? report() already prints linefeed. > Ah, it didn't when I wrote this. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [

Re: Switching between branches

2005-04-21 Thread Matthias Urlichs
build process might have changed that it shouldn't have.) Cf. the last of the patches I've just mailed to the list. -- Matthias Urlichs - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] Allow "git cancel" to change branches

2005-04-21 Thread Matthias Urlichs
"git cancel" may not be named correctly for this job, but it does almost everything you'd need for switching between one branch and another within a repository, so... Signed-Off-By: Matthias Urlichs <[EMAIL PROTECTED]> --- f29be8140c5f1175052ec96ad2fa2b2901fd6ba5/gi

[PATCH] Improve usage messages

2005-04-21 Thread Matthias Urlichs
This patch adds somewhat-improved usage messages to some of Linus' programs. Specifically, they now handle -? / --help. Signed-Off-By: Matthias Urlichs <[EMAIL PROTECTED]> Index: ch

[PATCH] Add "git push"

2005-04-21 Thread Matthias Urlichs
This patch adds the ability to "git push", as the obvious converse of "git pull". Signed-Off-By: Matthias Urlichs <[EMAIL PROTECTED]> Index: git === --- 42a073eb6b5bb397a3e8768a032463a7fa02e6

[PATCH] Missing quotes

2005-04-21 Thread Matthias Urlichs
gitXnormid.sh should quote its cat-file calls so that nonexisting ssha1 IDs don't result in shell errors. Signed-Off-By: Matthias Urlichs <[EMAIL PROTECTED]> --- 42a073eb6b5bb397a3e8768a032463a7fa02e6b9/gitXnormid.sh (mode:100755 sha1:c0d53afabe8662ebfc3c697faf08b

[PATCH] Missing linefeeds

2005-04-21 Thread Matthias Urlichs
This patch fixes die() and error() to print linefeeds after the message. Signed-Off-By: Matthias Urlichs <[EMAIL PROTECTED]> --- 42a073eb6b5bb397a3e8768a032463a7fa02e6b9/usage.c (mode:100644 sha1:e774d2ef32726af0707d817cdb63fc8751ddc9d8) +++ 265515f9c4f089b1b61e9d2312c4b3babe189618/u

[PATCH] Add DEST Makefile variable

2005-04-21 Thread Matthias Urlichs
This patch changes the Makefile to add a DEST variable (still defaulting to ~/bin/) so that people (or scripts) can trivially install git Somewhere Else. Signed-Off-By: Matthias Urlichs <[EMAIL PROTECTED]> --- 42a073eb6b5bb397a3e8768a032463a7fa02e6b9/Makefile (mode:100644

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Matthias Urlichs
avoid namespace collisions. -- Matthias Urlichs - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html