[PATCH] fast-export: Allow pruned-references in mark file

2012-11-24 Thread Antoine Pelisse
fast-export can fail because of some pruned-reference when importing a mark file. The problem happens in the following scenario: $ git fast-export --export-marks=MARKS master (rewrite master) $ git prune $ git fast-export --import-marks=MARKS master This might fail if some refere

[PATCH v3] send-email: avoid questions when user has an ident

2012-11-24 Thread Felipe Contreras
Currently we keep getting questions even when the user has properly configured his full name and password: Who should the emails appear to be from? [Felipe Contreras ] And once a question pops up, other questions are turned on. This is annoying. The reason it's safe to avoid this question is

Possible vulnerability to SHA-1 collisions

2012-11-24 Thread Michael Hirshleifer
Evil Guy creates 2 files, 1 evil and 1 innocuous, with the same SHA-1 checksum (including Git header). Mr. Evil creates a local branch with an innocuous name like “test-bugfix”, and adds a commit containing a reference to the evil file. Separately, using a sockpuppet, Evil Guy creates an innocu

Know how much to download before clonig

2012-11-24 Thread arif
Hi, Is there any way so that i can tell how much i have to download to obtain a full clone (not a shallow one) of a respository? -- Cheers arif -- 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://vg

[PATCH] Add documentation on how to integrate commands.

2012-11-24 Thread Eric S. Raymond
--- Documentation/CommandIntegration | 69 ++ 1 file changed, 69 insertions(+) create mode 100644 Documentation/CommandIntegration diff --git a/Documentation/CommandIntegration b/Documentation/CommandIntegration new file mode 100644 index 000..be248f7 --

Re: [PATCH] Add documentation on how to integrate commands.

2012-11-24 Thread Pete Wyckoff
e...@thyrsus.com wrote on Sat, 24 Nov 2012 07:23 -0500: > +== Integrating a command == > + > +Here are the things you need to do when you want to merge a new > +subcommand into the git tree. > + > +1. Append your command name to one of the variables BUILTIN_OBJS, > +EXTRA_PROGRAMS, SCRIPT_SH, SCRI

Re: [PATCH] Add documentation on how to integrate commands.

2012-11-24 Thread Eric S. Raymond
Pete Wyckoff : > Nice start. A few other details; I recently did this for git-p4 > (python). > > .gitignore: ignore the auto-generated script, e.g. when > git-foo.py is built into git-foo. > > INSTALL: note language requirements if odd (see python section) > > command-list.txt: categorization o

Re: Possible vulnerability to SHA-1 collisions

2012-11-24 Thread Shawn Pearce
I don't think there is an issue the way you have tried to describe this scenario. On Sat, Nov 24, 2012 at 3:12 AM, Michael Hirshleifer <111...@caltech.edu> wrote: > Evil Guy creates 2 files, 1 evil and 1 innocuous, with the same SHA-1 > checksum (including Git header). Mr. Evil creates a local bra

Re: Know how much to download before clonig

2012-11-24 Thread Shawn Pearce
On Sat, Nov 24, 2012 at 4:02 AM, arif wrote: > Is there any way so that i can tell how much i have to download to > obtain a full clone (not a shallow one) of a respository? Ask the repository owner to tell you? There is no information sent by the server about size of repository, so no, you can'

Re: [PATCH 0/2] second try

2012-11-24 Thread Sven Strickroth
Hi, Am 11.11.2012 17:40 schrieb Sven Strickroth: > Am 06.10.2012 20:28 schrieb Junio C Hamano: >> It is either that it was simply forgotten, or after I wrote the part >> you quoted early in January there were discussions later that showed >> the patch was not desirable for some reason. I do not re

Re: [PATCH] Add documentation on how to integrate commands.

2012-11-24 Thread Eric S. Raymond
Working on my revised patch... Pete Wyckoff : > Nice start. A few other details; I recently did this for git-p4 > (python). > > .gitignore: ignore the auto-generated script, e.g. when > git-foo.py is built into git-foo. Added: 3. If your command is implemented in an interpreted language wi

Python extension commands in git - request for policy change

2012-11-24 Thread Eric S. Raymond
git presently contains one Python extension command, Pete Wycoff's p4 importer. If my git-weave code is merged it will acquire another. I think we can expect more submissions of Python extensions in the future, for two good reasons: 1. Python has a much richer type ontology than shell; there ar

Re: Python extension commands in git - request for policy change

2012-11-24 Thread Eric S. Raymond
Nguyen Thai Ngoc Duy : > These may apply to other languages as well. Where do we draw a line? I'm in favor of the general policy of avoiding scripting languages other than the top three most widely deployed. At the moment that means shell, Python, Perl; on present trends, in a few years Perl (dro

Re: [PATCH] emacs: make 'git-status' work with separate git dirs

2012-11-24 Thread Junio C Hamano
Enrico Scholz writes: > when trying 'M-x git-status' in a submodule created with recent (1.7.5+) > git, the command fails with > > | ... is not a git working tree > > This is caused by creating submodules with '--separate-git-dir' but > still checking for a working tree by testing for a '.git' di

Re: [PATCH] gitk tag delete/rename support

2012-11-24 Thread Junio C Hamano
Leon KUKOVEC writes: > Right clicking on a tag pops up a menu, which allows > tag to be renamed or deleted. > > Signed-off-by: Leon KUKOVEC > --- Thanks, but I prefer not to take patches to gitk-git/ directly; could you prepare a patch against Paul's tree at git://ozlabs.org/~paulus/gitk

Re: [PATCH v3] Completion must sort before using uniq

2012-11-24 Thread Junio C Hamano
Marc Khouzam writes: > The user can be presented with invalid completion results > when trying to complete a 'git checkout' command. This can happen > when using a branch name prefix that matches multiple remote branches. > > For example, if available branches are: > master > remotes/GitHub/

Re: [PATCH] Add documentation on how to integrate commands.

2012-11-24 Thread Michael Haggerty
On 11/24/2012 01:23 PM, Eric S. Raymond wrote: > --- > Documentation/CommandIntegration | 69 > ++ > 1 file changed, 69 insertions(+) > create mode 100644 Documentation/CommandIntegration > > diff --git a/Documentation/CommandIntegration > b/Documentation/