Re: Textconv

2013-03-11 Thread Michael J Gruber
Dmitry Ilin venit, vidit, dixit 11.03.2013 12:30: > I tried this command and I got following result: > > trace: built-in: git 'show' 'a1bffde' > trace: run_command: 'openssl enc -d -base64 -aes-256-ecb -k > '\''abcde'\'' 2> /dev/null || cat' > trace: exec: 'sh' '-c' 'openssl enc -d -base64 -aes-2

Re: [PATCH] help: show manpage for aliased command on git --help

2013-03-06 Thread Michael J Gruber
Jeff King venit, vidit, dixit 05.03.2013 18:38: > On Tue, Mar 05, 2013 at 02:44:41PM +, Ævar Arnfjörð Bjarmason wrote: > >> Change the semantics of "git --help" to show the help for the >> command is aliased to, instead of just saying: >> >> `git ' is aliased to `' >> >> E.g. if you have

Re: Ignore version update changes on git show report?

2013-03-01 Thread Michael J Gruber
Preben Liland Madsen venit, vidit, dixit 26.02.2013 20:53: > Hello, > > I'm trying to investigate some what changes have been done between two > versions of a software with the name IP.Board. > > This proves more troublesome than I thought, since their release builder > appearantly updates th

Re: clean/smudge filters on .zip/.tgz files

2013-02-27 Thread Michael J Gruber
Johannes Sixt venit, vidit, dixit 27.02.2013 07:39: > Am 2/26/2013 23:38, schrieb Tim Chase: >> Various programs that I use ([Open|Libre]Office, Vym, etc) use a >> zipped/.tgz'ed file format, usually containing multiple >> (usually) plain-text files within. >> >> I'm trying to figure out a way for

RFD: concatening textconv filters

2013-02-21 Thread Michael J Gruber
During my day-to-day UGFWIINIT I noticed that we don't do textconv iteratively. E.g.: I have a file SuperSecretButDumbFormat.pdf.gpg and textconv filters with attributes set for *.gpg and *.pdf (using "gpg" resp. "pdftotext"). For Git, the file has only the "gpg" attribute, of course. In this cas

Re: Git Merge 2013 Conference, Berlin

2013-02-20 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 20.02.2013 00:47: > Scott Chacon writes: > >> Junio, are you interested in attending? > > I am interested in meeting our European contributors, but Berlin is > kind of very far, so give me a few days to think about it. > > Thanks. > Maybe, we can - for the ne

Re: Git Merge 2013 Conference, Berlin

2013-02-19 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 19.02.2013 16:20: > Scott Chacon venit, vidit, dixit 18.02.2013 22:29: >> Right now we have: >> >> Dev day: 50 >> User day: 295 >> Hack day: 200 >> >> I'm not sure what the actual turnout will be, but it looks

Re: Git Merge 2013 Conference, Berlin

2013-02-19 Thread Michael J Gruber
Scott Chacon venit, vidit, dixit 18.02.2013 22:29: > Right now we have: > > Dev day: 50 > User day: 295 > Hack day: 200 > > I'm not sure what the actual turnout will be, but it looks like it's > going to be pretty massive. I wanted to go through the Dev day > signups and figure out if everyone r

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

2013-02-19 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 18.02.2013 19:22: > Translate 35 new messages came from git.pot update > in 9caaf23 (l10n: Update git.pot (35 new, 14 removed > messages)). > > Signed-off-by: Ralf Thielow > --- > po/de.po | 140 > +++ >

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 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

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 writes: > >> Junio C Hamano 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 documentation. >> >> I'm OK with you

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

[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 --- Documentation/pretty-formats.txt | 1 + pretty.c | 9 - 2

[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 --- builtin/fmt-merge-msg.c | 2 +- builtin/verify-tag.c| 2 +- gpg-interface.c | 11 +++ gpg-interface.h | 2

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

2013-02-14 Thread Michael J Gruber
committer names. Signed-off-by: Michael J Gruber --- 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 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 --- 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 +508,17 @@ static

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

2013-02-14 Thread Michael J Gruber
is the only reliable way 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 --- gpg-interface.c | 13 +++-- 1 file changed, 11 insertions(+), 2

[PATCH 0/5] gpg_interface: use the status

2013-02-14 Thread Michael J Gruber
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

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

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 &

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 >> wrote: >>> What's wrong with >>> $ ssh myuser@remotehost 'mkdir /path/to/MyRepo.git; cd $_; git init --bare' >>> $ git push

[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 Signed-off-by: Michael J Gruber --- Documentation/git-bisect.txt | 7 ++- 1 file changed, 6 insert

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. &

[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 Signed-off-by: Michael J Gruber --- Documentation/git-bisect.txt | 2 +- 1 file changed, 1 inser

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 writes: > >>>> (cd t && git grep GET_SHA1_QUIETLY HEAD:../cache.h) >>>> ../HEAD:../cache.h:#define GET_SHA1_QUIETLY01 >>> >>> Yuck. >> >> And even

Re: Proposal: branch..remotepush

2013-02-08 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 08.02.2013 09:16: > Jonathan Nieder 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 shouldn't

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

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].i

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

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, >

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 +40

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 writes: > >> Currently, "diff" and "cat-file" for blobs obey "--textconv" options >> (with the former defaulting to "--textconv" and the latter to >> "

[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 --- builtin/grep.c | 11 ++- object.c | 26 -- object.h | 2 ++ 3 files

[RFC/PATCH 3/4] grep: allow to use textconv filters

2013-02-06 Thread Michael J Gruber
textconv filters for grepping and output purposes. It is off by default. Signed-off-by: Michael J Gruber --- builtin/grep.c | 2 ++ grep.c | 100 + grep.h | 1 + 3 files changed, 89 insertions(+), 14 deletions(-) diff --gi

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

2013-02-06 Thread Michael J Gruber
quot;show" on blobs behave like "diff", i.e. obey "--textconv" by default and "--no-textconv" when given. Signed-off-by: Michael J Gruber --- builtin/log.c | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/builtin/log.c b/bu

[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. Sign

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

2013-02-06 Thread Michael J Gruber
onv" for "git grep" sans the blob case; the code is all Jeff's. 4/4 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 us

Re: Adding Missing Tags to a Repository

2013-02-06 Thread Michael J Gruber
Neil venit, vidit, dixit 06.02.2013 05:45: > Hi everyone, > > A while back I did a svn-to-git migration for my team. Our subversion > repository had about 30K+ commits, 100+ branches, 2K+ tags, all made > over a 20+ year period. I was doing the migration using git-svn, and > my big problem was the

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: >> >>

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 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 he

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 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 textco

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

2013-02-04 Thread Michael J Gruber
which makes git grep use any configured textconv filters for grepping and output purposes. Signed-off-by: Michael J Gruber --- 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

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 > direct

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: > > $

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 writes: >>> >>&g

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 writes: > >>> I have a feature request for `git add` auto completion: >>> >>> `git add` auto completion suggests all files / directories, >>> filtered by nothing. I guess it wou

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 foll

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

Re: Unable to convert a subversion repo to git

2013-01-18 Thread Michael J Gruber
.x. > To move forward, I commented out the problematic 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, Micha

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: /trunk => > /branches/CMT_PHASE3, 18441 >> fatal: Not a valid object name refs/remotes/BlueSimViewer 5.0 20110316 Branch >> cat-

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 wrote: >> Michael J Gruber writes: >> >>> That being said, I don't mind changing the behaviour of set-url. >> >> I do not think we want to change the behavi

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 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

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. >> >&

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: > >

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

2013-01-16 Thread Michael J Gruber
tching 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 --- Maybe something like this? It even seems to make the code in get_one_entry clearer. I yet have to l

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 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

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 writes: > >> Jardel Weyrich 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 which the user wants to p

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 wrote: >> Am Freitag, 11. Januar 2013, 23:10:36 schrieb Junio C Hamano: >>> Jardel Weyrich writes: I believe `remote set-url --add --push` has a bug. Performed tests with v1.8.0.1 and v1.

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

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 > wrote: > >> "Yngve Nysaeter Pettersen" writes: >> >>> The split command will create a new repository for all files foo in a >>> folder (path/foo) and their commit history. >>> >>

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 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 (conv

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 > wrote: > >> Yngve N. Pettersen (Developer Opera Software ASA) venit, vidit, dixit >> 18.12.2012 15:51: >>> Hello all, >>&g

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 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 functionali

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/E

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 ab

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

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 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 nice on

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: [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-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 : > >>> #: 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 unders

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 com

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 obvio

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 > --- > Documentation/git-svn.txt |6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/Documentation/git-svn.txt b/Documentation/git-

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 > --- > Documentation/git-svn.txt | 16 > 1 file changed, 12 insertions(+), 4 deletions(-) > > d

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

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: 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 : >> [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 > wrote: >> On 15 November 2012 12:15, Javier Domingo wrote: >>> Hi Andrew, >>> >>> Doing this would require I got tracked which one comes from which. So >>> it would imply some logic (and db)

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: 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 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 mak

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 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 extra bl

[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 --- Notes: v4 names t

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'

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 >>

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 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

[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 --- Notes: v3 safeguards th

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 writes: >>> >> 2. Why the hell is the commit hash dependent on the ordering of the >> paren

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 >>

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 > wrote: > >> Hg seems to store just anything in the author field ("committer"). The >> various interfaces that are floating around do some behind-the-back &

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 Bar >> Foo

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

2012-11-07 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 06.11.2012 15:45: > > > Michael J Gruber wrote: > >> Yes, I'm in low hanging fruits mood. >> >> Signed-off-by: Michael J Gruber > > It is called tying loose ends, and is very important. Very much appreciated. ;) B

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

2012-11-06 Thread Michael J Gruber
/ nsiv2 Reported-by: Jeroen van der Ham --- Yes, I'm in low hanging fruits mood. Signed-off-by: Michael J Gruber --- git-parse-remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 484b2e6..0e87e09 100644 --- a/git-

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

2012-11-05 Thread Michael J Gruber
[trimmed down heavily by mjg] Felipe Contreras venit, vidit, dixit 05.11.2012 16:22: > On Mon, Nov 5, 2012 at 10:25 AM, Michael J Gruber > wrote: >> Felipe Contreras venit, vidit, dixit 02.11.2012 17:09: >>> On Fri, Nov 2, 2012 at 12:03 PM, Michael J Gruber >>>

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/ha

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

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 > wrote: >> On Fri, Nov 2, 2012 at 3:48 PM, Jeff King wrote: >>> On Thu, Nov 01, 2012 at 05:08:52AM +0100, Felipe Contreras wrote: >>> > Turns out msysgit's remote-hg is not exporting the

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

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 > wrote: >> Andreas Ericsson venit, vidit, dixit 02.11.2012 10:38: >>> On 11/01/2012 02:46 PM, René Scharfe wrote: >>>> >>>> Also, and I'

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 this" ' --allow-empty -m test [detached HEAD 0734308] test Author: is thi...@or.not [mjg@localhost git]$ git show commit 0734308b7bf372227bf9f5b9fd6b4b403df33b9e Author: is thi...@or.not Date: Fri Nov 2 15:45:23 2012 +0100

<    2   3   4   5   6   7   8   9   >