How to setup gitweb with categories

2012-11-13 Thread frank . jakop
Hello, I'm trying to setup a gitweb frontend with categorized projects. I already have a plain project list running an changed my gitweb.conf so that it contains our $projects_list_group_categories = "1"; our $project_list_default_category = "foo"; I'd now expect all projects to be shown unde

Re: [PATCH v3 0/5] push: update remote tags only with force

2012-11-13 Thread Chris Rorvick
resending to list ... On Tue, Nov 13, 2012 at 3:20 PM, Junio C Hamano wrote: > Chris Rorvick writes: > >> Minor changes since from v2 set. Reposting primarily because I mucked >> up the Cc: list (again) and hoping to route feedback to the appropriate >> audience. >> >> This patch set can be div

[PATCH] config: don't segfault when given --path with a missing value

2012-11-13 Thread Carlos Martín Nieto
When given a variable without a value, such as '[section] var' and asking git-config to treat it as a path, git_config_pathname returns an error and doesn't modify its output parameter. show_config assumes that the call is always successful and sets a variable to indicate that vptr should be freed.

Re: Fwd: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-13 Thread Marc Khouzam
On Tue, Nov 13, 2012 at 6:46 PM, SZEDER Gábor wrote: > Hi, > > On Tue, Nov 13, 2012 at 03:12:44PM -0500, Marc Khouzam wrote: >> >> +if [ -n "$1" ] ; then >> >> + # If there is an argument, we know the script is being executed >> >> + # so go ahead and run the _git_complete_with_output function >

Re: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-13 Thread Marc Khouzam
Thanks for the review. I wasn't aware that you were doing a similar effort for zsh. On Tue, Nov 13, 2012 at 1:31 PM, Felipe Contreras wrote: > On Mon, Nov 12, 2012 at 9:07 PM, Marc Khouzam wrote: > >> this patch allows tcsh-users to get the benefits of the awesome >> git-completion.bash script.

Re: Bug? Subtree merge seems to choke on trailing slashes.

2012-11-13 Thread Jack O'Connor
Do I have the right list for bug reports? Apologies if not. On Tue, Nov 6, 2012 at 5:58 PM, Jack O'Connor wrote: > > I'm summarizing from here: > http://stackoverflow.com/questions/5904256/git-subtree-merge-into-a-deeply-nested-subdirectory > > Quick repro: > 1) I do an initial subtree merge in w

Re: What's cooking in git.git (Nov 2012, #03; Tue, 13)

2012-11-13 Thread Mark Levedahl
On 11/13/2012 03:45 PM, Torsten Bögershausen wrote: * ml/cygwin-mingw-headers (2012-11-12) 1 commit - Update cygwin.c for new mingw-64 win32 api headers Make git work on newer cygwin. Will merge to 'next'. (Sorry for late answer, I managed to test the original patch minutes before Peff

[PATCH] completion: remove 'help' duplicate from porcelain commands

2012-11-13 Thread SZEDER Gábor
The list of all git commands is computed from the output of 'git help -a', which already includes 'help', so there is no need to explicitly add it once more when computing the list of porcelain commands. Note that 'help' wasn't actually offered twice because of this, because Bash filters duplicate

Re: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-13 Thread SZEDER Gábor
On Tue, Nov 13, 2012 at 07:31:45PM +0100, Felipe Contreras wrote: > On Mon, Nov 12, 2012 at 9:07 PM, Marc Khouzam wrote: > > + # Call _git() or _gitk() of the bash script, based on the first > > + # element of the command-line > > + _${COMP_WORDS[0]} > > You might want to use __

Re: Fwd: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-13 Thread SZEDER Gábor
Hi, I've got two more comments. On Mon, Nov 12, 2012 at 03:07:46PM -0500, Marc Khouzam wrote: > @@ -2481,3 +2483,52 @@ __git_complete gitk __gitk_main > if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then > __git_complete git.exe __git_main > fi > + > +# Method that will output the result of the

Re: [PATCH v3 0/5] push: update remote tags only with force

2012-11-13 Thread Drew Northup
On Sun, Nov 11, 2012 at 11:08 PM, Chris Rorvick wrote: > Minor changes since from v2 set. . > An email thread initiated by Angelo Borsotti did not come to a > consensus on how push should behave with regard to tag references. Minor Nit: Without the link to gmane it is an exercise l

Re: [PATCHv3 3/4] git-status: show short sequencer state

2012-11-13 Thread Phil Hord
Phil Hord wrote: > Junio C Hamano wrote: >> Phil Hord writes: >> >>> State token strings which may be emitted and their meanings: >>> merge a merge is in progress >>> am an am is in progress >>> am-is-emptythe am patch is empty >>> rebase

Re: Fwd: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-13 Thread SZEDER Gábor
Hi, On Tue, Nov 13, 2012 at 03:12:44PM -0500, Marc Khouzam wrote: > >> +if [ -n "$1" ] ; then > >> + # If there is an argument, we know the script is being executed > >> + # so go ahead and run the _git_complete_with_output function > >> + _git_complete_with_output "$1" "$2" > > > > Where does

Re: checkout from neighbour branch undeletes a path?

2012-11-13 Thread Junio C Hamano
Peter Vereshagin writes: > $ rm -r pathdir > $ git checkout branch00 pathdir > $ find pathdir/ > pathdir/ > pathdir/file00.txt > pathdir/file01.txt > $ Hasn't this been fixed at 0a1283b (checkout $tree $path: do not clobber local changes in $path not in $tree, 2011-09-30)? Are you

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

2012-11-13 Thread Junio C Hamano
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 make sure we know what we are deleting before deleting a path. The h

Re: [PATCH 2/2] pickaxe: use textconv for -S counting

2012-11-13 Thread Junio C Hamano
Jeff King writes: > We currently just look at raw blob data when using "-S" to > pickaxe. This is mostly historical, as pickaxe predates the > textconv feature. If the user has bothered to define a > textconv filter, it is more likely that their search string will be > on the textconv output, as

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

2012-11-13 Thread Joe Perches
On Tue, 2012-11-13 at 14:55 -0800, Junio C Hamano wrote: > Joe Perches writes: > > > (Sorry about the partial message. > > evolution and ctrl-enter sends, grumble...) > > > > If a file is deleted with git rm and a patch > > is then generated with git format-patch -M -D > > git am is unable to ap

Re: What's cooking in git.git (Nov 2012, #03; Tue, 13)

2012-11-13 Thread Junio C Hamano
Jeff King writes: > What's cooking in git.git (Nov 2012, #03; Tue, 13) > -- > > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. > > This is

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

2012-11-13 Thread Junio C Hamano
Joe Perches writes: > (Sorry about the partial message. > evolution and ctrl-enter sends, grumble...) > > If a file is deleted with git rm and a patch > is then generated with git format-patch -M -D > git am is unable to apply the resultant patch. > > Is this working as designed? I would say it

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

2012-11-13 Thread Joe Perches
(Sorry about the partial message. evolution and ctrl-enter sends, grumble...) If a file is deleted with git rm and a patch is then generated with git format-patch -M -D git am is unable to apply the resultant patch. Is this working as designed? -- To unsubscribe from this list: send the line "u

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

2012-11-13 Thread Joe Perches
If a file is deleted with git rm and a patch is then generated with git format-patch -M - -- 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

Re: [regression] Newer gits cannot clone any remote repos

2012-11-13 Thread Andreas Schwab
Torsten Bögershausen writes: > Are there more people running PowerPC (on the server side) ? I cannot reproduce the problem (on openSUSE 12.2). Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something comp

Re: [PATCH] update-index/diff-index: use core.preloadindex to improve performance

2012-11-13 Thread Karsten Blees
Am 13.11.2012 17:46, schrieb Junio C Hamano: > karsten.bl...@dcon.de writes: > > If anything, "fix your mailer" probably is the policy you are > looking for, I think. Well then...I've cloned myself @gmail, I hope this is better. Just some provoking thoughts...(if I may): RFC-5322 recommends wra

Re: [PATCH v3 0/5] push: update remote tags only with force

2012-11-13 Thread Junio C Hamano
Chris Rorvick writes: > Minor changes since from v2 set. Reposting primarily because I mucked > up the Cc: list (again) and hoping to route feedback to the appropriate > audience. > > This patch set can be divided into two sets: > > 1. Provide useful advice for rejected tag references. > >

Re: [regression] Newer gits cannot clone any remote repos

2012-11-13 Thread Torsten Bögershausen
On 13.11.12 19:55, Ramsay Jones wrote: > Douglas Mencken wrote: >> *Any* git clone fails with: >> >> fatal: premature end of pack file, 106 bytes missing >> fatal: index-pack failed >> >> At first, I tried 1.8.0, and it failed. Then I tried to build 1.7.10.5 >> then, and it worked. Then I tried 1.7

Re: [PATCH v3 0/8] Fix GIT_CEILING_DIRECTORIES that contain symlinks

2012-11-13 Thread David Aguilar
On Mon, Nov 12, 2012 at 9:47 AM, Junio C Hamano wrote: > Michael Haggerty writes: > >> The log message of the original commit (0454dd93bf) described the >> following scenario: a /home partition under which user home directories >> are automounted, and setting GIT_CEILING_DIRECTORIES=/home to avoi

RE: What's cooking in git.git (Nov 2012, #03; Tue, 13)

2012-11-13 Thread Pyeron, Jason J CTR (US)
> -Original Message- > From: Torsten Bögershausen > Sent: Tuesday, November 13, 2012 3:45 PM > > > * ml/cygwin-mingw-headers (2012-11-12) 1 commit > > - Update cygwin.c for new mingw-64 win32 api headers > > > > Make git work on newer cygwin. > > > > Will merge to 'next'. > > (Sorry fo

Re: What's cooking in git.git (Nov 2012, #03; Tue, 13)

2012-11-13 Thread Torsten Bögershausen
> * ml/cygwin-mingw-headers (2012-11-12) 1 commit > - Update cygwin.c for new mingw-64 win32 api headers > > Make git work on newer cygwin. > > Will merge to 'next'. (Sorry for late answer, I managed to test the original patch minutes before Peff merged it to pu) (And thanks for maintaining

Re: [PATCH] send-email: add proper default sender

2012-11-13 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 5:48 PM, Jeff King wrote: > On Tue, Nov 13, 2012 at 10:06:26AM +0100, Felipe Contreras wrote: >> I think you are the one that is not understanding what I'm saying. But >> I don't think it matters. >> >> This is what I'm saying; the current situation with 'git commit' is >>

[PATCH] gitk - fix a problem with multiline author names

2012-11-13 Thread Tomo Krajina
When commiting with "git-commit" no newline in the author string is possible. But other git clients don't have the same validations for the author name. And, it is possible to have a commit like: commit Merge: a b Author: User Name Date: Thu Nov 8 17:01:02 2012 +0100 Merg

Re: Fwd: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-13 Thread Marc Khouzam
Thanks for the review. On Tue, Nov 13, 2012 at 6:14 AM, SZEDER Gábor wrote: > Hi, > > On Mon, Nov 12, 2012 at 03:07:46PM -0500, Marc Khouzam wrote: >> Hi, > > [...] > >> Signed-off-by: Marc Khouzam > > [...] > >> Thanks >> >> Marc >> >> --- >> contrib/completion/git-completion.bash | 53 >> +

Re: What's cooking in git.git (Nov 2012, #03; Tue, 13)

2012-11-13 Thread Junio C Hamano
Jeff King writes: > This is my final "what's cooking" as interim maintainer. I didn't > graduate anything to master, but I updated my plans for each topic to > give Junio an idea of where I was. After exploding the first-parent history between your master..pu into component topics and recreating

Re: [PATCH nd/wildmatch] Correct Git's version of isprint and isspace

2012-11-13 Thread Linus Torvalds
On Tue, Nov 13, 2012 at 11:40 AM, Linus Torvalds wrote: > > I have to wonder why you care? As far as I'm concerned, the only valid > space is space, TAB and CR/LF. > > Anything else is *noise*, not space. What's the reason for even caring? Btw, expanding the whitespace selection may actually be v

Re: [PATCH nd/wildmatch] Correct Git's version of isprint and isspace

2012-11-13 Thread Linus Torvalds
On Tue, Nov 13, 2012 at 11:15 AM, René Scharfe wrote: > > Linus, do you remember if you left them out on purpose? Umm, no. I have to wonder why you care? As far as I'm concerned, the only valid space is space, TAB and CR/LF. Anything else is *noise*, not space. What's the reason for even caring

Re: [PATCH nd/wildmatch] Correct Git's version of isprint and isspace

2012-11-13 Thread Johannes Sixt
Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy: > @@ -14,11 +14,11 @@ enum { > P = GIT_PATHSPEC_MAGIC, /* other non-alnum, except for ] and } */ > X = GIT_CNTRL, > U = GIT_PUNCT, > - Z = GIT_CNTRL | GIT_SPACE > + Z = GIT_CNTRL_SPACE > }; > > -const unsigned char sane

[PATCH] send-email: stop asking when we have an ident

2012-11-13 Thread Felipe Contreras
From: Felipe Contreras 2nd 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 this is

Re: [PATCH nd/wildmatch] Correct Git's version of isprint and isspace

2012-11-13 Thread René Scharfe
Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy: Git's ispace does not include 11 and 12. [...] > According to glibc-2.14.1 on C locale on Linux, this is wrong. 11 and 12 being vertical tab (\v) and form-feed (\f). This lack goes back to the introduction of git's own character classifier m

Re: [PATCH nd/wildmatch] Correct Git's version of isprint and isspace

2012-11-13 Thread René Scharfe
Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy: Git's isprint includes control space characters (10-13). According to glibc-2.14.1 on C locale on Linux, this is wrong. This patch fixes it. isprint() is not in master, yet. Can we perhaps still introduce it in such a way that we never have a

Re: [PATCH nd/wildmatch] Correct Git's version of isprint and isspace

2012-11-13 Thread Jan H. Schönherr
Hi. Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy: > Git's ispace does not include 11 and 12. Git's isprint includes > control space characters (10-13). According to glibc-2.14.1 on C > locale on Linux, this is wrong. This patch fixes it. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > I wr

Re: [regression] Newer gits cannot clone any remote repos

2012-11-13 Thread Ramsay Jones
Douglas Mencken wrote: > *Any* git clone fails with: > > fatal: premature end of pack file, 106 bytes missing > fatal: index-pack failed > > At first, I tried 1.8.0, and it failed. Then I tried to build 1.7.10.5 > then, and it worked. Then I tried 1.7.12.2, but it fails the same way > as 1.8.0. >

Re: What's cooking in git.git (Oct 2012, #09; Mon, 29)

2012-11-13 Thread Ramsay Jones
Jeff King wrote: > On Sat, Nov 10, 2012 at 06:33:38PM +, Ramsay Jones wrote: > >>> We should probably wrap it. I'm planning to queue this on top of Chris's >>> patch: >> >> Unfortunately, I haven't had time yet to test this patch. (Early this week, I >> went into hospital for a "minor" surgica

Re: checkout from neighbour branch undeletes a path?

2012-11-13 Thread Peter Vereshagin
Hello. 2012/11/13 08:43:31 -0800 Junio C Hamano => To Peter Vereshagin : JCH> Peter Vereshagin writes: JCH> JCH> > Am wondering if 'checkout branch path' undeletes the files? JCH> JCH> "git checkout branch path" (by the way, "branch" does not have to be JCH> a branch name; any commit object n

Re: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-13 Thread Felipe Contreras
On Mon, Nov 12, 2012 at 9:07 PM, Marc Khouzam wrote: > this patch allows tcsh-users to get the benefits of the awesome > git-completion.bash script. It could also help other shells do the same. Maybe you can try to take a look at the same for zsh: http://article.gmane.org/gmane.comp.version-con

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

2012-11-13 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 11:15 AM, Michael J Gruber wrote: > 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 an

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
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 blank line in that > case. Second try. -- >8 -- Subject: forma

Re: [PATCH 15/13] compat/fnmatch: fix off-by-one character class's length check

2012-11-13 Thread Johannes Sixt
Am 11.11.2012 11:13, schrieb Nguyễn Thái Ngọc Duy: > - if (c1 == CHAR_CLASS_MAX_LENGTH) > + if (c1 > CHAR_CLASS_MAX_LENGTH) Nice catch! With this one and 14/13, all tests in t3070 pass on Windows. -- Hannes -- To unsubscribe from this list: send the line "

Re: [PATCH 14/13] test-wildmatch: avoid Windows path mangling

2012-11-13 Thread Johannes Sixt
Am 13.11.2012 11:06, schrieb Nguyễn Thái Ngọc Duy: > On Windows, arguments starting with a forward slash is mangled as if > it were full pathname. This causes the patterns beginning with a slash > not to be passed to test-wildmatch correctly. Avoid mangling by never > accepting patterns starting wi

What's cooking in git.git (Nov 2012, #03; Tue, 13)

2012-11-13 Thread Jeff King
What's cooking in git.git (Nov 2012, #03; Tue, 13) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. This is my final "what's cooking" as inte

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Junio C Hamano writes: > As the topic seems to be already in Peff's next, here is a trivial > fix for this in incremental form. > > -- >8 -- > Subject: format-patch: add a blank line between notes and diffstat > > The last line of the note text comes immediately before the diffstat > block, makin

Re: [PATCH 5/6] Git.pm: teach "ident" to query explicitness

2012-11-13 Thread Jeff King
On Tue, Nov 13, 2012 at 09:23:00AM -0800, Matt Kraai wrote: > Minor nits: > > On Tue, Nov 13, 2012 at 11:53:20AM -0500, Jeff King wrote: > > @@ -750,6 +750,10 @@ and either returns it as a scalar string or as an > > array with the fields parsed. > > Alternatively, it can take a prepared ident s

Re: [PATCH] send-email: add proper default sender

2012-11-13 Thread Junio C Hamano
Jeff King writes: > On Tue, Nov 13, 2012 at 08:13:04AM -0800, Junio C Hamano wrote: > >> >> That's right, AUTHOR_IDENT would fall back to the default email and full >> >> name. >> > >> > Yeah, I find that somewhat questionable in the current behavior, and I'd >> > consider it a bug. Typically we

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-13 Thread Jakub Narębski
On Tue, Nov 13, 2012 at 6:04 PM, Jeff King wrote: > On Tue, Nov 13, 2012 at 09:44:06AM -0500, Drew Northup wrote: >> Besides, inserting one call to esc_html only fixes one attack path. I >> didn't look to see if all others were already covered. > > Properly quoting output is something that the we

Re: [PATCH] send-email: add proper default sender

2012-11-13 Thread Erik Faye-Lund
On Tue, Nov 13, 2012 at 12:35 AM, Jeff King wrote: > On Sun, Nov 11, 2012 at 06:06:50PM +0100, Felipe Contreras wrote: > >> There's no point in asking this over and over if the user already >> properly configured his/her name and email. >> >> Signed-off-by: Felipe Contreras >> --- >> >> I got rea

Re: [PATCH] send-email: add proper default sender

2012-11-13 Thread Jeff King
On Tue, Nov 13, 2012 at 08:13:04AM -0800, Junio C Hamano wrote: > >> That's right, AUTHOR_IDENT would fall back to the default email and full > >> name. > > > > Yeah, I find that somewhat questionable in the current behavior, and I'd > > consider it a bug. Typically we prefer the committer ident

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-13 Thread Jeff King
On Tue, Nov 13, 2012 at 09:44:06AM -0500, Drew Northup wrote: > I don't buy the argument that we don't need to clean up the input as > well. There are scant few of us that are going to name a file > "alert("Something Awful")" in this world (I am > probably one of them). Input validation is key to

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Junio C Hamano writes: > Michael J Gruber writes: > >> 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

[PATCH 6/6] send-email: do not prompt for explicit repo ident

2012-11-13 Thread Jeff King
If git-send-email is configured with sendemail.from, we will not prompt the user for the "From" address of the emails. If it is not configured, we prompt the user, but provide the repo author or committer as a default. Even though we probably have a sensible value for the default, the prompt is a

[PATCH 5/6] Git.pm: teach "ident" to query explicitness

2012-11-13 Thread Jeff King
"git var" recently learned to report on whether an ident we fetch from it was configured explicitly or implicitly. Let's make that information available to callers of the ident function. Because evaluating "ident" in an array versus scalar context already has a meaning, we cannot return our extra

[PATCH 4/6] var: provide explicit/implicit ident information

2012-11-13 Thread Jeff King
Internally, we keep track of whether the author or committer ident information was provided by the user, or whether it was implicitly determined by the system. However, there is currently no way for external programs or scripts to get this information without re-implementing the ident logic themsel

[PATCH 3/6] var: accept multiple variables on the command line

2012-11-13 Thread Jeff King
Git-var currently only accepts a single value to print. This is inefficient if the caller is interested in finding multiple values, as they must invoke git-var multiple times. This patch lets callers specify multiple variables, and prints one per line. Signed-off-by: Jeff King --- This will late

[PATCH 2/6] ident: keep separate "explicit" flags for author and committer

2012-11-13 Thread Jeff King
We keep track of whether the user ident was given to us explicitly, or if we guessed at it from system parameters like username and hostname. However, we kept only a single variable. This covers the common cases (because the author and committer will usually come from the same explicit source), but

[PATCH 1/6] ident: make user_ident_explicitly_given private

2012-11-13 Thread Jeff King
There are no users of this global variable, as queriers go through the user_ident_sufficiently_given accessor. Let's make it private, which will enable further refactoring. Signed-off-by: Jeff King --- cache.h | 4 ident.c | 6 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff -

Re: [PATCH] send-email: add proper default sender

2012-11-13 Thread Jeff King
On Tue, Nov 13, 2012 at 10:06:26AM +0100, Felipe Contreras wrote: > > Those people would also not be using a new version of git-send-email, > > and it will always prompt. I thought we were talking about what > > send-email should do in future versions. Namely, loosening that safety > > valve (the

Re: [PATCH] update-index/diff-index: use core.preloadindex to improve performance

2012-11-13 Thread Junio C Hamano
karsten.bl...@dcon.de writes: > Jeff King wrote on 02.11.2012 16:38:00: > >> On Fri, Nov 02, 2012 at 11:26:16AM -0400, Jeff King wrote: >> >> > Still, I don't think we need to worry about performance regressions, >> > because people who don't have a setup suitable for it will not turn on >> > co

Re: checkout from neighbour branch undeletes a path?

2012-11-13 Thread Junio C Hamano
Peter Vereshagin writes: > Am wondering if 'checkout branch path' undeletes the files? "git checkout branch path" (by the way, "branch" does not have to be a branch name; any commit object name would do, like "git checkout HEAD^^ hello.c") is a way to check out named path(s) out of the named com

Re: Commit message problem of reverting multiple commits

2012-11-13 Thread Junio C Hamano
乙酸鋰 writes: > I ran git 1.8.0 command line > > git revert --no-commit rev1 rev2 > > I see a prepared commit message like > > Revert "" > This reverts commit . > > > The actual revert content is correct - it is all the relevant commits > that were selected. I expect the message to reflect this: >

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Michael J Gruber writes: > 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 th

Re: [PATCH 2/3] diff: introduce diff.submodule configuration variable

2012-11-13 Thread Junio C Hamano
Ramkumar Ramachandra writes: > Jeff King wrote: >> On Sun, Nov 11, 2012 at 10:29:05PM +0530, Ramkumar Ramachandra wrote: >>> @@ -223,6 +238,15 @@ int git_diff_basic_config(const char *var, const char >>> *value, void *cb) >>> return 0; >>> } >>> >>> + if (!strcmp(var, "di

Re: [PATCH] send-email: add proper default sender

2012-11-13 Thread Junio C Hamano
Jeff King writes: > On Tue, Nov 13, 2012 at 07:42:58AM +0100, Felipe Contreras wrote: > ... >> 5) GIT_COMMITTER >> >> Who should the emails appear to be from? [Felipe Contreras 2nd >> ] >> >> Whoa, what happened there? >> >> Well: >> >> $sender = $repoauthor || $repocommitter || ''; >> ($

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-13 Thread Jakub Narębski
On Tue, Nov 13, 2012 at 4:45 PM, Kevin wrote: > The problem with input filtering is that you can only filter for one > output scenario. What if the the input is going to be output in a wiki > like environment, or to pdf, or whatever? Then you have to unescape > the data again, and maybe apply filt

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-13 Thread Kevin
The problem with input filtering is that you can only filter for one output scenario. What if the the input is going to be output in a wiki like environment, or to pdf, or whatever? Then you have to unescape the data again, and maybe apply filtering/escaping for those environments. You only know h

Re: [PATCH 2/3] diff: introduce diff.submodule configuration variable

2012-11-13 Thread Ramkumar Ramachandra
Jeff King wrote: > On Sun, Nov 11, 2012 at 10:29:05PM +0530, Ramkumar Ramachandra wrote: >> @@ -223,6 +238,15 @@ int git_diff_basic_config(const char *var, const char >> *value, void *cb) >> return 0; >> } >> >> + if (!strcmp(var, "diff.submodule")) { > > Shouldn't this be

[PATCH v4 4/4] submodule: display summary header in bold

2012-11-13 Thread Ramkumar Ramachandra
Currently, 'git diff --submodule' displays output with a bold diff header for non-submodules. So this part is in bold: diff --git a/file1 b/file1 index 30b2f6c..2638038 100644 --- a/file1 +++ b/file1 For submodules, the header looks like this: Submodule submodule1 012b072..2

[PATCH v4 3/4] diff: rename "set" variable

2012-11-13 Thread Ramkumar Ramachandra
From: Jeff King Once upon a time the builtin_diff function used one color, and the color variables were called "set" and "reset". Nowadays it is a much longer function and we use several colors (e.g., "add", "del"). Rename "set" to "meta" to show that it is the color for showing diff meta-info (i

[PATCH v4 2/4] diff: introduce diff.submodule configuration variable

2012-11-13 Thread Ramkumar Ramachandra
Introduce a diff.submodule configuration variable corresponding to the '--submodule' command-line option of 'git diff'. Signed-off-by: Ramkumar Ramachandra --- Documentation/diff-config.txt|7 +++ Documentation/diff-options.txt |3 ++- diff.c | 32 ++

[PATCH v4 1/4] Documentation: move diff.wordRegex from config.txt to diff-config.txt

2012-11-13 Thread Ramkumar Ramachandra
19299a8 (Documentation: Move diff..* from config.txt to diff-config.txt, 2011-04-07) moved the diff configuration options to diff-config.txt, but forgot about diff.wordRegex, which was left behind in config.txt. Fix this. Signed-off-by: Ramkumar Ramachandra --- Documentation/config.txt |

[PATCH v4 0/4] Introduce diff.submodule

2012-11-13 Thread Ramkumar Ramachandra
v1 is here: http://mid.gmane.org/1349196670-2844-1-git-send-email-artag...@gmail.com v2 is here: http://mid.gmane.org/1351766630-4837-1-git-send-email-artag...@gmail.com v3 is here: http://mid.gmane.org/1352653146-3932-1-git-send-email-artag...@gmail.com This version was prepared in response to

Re: [PATCH] update-index/diff-index: use core.preloadindex to improve performance

2012-11-13 Thread karsten . blees
Jeff King wrote on 02.11.2012 16:38:00: > On Fri, Nov 02, 2012 at 11:26:16AM -0400, Jeff King wrote: > > > Still, I don't think we need to worry about performance regressions, > > because people who don't have a setup suitable for it will not turn on > > core.preloadindex in the first place. And

Re: [PATCH] update-index/diff-index: use core.preloadindex to improve performance

2012-11-13 Thread karsten . blees
Jeff King wrote on 02.11.2012 16:26:16: > On Tue, Oct 30, 2012 at 10:50:42AM +0100, karsten.bl...@dcon.de wrote: > > > 'update-index --refresh' and 'diff-index' (without --cached) don't honor > > the core.preloadindex setting yet. Porcelain commands using these (such as > > git [svn] rebase) s

checkout from neighbour branch undeletes a path?

2012-11-13 Thread Peter Vereshagin
Hello. Am wondering if 'checkout branch path' undeletes the files? For the example below I'd like the 'file00.txt' to be deleted and never checked out from the previous branch... How can I do that? $ git init

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-13 Thread Jakub Narębski
On Tue, Nov 13, 2012 at 3:44 PM, Drew Northup wrote: > On Mon, Nov 12, 2012 at 3:24 PM, Jeff King wrote: >> On Mon, Nov 12, 2012 at 01:55:46PM -0500, Drew Northup wrote: >>> + # No XSS inclusions >>> + if ($input =~ m!()(.*)()!){ >>> + return undef; >>> + } >> T

Commit message problem of reverting multiple commits

2012-11-13 Thread 乙酸鋰
Hi, I ran git 1.8.0 command line git revert --no-commit rev1 rev2 I see a prepared commit message like Revert "" This reverts commit . The actual revert content is correct - it is all the relevant commits that were selected. I expect the message to reflect this: Revert "", "" This reverts co

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-13 Thread Drew Northup
On Mon, Nov 12, 2012 at 3:24 PM, Jeff King wrote: > On Mon, Nov 12, 2012 at 01:55:46PM -0500, Drew Northup wrote: > >> On Sun, Nov 11, 2012 at 6:28 PM, glpk xypron wrote: >> > Gitweb can be used to generate an RSS feed. >> > >> > Arbitrary tags can be inserted into the XML document describing >>

Re: [PATCH 0/5] win32: support echo for terminal-prompt

2012-11-13 Thread Erik Faye-Lund
Sorry, I messed up the subject (lacking RFC-prefix), so I aborted after sending the cover-letter. I'll resend with a proper prefix right away. On Tue, Nov 13, 2012 at 3:01 PM, Erik Faye-Lund wrote: > We currently only support getpass, which does not echo at all, for > git_terminal_prompt on Windo

[PATCH/RFC 4/5] mingw: reuse tty-version of git_terminal_prompt

2012-11-13 Thread Erik Faye-Lund
The getpass-implementation we use on Windows isn't at all ideal; it works in raw-mode (as opposed to cooked mode), and as a result does not deal correcly with deletion, arrow-keys etc. Instead, use cooked mode to read a line at the time, allowing the C run-time to process the input properly. Sinc

[PATCH/RFC 5/5] mingw: get rid of getpass implementation

2012-11-13 Thread Erik Faye-Lund
There's no remaining call-sites, and as pointed out in the previous commit message, it's not quite ideal. So let's just lose it. Signed-off-by: Erik Faye-Lund --- compat/mingw.c | 15 --- compat/mingw.h | 2 -- 2 files changed, 17 deletions(-) diff --git a/compat/mingw.c b/compat/m

[PATCH/RFC 3/5] compat/terminal: separate input and output handles

2012-11-13 Thread Erik Faye-Lund
On Windows, the terminal cannot be opened in read-write mode, so we need distinct pairs for reading and writing. Since this works fine on other platforms as well, always open them in pairs. Signed-off-by: Erik Faye-Lund --- compat/terminal.c | 29 ++--- 1 file changed, 18

[PATCH/RFC 2/5] compat/terminal: factor out echo-disabling

2012-11-13 Thread Erik Faye-Lund
By moving the echo-disabling code to a separate function, we can implement OS-specific versions of it for non-POSIX platforms. Signed-off-by: Erik Faye-Lund --- compat/terminal.c | 43 +-- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/com

[PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate

2012-11-13 Thread Erik Faye-Lund
Set a control-handler to prevent the process from terminating, and simulate SIGINT so it can be handled by a signal-handler as usual. Signed-off-by: Erik Faye-Lund --- compat/mingw.c | 76 ++ compat/mingw.h | 6 + 2 files changed, 72 i

[PATCH/RFC 0/5] win32: support echo for terminal-prompt

2012-11-13 Thread Erik Faye-Lund
We currently only support getpass, which does not echo at all, for git_terminal_prompt on Windows. The Windows console is perfectly capable of doing this, so let's make it so. This implementation tries to reuse the /dev/tty-code as much as possible. The big reason that this becomes a bit hairy is

[PATCH 0/5] win32: support echo for terminal-prompt

2012-11-13 Thread Erik Faye-Lund
We currently only support getpass, which does not echo at all, for git_terminal_prompt on Windows. The Windows console is perfectly capable of doing this, so let's make it so. This implementation tries to reuse the /dev/tty-code as much as possible. The big reason that this becomes a bit hairy is

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

2012-11-13 Thread Jeff King
On Tue, Nov 13, 2012 at 11:34:11AM +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 the argument to 'replace -d' in the same way. > > Signe

Re: Reviews on mailing-list

2012-11-13 Thread Nguyen Thai Ngoc Duy
On Mon, Nov 12, 2012 at 4:15 AM, David Lang wrote: > Using a web browser requires connectivity at the time you are doing the > review. > > Mailing list based reviews can be done at times when you don't have > connectivity. I am not against email-based reviews but I'd like to point out that with G

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

2012-11-13 Thread Jeff King
On Tue, Nov 13, 2012 at 11:30:19AM +0100, Michael J Gruber wrote: > 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. > > > > Mak

Simple question ? [Git branch]

2012-11-13 Thread agatte
Hi All Users, I am beginner in git. I am doing my first steps with this tool. Now, I used git gui on linux OS. I don't know what I could change branches ? I need to change current working branch to do a commit. I can see in the menu branch : Create checkout rebase Reset -- Could anyone help me pl

Re: Fwd: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-13 Thread SZEDER Gábor
Hi, On Mon, Nov 12, 2012 at 03:07:46PM -0500, Marc Khouzam wrote: > Hi, [...] > Signed-off-by: Marc Khouzam [...] > Thanks > > Marc > > --- > contrib/completion/git-completion.bash | 53 > +++- > contrib/completion/git-completion.tcsh | 34 +

[PATCH nd/wildmatch] Correct Git's version of isprint and isspace

2012-11-13 Thread Nguyễn Thái Ngọc Duy
Git's ispace does not include 11 and 12. Git's isprint includes control space characters (10-13). According to glibc-2.14.1 on C locale on Linux, this is wrong. This patch fixes it. Signed-off-by: Nguyễn Thái Ngọc Duy --- I wrote a small C program to compare the result of all is* functions that

[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 the aux variable more concis

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

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

  1   2   >