Re: [PATCH] git.txt: update description of the configuration mechanism

2013-02-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.02.2013 19:03: Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: But the exact location of per-user and per-repository configuration files does not matter in this context and is best left to the git-config

Re: [PATCH 1/5] gpg-interface: check good signature in a reliable way

2013-02-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.02.2013 18:22: Michael J Gruber g...@drmicha.warpmail.net writes: Currently, verify_signed_buffer() only checks the return code of gpg, and some callers implement additional unreliable checks for Good signature in the gpg output meant for the user. Use

Re: [BUG] Veryfing signatures in git log fails when language is not english

2013-02-14 Thread Michael J Gruber
XANi venit, vidit, dixit 14.02.2013 01:18: Hi, any functionality that depends on exact exit msg of program can potentially fail because of that ᛯ export |grep LANG declare -x LANG=pl_PL.UTF-8 ᛯ ~/src/os/git/git log --format=%G? %h |head -2 0d19377 5b9d7f8 ᛯ unset LANG ᛯ

[PATCH 0/5] gpg_interface: use the status

2013-02-14 Thread Michael J Gruber
is important for assigning trust. All existing tests pass with this. BTW: git branch --set-upstream-to= coredumps when on a detached head. Michael J Gruber (5): gpg-interface: check good signature in a reliable way log-tree: rely upon the check in the gpg_interface gpg_interface: allow to request

[PATCH 1/5] gpg-interface: check good signature in a reliable way

2013-02-14 Thread Michael J Gruber
of checking for a good gpg signature. If needed we can change this easily to [GNUPG:] VALIDSIG if we want to take into account the trust model. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- gpg-interface.c | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff

[PATCH 2/5] log-tree: rely upon the check in the gpg_interface

2013-02-14 Thread Michael J Gruber
It's just so much betterer. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- log-tree.c | 25 +++-- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/log-tree.c b/log-tree.c index 5dc45c4..912fe08 100644 --- a/log-tree.c +++ b/log-tree.c @@ -508,20

[PATCH 3/5] gpg_interface: allow to request status return

2013-02-14 Thread Michael J Gruber
Currently, verify_signed_buffer() returns the user facing output only. Allow callers to request the status output also. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/fmt-merge-msg.c | 2 +- builtin/verify-tag.c| 2 +- gpg-interface.c | 11 +++ gpg

[PATCH 4/5] pretty: parse the gpg status lines rather than the output

2013-02-14 Thread Michael J Gruber
-by: Michael J Gruber g...@drmicha.warpmail.net --- pretty.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pretty.c b/pretty.c index 2a1e174..973b912 100644 --- a/pretty.c +++ b/pretty.c @@ -759,6 +759,7 @@ struct format_commit_context { unsigned

[PATCH 5/5] pretty: make %GK output the signing key for signed commits

2013-02-14 Thread Michael J Gruber
Because we can. No, really: In order to employ signed keys in an automated way it is absolutely necessary to check which keys the signatures come from. Now you can. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/pretty-formats.txt | 1 + pretty.c

Re: [PATCH] git.txt: update description of the configuration mechanism

2013-02-14 Thread Michael J Gruber
Matthieu Moy venit, vidit, dixit 14.02.2013 16:36: The old Git version where it appeared is not useful only to historians, not to normal users. Also, the text was mentioning only the per-repo I do not think you meant to not remove so many nots ;) Besides, if history is uninteresting, then so

Re: Pushing a git repository to a new server

2013-02-13 Thread Michael J Gruber
Jeff King venit, vidit, dixit 12.02.2013 21:42: On Tue, Feb 12, 2013 at 12:28:53PM +0100, Michael J Gruber wrote: I'm not sure providers like GitHub would fancy an interface which allows the programmatic creation of repos (giving a new meaning to fork bomb). But I bet you know better

Re: Pushing a git repository to a new server

2013-02-12 Thread Michael J Gruber
Jeff King venit, vidit, dixit 11.02.2013 17:27: On Mon, Feb 11, 2013 at 02:57:51AM -0500, Ethan Reesor wrote: On Mon, Feb 11, 2013 at 2:50 AM, Konstantin Khomoutov kostix+...@007spb.ru wrote: What's wrong with $ ssh myuser@remotehost 'mkdir /path/to/MyRepo.git; cd $_; git init --bare' $

Re: [PATCH] git-bisect.txt: clarify that reset finishes bisect

2013-02-11 Thread Michael J Gruber
Jonathan Nieder venit, vidit, dixit 10.02.2013 02:49: Hi, Michael J Gruber wrote: reset can be easily misunderstood as resetting a bisect session to its start without finishing it. Clarify that it actually finishes the bisect session. FWIW, Reviewed-by: Jonathan Nieder jrnie

[PATCHv2] git-bisect.txt: clarify that reset quits bisect

2013-02-11 Thread Michael J Gruber
reset can be easily misunderstood as resetting a bisect session to its start without finishing it. Clarify that it actually quits the bisect session. Reported-by: Andreas Mohr a...@lisas.de Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-bisect.txt | 7 ++- 1

[PATCH] git-bisect.txt: clarify that reset finishes bisect

2013-02-09 Thread Michael J Gruber
reset can be easily misunderstood as resetting a bisect session to its start without finishing it. Clarify that it actually finishes the bisect session. Reported-by: Andreas Mohr a...@lisas.de Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-bisect.txt | 2 +- 1

Re: Proposal: branch.name.remotepush

2013-02-08 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 08.02.2013 09:16: Jonathan Nieder jrnie...@gmail.com writes: Wait, why did the remote rewind? Oh, I am very well aware of that glitch. git push has this hack to pretend as if the pusher immediately turned around and fetched from the remote. It

Re: [RFC/PATCH 4/4] grep: obey --textconv for the case rev:path

2013-02-08 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 07.02.2013 19:03: Michael J Gruber g...@drmicha.warpmail.net writes: (cd t git grep GET_SHA1_QUIETLY HEAD:../cache.h) ../HEAD:../cache.h:#define GET_SHA1_QUIETLY01 Yuck. And even more yuck: (cd t git grep --full-name GET_SHA1_QUIETLY HEAD

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-07 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 06.02.2013 17:53: Michael J Gruber g...@drmicha.warpmail.net writes: Currently, diff and cat-file for blobs obey --textconv options (with the former defaulting to --textconv and the latter to --no-textconv) whereas show does not obey this option, even

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-07 Thread Michael J Gruber
Jeff King venit, vidit, dixit 06.02.2013 23:06: On Wed, Feb 06, 2013 at 04:08:50PM +0100, Michael J Gruber wrote: diff --git a/builtin/log.c b/builtin/log.c index 8f0b2e8..f83870d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -402,10 +402,28 @@ static void show_tagger(char *buf, int

Re: [RFC/PATCH 4/4] grep: obey --textconv for the case rev:path

2013-02-07 Thread Michael J Gruber
Jeff King venit, vidit, dixit 06.02.2013 23:36: On Wed, Feb 06, 2013 at 04:08:53PM +0100, Michael J Gruber wrote: -add_object_array(object, arg, list); +add_object_array_with_context(object, arg, list, xmemdupz(oc, sizeof(struct object_context

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-07 Thread Michael J Gruber
Jeff King venit, vidit, dixit 07.02.2013 10:11: On Thu, Feb 07, 2013 at 10:05:26AM +0100, Michael J Gruber wrote: Would it be better if object_array_entry replaced its mode member with an object_context? Do all callers/users want to deal with object_context? Wouldn't it just mean

Re: [RFC/PATCH 4/4] grep: obey --textconv for the case rev:path

2013-02-07 Thread Michael J Gruber
Jeff King venit, vidit, dixit 07.02.2013 10:26: On Thu, Feb 07, 2013 at 10:05:57AM +0100, Michael J Gruber wrote: @@ -265,9 +260,28 @@ void add_object_array_with_mode(struct object *obj, const char *name, struct obj objects[nr].item = obj; objects[nr].name = name; objects[nr

Re: [RFC/PATCH 4/4] grep: obey --textconv for the case rev:path

2013-02-07 Thread Michael J Gruber
Jeff King venit, vidit, dixit 07.02.2013 10:55: On Thu, Feb 07, 2013 at 10:47:55AM +0100, Michael J Gruber wrote: I'd be OK if we had an exterior object_context that could be handled in the same way. But how do we tell setup_revisions that we are interested in seeing the object_context from

[RFC/PATCH 0/4] textconv for show and grep

2013-02-06 Thread Michael J Gruber
adds blob support to 3/4 (the rev:path case). 3 and 4 can be squashed, of course. Now I'm quite a happy differ/shower/grepper with my latin1 and OO files ;) Jeff King (1): grep: allow to use textconv filters Michael J Gruber (3): show: obey --textconv for blobs cat-file: do not die

[RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-06 Thread Michael J Gruber
and --no-textconv when given. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/log.c | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 8f0b2e8..f83870d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -402,10

[RFC/PATCH 2/4] cat-file: do not die on --textconv without textconv filters

2013-02-06 Thread Michael J Gruber
When a command is supposed to use textconv filters (by default or with --textconv) and none are configured then the blob is output without conversion; the only exception to this rule is cat-file --textconv. Make it behave like the rest of textconv aware commands. Signed-off-by: Michael J Gruber

[RFC/PATCH 4/4] grep: obey --textconv for the case rev:path

2013-02-06 Thread Michael J Gruber
Make grep obey the --textconv option also for the object case, i.e. when used with an argument rev:path. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/grep.c | 11 ++- object.c | 26 -- object.h | 2 ++ 3 files changed, 28

Re: [WIP/RFH/RFD/PATCH] grep: allow to use textconv filters

2013-02-05 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 04.02.2013 18:12: Michael J Gruber g...@drmicha.warpmail.net writes: Recently and not so recently, we made sure that log/grep type operations use textconv filters when a userfacing diff would do the same: ef90ab6 (pickaxe: use textconv for -S counting

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-05 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 04.02.2013 17:36: Michael J Gruber g...@drmicha.warpmail.net writes: But diffs are on here (-p), it's just that the default diff option for merges is to not display them. Well, I admit there's two different ways of thinking here: A) git log -p turns

Re: [WIP/RFH/RFD/PATCH] grep: allow to use textconv filters

2013-02-05 Thread Michael J Gruber
Jeff King venit, vidit, dixit 05.02.2013 12:13: On Mon, Feb 04, 2013 at 04:27:31PM +0100, Michael J Gruber wrote: Recently and not so recently, we made sure that log/grep type operations use textconv filters when a userfacing diff would do the same: ef90ab6 (pickaxe: use textconv for -S

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-04 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 04.02.2013 00:10: I think a natural way to ask reviewing the recent merges while showing tricky ones would be to say: $ git log --first-parent --cc master..pu But this does not to show what I expect to see, which is an output of: $ git log

Re: Feature request: Allow extracting revisions into directories

2013-02-04 Thread Michael J Gruber
Robert Clausecker venit, vidit, dixit 03.02.2013 15:18: Hello! git currently has the archive command that allows to save an arbitrary revision into a tar or zip file. Sometimes it is useful to not save this revision into an archive but to directly put all files into an arbitrary directory.

[WIP/RFH/RFD/PATCH] grep: allow to use textconv filters

2013-02-04 Thread Michael J Gruber
filters for grepping and output purposes. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Notes: I'm somehow stuck in textconv/filespec/... hell, so I'm sending this out in request for help. I'm sure there are people for whom it's a breeze to get this right

Re: Port 22

2013-01-28 Thread Michael J Gruber
Kevin venit, vidit, dixit 28.01.2013 09:06: This is not really a git problem, but more of an ssh problem. Are you in the position to change the port where the SSH daemon listens on? Then you could use a different port which isn't blocked (443 perhaps?). On Sat, Jan 26, 2013 at 7:56 PM,

Re: [PATCH v3] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Michael J Gruber
Matthieu Moy venit, vidit, dixit 28.01.2013 10:16: Most git commands that can be used with our without a filepattern are tree-wide by default, the filepattern being used to restrict their scope. A few exceptions are: 'git grep', 'git clean', 'git add -u' and 'git add -A'. Since I didn't follow

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Michael J Gruber
Manlio Perillo venit, vidit, dixit 28.01.2013 10:26: Il 28/01/2013 00:00, Junio C Hamano ha scritto: wookietreiber kizkizzbangb...@googlemail.com writes: I have a feature request for `git add` auto completion: `git add` auto completion suggests all files / directories, filtered by nothing.

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Michael J Gruber
Manlio Perillo venit, vidit, dixit 28.01.2013 15:02: Il 28/01/2013 13:52, Michael J Gruber ha scritto: Manlio Perillo venit, vidit, dixit 28.01.2013 10:26: Il 28/01/2013 00:00, Junio C Hamano ha scritto: wookietreiber kizkizzbangb...@googlemail.com writes: I have a feature request for `git

Re: Unable to convert a subversion repo to git

2013-01-18 Thread Michael J Gruber
Timothy Kretschmer venit, vidit, dixit 16.01.2013 15:06: I am seeing the following output while converting a subversion repo to git. Found possible branch point: repo-url/trunk = repo-url/branches/CMT_PHASE3, 18441 fatal: Not a valid object name refs/remotes/BlueSimViewer 5.0 20110316

Re: Unable to convert a subversion repo to git

2013-01-18 Thread Michael J Gruber
branches under .git/packed-refs. Conversion continued but skipped the troubled branches. Still on the road of finding a way to include those branches in the conversion. On Fri, Jan 18, 2013 at 11:48 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Timothy Kretschmer venit, vidit, dixit

Re: [BUG] Possible bug in `remote set-url --add --push`

2013-01-16 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 15.01.2013 16:53: Michael J Gruber g...@drmicha.warpmail.net writes: Also there is a conceptual confusion: pushurl is meant to push to the same repo using a different url, e.g. something authenticated (https/ssh) for push and something faster/easier

[PATCH] git-remote: distinguish between default and configured URLs

2013-01-16 Thread Michael J Gruber
and pushing (fetch fallback/push): fetch config used for pushing only (fetch fallback): fetch config which is unused (push): push config used for pushing Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Maybe something like this? It even seems to make the code in get_one_entry clearer. I

Re: [PATCH] git-remote: distinguish between default and configured URLs

2013-01-16 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 16.01.2013 11:14: The current output of git remote -v does not distinguish between explicitly configured push URLs and those coming from fetch lines. Revise the output so so that URLs are distinguished by their labels: (fetch): fetch config used

Re: [PATCH] git-remote: distinguish between default and configured URLs

2013-01-16 Thread Michael J Gruber
John Keeping venit, vidit, dixit 16.01.2013 11:42: On Wed, Jan 16, 2013 at 11:14:48AM +0100, Michael J Gruber wrote: The current output of git remote -v does not distinguish between explicitly configured push URLs and those coming from fetch lines. Revise the output so so that URLs

Re: [BUG] Possible bug in `remote set-url --add --push`

2013-01-16 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 16.01.2013 16:50: Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano venit, vidit, dixit 15.01.2013 16:53: ... * When there are more than one URLs, and there is no pushURL, then show the first URL as (fetch/push), and the remainder

Re: [BUG] Possible bug in `remote set-url --add --push`

2013-01-16 Thread Michael J Gruber
Phil Hord venit, vidit, dixit 16.01.2013 17:15: On Tue, Jan 15, 2013 at 10:53 AM, Junio C Hamano gits...@pobox.com wrote: Michael J Gruber g...@drmicha.warpmail.net writes: That being said, I don't mind changing the behaviour of set-url. I do not think we want to change the behaviour of set

Re: [BUG] Possible bug in `remote set-url --add --push`

2013-01-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 15.01.2013 07:39: Junio C Hamano gits...@pobox.com writes: Jardel Weyrich jweyr...@gmail.com writes: If you allow me, I'd like you to forget about the concepts for a minute, and focus on the user experience. Imagine a simple hypothetical scenario in

Re: [BUG] Possible bug in `remote set-url --add --push`

2013-01-14 Thread Michael J Gruber
Jardel Weyrich venit, vidit, dixit 12.01.2013 10:33: On Sat, Jan 12, 2013 at 6:44 AM, Sascha Cunz sascha...@babbelbox.org wrote: Am Freitag, 11. Januar 2013, 23:10:36 schrieb Junio C Hamano: Jardel Weyrich jweyr...@gmail.com writes: I believe `remote set-url --add --push` has a bug. Performed

Re: [BUG] Cannot push some grafted branches

2012-12-22 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 21.12.2012 17:58: Michael J Gruber g...@drmicha.warpmail.net writes: While replace refs are much more general than grafts, it seems the two main uses are: - grafts (change the recorded parents for a commit) - svn cleanup (convert tagging commits into tag

Re: Opera release Git-splitter, a sub-modularizing tool for Git

2012-12-22 Thread Michael J Gruber
Yngve Nysaeter Pettersen venit, vidit, dixit 21.12.2012 21:13: On Fri, 21 Dec 2012 16:49:21 +0100, Matthieu Moy matthieu@grenoble-inp.fr wrote: Yngve Nysaeter Pettersen yn...@opera.com writes: The split command will create a new repository for all files foo in a folder (path/foo) and

Re: Right way to import a repo

2012-12-22 Thread Michael J Gruber
Florian Lindner venit, vidit, dixit 21.12.2012 17:11: Hello, I have two repositories. tools and flof. I want to merge flof into tools (and flof will be deleted after that) while keeping history intact. Of course I've googled that and found a number of different solution which all seem to

Re: Opera release Git-splitter, a sub-modularizing tool for Git

2012-12-21 Thread Michael J Gruber
Yngve N. Pettersen (Developer Opera Software ASA) venit, vidit, dixit 18.12.2012 15:51: Hello all, Today Opera Software released the Git-splitter, a small tool for sub-modularizing code in a git repo, with complete commit history, under the Apache 2.0 license. It's functionality is

Re: [BUG] Cannot push some grafted branches

2012-12-21 Thread Michael J Gruber
While replace refs are much more general than grafts, it seems the two main uses are: - grafts (change the recorded parents for a commit) - svn cleanup (convert tagging commits into tag objects) The latter one being quite a special case already. The script below has helped me move from grafts

Re: Opera release Git-splitter, a sub-modularizing tool for Git

2012-12-21 Thread Michael J Gruber
Yngve Nysaeter Pettersen venit, vidit, dixit 21.12.2012 13:43: Hi, On Fri, 21 Dec 2012 13:23:46 +0100, Michael J Gruber g...@drmicha.warpmail.net wrote: Yngve N. Pettersen (Developer Opera Software ASA) venit, vidit, dixit 18.12.2012 15:51: Hello all, Today Opera Software released

Re: [PATCH] RFC Optionally handle symbolic links as copies

2012-12-12 Thread Michael J Gruber
Robin Rosenberg venit, vidit, dixit 06.12.2012 02:23: - Ursprungligt meddelande - Robin Rosenberg robin.rosenb...@dewire.com writes: If core.symlinks is set to copy then symbolic links in a git repository will be checked out as copies of the file it points to. That all sounds

Re: How to avoid the ^M induced by Meld and Git

2012-12-12 Thread Michael J Gruber
Karl Brand venit, vidit, dixit 11.12.2012 13:33: Esteemed Git users, What i do: 1. Create a script.r using Emacs/ESS. 2. Make some modifications to script.r with the nice diff gui, Meld 3. Commit these modifications using git commit -am my message 4. Reopen script.r in Emacs/ESS to

Re: [PATCH v2] submodule: add 'deinit' command

2012-12-12 Thread Michael J Gruber
Jens Lehmann venit, vidit, dixit 04.12.2012 22:48: With git submodule init the user is able to tell git he cares about one or more submodules and wants to have it populated on the next call to git submodule update. But currently there is no easy way he could tell git he does not care about a

Re: How to avoid the ^M induced by Meld and Git

2012-12-12 Thread Michael J Gruber
Karl Brand venit, vidit, dixit 12.12.2012 16:34: On 12/12/12 15:57, Michael J Gruber wrote: Karl Brand venit, vidit, dixit 11.12.2012 13:33: Esteemed Git users, What i do: 1. Create a script.r using Emacs/ESS. 2. Make some modifications to script.r with the nice diff gui, Meld 3

Re: [ANNOUNCE] Git v1.8.1-rc0

2012-12-04 Thread Michael J Gruber
While not being a huge problem, you may or may not want to correct one commit message: * aaf5ad5 (origin/next, gitster/next) Sync with 1.8.0-rc0 |\ | * ee26a6e (tag: v1.8.1-rc0, origin/master, origin/HEAD, gitster/master) Git 1.8.1-rc0 Cheers, Michael -- To unsubscribe from this list: send the

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-12-03 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 03.12.2012 05:48: Thanks Thomas and Michael! 2012/11/30 Thomas Rast tr...@inf.ethz.ch: #: builtin/update-index.c:756 msgid mark files as \index-only\ -msgstr +msgstr markiert Dateien als \index-only\ Likewise, but here I don't even understand what

Re: [PATCH] l10n: de.po: translate 22 new messages

2012-12-03 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 03.12.2012 05:49: Translate 22 new messages came from git.pot updates in 9306b5b (l10n: Update git.pot (3 new, 6 removed messages)), fe52cd6 (l10n: Update git.pot (14 new, 3 removed messages)) and f9472e3 (l10n: Update git.pot (5 new, 1 removed messages)).

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-29 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 28.11.2012 19:22: Hi Ralf, This is the middle third of my review. Sorry for the long wait! I hope it can still be useful. Hi Thomas, no problem. Thanks for your review. Of course it's very useful. Some of the mistakes I made are so obvious that I

Re: git describe not matching git log

2012-11-29 Thread Michael J Gruber
Steven Penny venit, vidit, dixit 29.11.2012 10:04: It seems git describe is not matching git log as detailed in the help, in some cases. From git describe --help [torvalds@g5 git]$ git describe parent v1.0.4-14-g2414721 The number of additional commits is the number of commits which

Re: [PATCH 1/4] git-svn: Document branches with at-sign(@).

2012-11-28 Thread Michael J Gruber
Sebastian Leske venit, vidit, dixit 18.11.2012 18:08: git svn will sometimes create branches with an at-sign in the name (branchname@revision). These branches confuse many users and it is a FAQ why they are created. Document when git svn will create them. Signed-off-by: Sebastian Leske

Re: [PATCH 2/4] Recommend use of structure options for git svn.

2012-11-28 Thread Michael J Gruber
Sebastian Leske venit, vidit, dixit 21.11.2012 08:13: Document that when using git svn, one should usually either use the directory structure options to import branches as branches, or only import one subdirectory. The default behaviour of cloning all branches and tags as subdirectories in the

Re: [PATCH 3/4] git-svn: Expand documentation for --follow-parent

2012-11-28 Thread Michael J Gruber
Sebastian Leske venit, vidit, dixit 23.11.2012 08:13: Describe what the option --follow-parent does, and what happens if it is set or unset. Signed-off-by: Sebastian Leske sebastian.le...@sleske.name --- Documentation/git-svn.txt | 16 1 file changed, 12 insertions(+),

Re: [PATCH 4/4] git-svn: Note about tags.

2012-11-28 Thread Michael J Gruber
Sebastian Leske venit, vidit, dixit 23.11.2012 08:29: Document that 'git svn' will import SVN tags as branches. Signed-off-by: Sebastian Leske sebastian.le...@sleske.name --- Documentation/git-svn.txt |6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/git-svn.txt

Re: Requirements for integrating a new git subcommand

2012-11-23 Thread Michael J Gruber
Eric S. Raymond venit, vidit, dixit 22.11.2012 23:11: Shawn Pearce spea...@spearce.org: [Lots of helpful stuff ended by] 4. How does git help work? That is, how is a subcommand expected to know when it is being called to export its help text? IIRC git help foo runs man git-foo. OK, that

Re: Local clones aka forks disk size optimization

2012-11-16 Thread Michael J Gruber
Sitaram Chamarty venit, vidit, dixit 15.11.2012 04:44: On Thu, Nov 15, 2012 at 7:04 AM, Andrew Ardill andrew.ard...@gmail.com wrote: On 15 November 2012 12:15, Javier Domingo javier...@gmail.com wrote: Hi Andrew, Doing this would require I got tracked which one comes from which. So it

Re: Notes in format-patch

2012-11-14 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 13.11.2012 19:09: Junio C Hamano gits...@pobox.com writes: ... and it is broken X-. The blank line should be added before the diffstat, not after the notes message (t3307 shows a case where we give notes without diffstat, and we shouldn't be adding an

Re: bug? git format-patch -M -D then git am fails

2012-11-14 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.11.2012 00:22: Joe Perches j...@perches.com writes: I don't believe that reversibility is a really useful aspect of deletion patches when there are known git repositories involved. You can read reversibility as safety if you want. We would want to

Re: push branch descriptions

2012-11-14 Thread Michael J Gruber
Ramkumar Ramachandra venit, vidit, dixit 14.11.2012 11:33: Hi, Angelo Borsotti wrote: currently, there is no means to push a branch description to a remote repository. It is possible to create a branch, but not to set its description. Would not be more correct to push also branch

Re: RFD: fast-import is picky with author names (and maybe it should - but how much so?)

2012-11-13 Thread Michael J Gruber
Felipe Contreras venit, vidit, dixit 12.11.2012 23:47: On Mon, Nov 12, 2012 at 10:41 PM, Jeff King p...@peff.net wrote: On Sun, Nov 11, 2012 at 07:48:14PM +0100, Felipe Contreras wrote: 3. Exporters should not use it if they have any broken-down representation at all. Even knowing that

Re: [PATCHv3] replace: parse revision argument for -d

2012-11-13 Thread Michael J Gruber
Jeff King venit, vidit, dixit 12.11.2012 21:42: On Mon, Nov 12, 2012 at 03:18:02PM +0100, Michael J Gruber wrote: 'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse

Notes in format-patch (was: Re: [PATCHv3] replace: parse revision argument for -d)

2012-11-13 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 12.11.2012 15:18: 'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse the argument to 'replace -d' in the same way. Signed-off-by: Michael

[PATCHv4] replace: parse revision argument for -d

2012-11-13 Thread Michael J Gruber
'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse the argument to 'replace -d' in the same way. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Notes: v4 names

Re: [PATCHv2] replace: parse revision argument for -d

2012-11-12 Thread Michael J Gruber
Jeff King venit, vidit, dixit 09.11.2012 17:48: On Mon, Oct 29, 2012 at 02:23:27PM +0100, Michael J Gruber wrote: 'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse

Re: git merge commits are non-deterministic? what changed?

2012-11-12 Thread Michael J Gruber
Ulrich Spörlein venit, vidit, dixit 09.11.2012 19:27: On Fri, 2012-11-09 at 11:16:47 -0500, Jeff King wrote: On Fri, Nov 09, 2012 at 04:52:48PM +0100, Matthieu Moy wrote: Ulrich Spörlein u...@spoerlein.net writes: 2. Why the hell is the commit hash dependent on the ordering of the parent

[PATCHv3] replace: parse revision argument for -d

2012-11-12 Thread Michael J Gruber
'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse the argument to 'replace -d' in the same way. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Notes: v3

Re: RFD: fast-import is picky with author names (and maybe it should - but how much so?)

2012-11-10 Thread Michael J Gruber
Felipe Contreras venit, vidit, dixit 09.11.2012 15:34: On Fri, Nov 9, 2012 at 10:28 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Hg seems to store just anything in the author field (committer). The various interfaces that are floating around do some behind-the-back conversion

Re: RFD: fast-import is picky with author names (and maybe it should - but how much so?)

2012-11-09 Thread Michael J Gruber
Jeff King venit, vidit, dixit 08.11.2012 21:09: On Fri, Nov 02, 2012 at 03:43:24PM +0100, Michael J Gruber wrote: It seems that our fast-import is super picky with regards to author names. I've encountered author names like Foo Barfoo@dev.null Foo Bar foo@dev.null foo@dev.null

[PATCH] push/pull: adjust missing upstream help text to changed interface

2012-11-06 Thread Michael J Gruber
-to=origin/branch nsiv2 Reported-by: Jeroen van der Ham vd...@uva.nl --- Yes, I'm in low hanging fruits mood. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- git-parse-remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-parse-remote.sh b/git-parse-remote.sh

Re: Lack of netiquette, was Re: [PATCH v4 00/13] New remote-hg helper

2012-11-05 Thread Michael J Gruber
Felipe Contreras venit, vidit, dixit 02.11.2012 17:09: On Fri, Nov 2, 2012 at 12:03 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Andreas Ericsson venit, vidit, dixit 02.11.2012 10:38: On 11/01/2012 02:46 PM, René Scharfe wrote: Also, and I'm sure you didn't know that, Jedem das

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Michael J Gruber
Eric Miao venit, vidit, dixit 05.11.2012 03:26: Hi All, Does anyone know if git has sort of support for a series of patches, i.e. a patchset or changeset? So whenever we know the SHA1 id of a single patch/commit, we know the patchset it belongs to. This is normal when we do big changes and

Re: [PATCH v4 00/13] New remote-hg helper

2012-11-05 Thread Michael J Gruber
Felipe Contreras venit, vidit, dixit 02.11.2012 19:01: On Fri, Nov 2, 2012 at 5:41 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Fri, Nov 2, 2012 at 3:48 PM, Jeff King p...@peff.net wrote: On Thu, Nov 01, 2012 at 05:08:52AM +0100, Felipe Contreras wrote: Turns out msysgit's

Re: git log --graph --oneline - false parent-child visualization

2012-11-05 Thread Michael J Gruber
martyone venit, vidit, dixit 05.11.2012 13:57: Hello, the combination of --graph and --oneline sometimes produces output which is -- at least for me -- not clear about parent-child relation between commits. I noticed it when using with --simplify-by-decoration switch but it should not be

Re: Support for a series of patches, i.e. patchset or changeset?

2012-11-05 Thread Michael J Gruber
Eric Miao venit, vidit, dixit 05.11.2012 15:12: The problem is, most cases we have no idea of the base rev1, and commit rev2 which it's leading up to. E.g. for a single patch which is between commit rev1..rev2, how do we find out rev1 and rev2. So, then the question is: What do you know/have?

Re: Lack of netiquette, was Re: [PATCH v4 00/13] New remote-hg helper

2012-11-02 Thread Michael J Gruber
Andreas Ericsson venit, vidit, dixit 02.11.2012 10:38: On 11/01/2012 02:46 PM, René Scharfe wrote: Also, and I'm sure you didn't know that, Jedem das Seine (to each his own) was the slogan of the Buchenwald concentration camp. For that reason some (including me) hear the unspoken cynical

Re: bisect: Needed a single revision message is confusing

2012-11-02 Thread Michael J Gruber
Daniel Bonniot venit, vidit, dixit 02.11.2012 14:23: Hi, Suppose I'm doing a git bisect, say: $ git bisect good 8c7a786b6c8eae8eac91083cdc9a6e337bc133b0 That works fine. The sha1 could also be a substring, as long as it's unambiguous, e.g.: $ git bisect good 8c7a786b6c Now if it's

RFD: fast-import is picky with author names (and maybe it should - but how much so?)

2012-11-02 Thread Michael J Gruber
It seems that our fast-import is super picky with regards to author names. I've encountered author names like Foo Barfoo@dev.null Foo Bar foo@dev.null foo@dev.null in the self-hosting repo of some other dvcs, and the question is how to translate them faithfully into a git author

Re: RFD: fast-import is picky with author names (and maybe it should - but how much so?)

2012-11-02 Thread Michael J Gruber
Some additional input: [mjg@localhost git]$ git commit --author='is thiso...@or.not whats@up' --allow-empty -m test [detached HEAD 0734308] test Author: is thi...@or.not whats@up [mjg@localhost git]$ git show commit 0734308b7bf372227bf9f5b9fd6b4b403df33b9e Author: is thi...@or.not whats@up Date:

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-31 Thread Michael J Gruber
[quotes heavily cut down by me] Felipe Contreras venit, vidit, dixit 30.10.2012 21:15: Hi, On Tue, Oct 30, 2012 at 8:33 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On Tue, 30 Oct 2012, Felipe Contreras wrote: But you mentioned something about cooperation, and I've yet to see

Re: Ŭŭ letter

2012-10-31 Thread Michael J Gruber
two commits (1 with git-gui, one with git-commit on command line), and both come out fine (LANG=de_DE.UTF-8, git version 1.8.0.226.gba44ac5 on Fedora 16): git log -2 -p commit 36de49231639eb9edccb1ebad595056d395141c7 Author: Michael J Gruber g...@drmicha.warpmail.net Date: Wed Oct 31 15:54:04 2012

Re: Ŭŭ letter

2012-10-31 Thread Michael J Gruber
On Wed, Oct 31, 2012 at 5:57 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Usievaład Čorny venit, vidit, dixit 31.10.2012 15:39: Hello! When I type comment message in Git Gui (1.8.0 and previous), I can't use Ŭŭ letter (U+016C, U+016D) — it just transforms into simple Uu. Please

Re: Ŭŭ letter

2012-10-31 Thread Michael J Gruber
the input. Is AltGr+u maybe a menu shortcut in git gui which overrides the special character? I think Ctril+u and such are command shortcuts, and AltGr+u and such activate menus. On Wed, Oct 31, 2012 at 6:15 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Usievaład Čorny venit, vidit, dixit

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-31 Thread Michael J Gruber
Felipe Contreras venit, vidit, dixit 31.10.2012 16:39: This is precisely ad hominem; you are ignoring the code, not because of the code, because of the person. This is as ad hominem as it gets. I am not rejecting your code (I reviewed an early series) but reject the communication style and

Re: [PATCH] replace: parse revision argument for -d

2012-10-29 Thread Michael J Gruber
Jeff King venit, vidit, dixit 29.10.2012 07:58: On Fri, Oct 26, 2012 at 03:33:27PM +0200, Michael J Gruber wrote: for (p = argv; *p; p++) { -if (snprintf(ref, sizeof(ref), refs/replace/%s, *p) +q = *p; +if (get_sha1(q, sha1

Re: [PATCH] replace: parse revision argument for -d

2012-10-29 Thread Michael J Gruber
Jeff King venit, vidit, dixit 29.10.2012 10:04: On Mon, Oct 29, 2012 at 10:02:47AM +0100, Michael J Gruber wrote: Jeff King venit, vidit, dixit 29.10.2012 07:58: On Fri, Oct 26, 2012 at 03:33:27PM +0200, Michael J Gruber wrote: for (p = argv; *p; p++) { - if (snprintf(ref

[PATCHv2] replace: parse revision argument for -d

2012-10-29 Thread Michael J Gruber
'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse the arguments to 'replace -d' in the same way. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- v2 has the simplified

[PATCH] replace: parse revision argument for -d

2012-10-26 Thread Michael J Gruber
the replacement, take the argument literally if it can not be resolved to a full sha1. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/replace.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index e3aaf70

Re: Is git mktag supposed to accept git cat-file input?

2012-10-25 Thread Michael J Gruber
Anand Kumria venit, vidit, dixit 25.10.2012 02:58: Ahh, unix time. Of course. That's the only difference *at the time being*, but this is not guaranteed. Really, as Brandon says: cat-file -p is pretty printing for human readability (which could be improved), and cat-file type is the raw format

<    2   3   4   5   6   7   8   >