[ANNOUNCE] Git v1.7.11.7

2012-09-15 Thread Junio C Hamano
A maintenance release Git v1.7.11.7 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 30c7aafaa31002ca52bc45dbd0908e63b00015dd git-1.7.11.7.tar.gz

Re: Failing svn imports from apache.org

2012-09-15 Thread Enrico Weigelt
Does anyone have an idea, what might be wrong here / how to fix it ? Here: git svn --version git-svn version 1.7.12.592.g41e7905 (svn 1.6.18) What's yours? 1.7.9.5 (ubuntu precise) I'm getting Initialized empty Git repository in /tmp/discovery/.git/ Using higher level of URL:

Re: What's cooking in git.git (Sep 2012, #05; Fri, 14)

2012-09-15 Thread Joachim Schmitz
Junio C Hamano wrote: I think we can start thinking about feature freeze once the topics in 'next' that are scheduled to graduate to 'master' already are fully cooked. For any late-coming topic, there always is the next cycle ;-) I've not hear anything about my poll patches and I'd really

Re: [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert

2012-09-15 Thread Bert Wesarg
On Sat, Sep 15, 2012 at 1:36 AM, vi0...@gmail.com wrote: From: Vitaly _Vi Shukela vi0...@gmail.com Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave more like Ctrl+T for adding. They were working only when one area was focused (diff or commit message), now they should

[PATCH 0/5] Support matching ** in .gitattributes and .gitignore

2012-09-15 Thread Nguyễn Thái Ngọc Duy
A while back I posted a proof of concept using wildmatch() from rsync. Back then the obstacle was case-insensitive matching support. I did not realize that there was iwildmatch() that does exactly that. So here again a series that is probably ready for consumption. Now patterns that contain

[PATCH 1/5] Import wildmatch from rsync

2012-09-15 Thread Nguyễn Thái Ngọc Duy
These files are from rsync.git commit d51a3adb4fca3e6b1b046c6e570828f3bca8fe36. The commit is GPL-3. However wildmatch.[ch] have not changed since rsync turned to GPL-3. rsync.git - git.git lib/wildmatch.[ch] compat/wildmatch.[ch] wildtest.c test-wildmatch.c

[PATCH 2/5] compat/wildmatch: remove static variable force_lower_case

2012-09-15 Thread Nguyễn Thái Ngọc Duy
One place less to worry about thread safety Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- compat/wildmatch.c | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/compat/wildmatch.c b/compat/wildmatch.c index f3a1731..e824eb2 100644 ---

[PATCH 3/5] compat/wildmatch: fix case-insensitive matching

2012-09-15 Thread Nguyễn Thái Ngọc Duy
dowild() does case insensitive matching by lower-casing the text. That means lower case letters in patterns imply case-insensitive matching, but upper case means exact matching. We do not want that subtlety. Lower case pattern too so iwildmatch() always does what we expect it to do.

[PATCH 4/5] Integrate wildmatch to git

2012-09-15 Thread Nguyễn Thái Ngọc Duy
This makes wildmatch.c part of libgit.a and builds test-wildmatch Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Makefile | 6 ++ compat/wildmatch.c | 8 +++- t/t3070-wildmatch.sh | 27 +++ test-wildmatch.c | 8 +++- 4 files

[PATCH 5/5] Support ** in .gitignore and .gitattributes patterns using wildmatch()

2012-09-15 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/gitignore.txt | 3 +++ attr.c | 4 +++- dir.c | 5 - 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt

Using git-replace in place of grafts -- and publishing .git/refs/replace between repos?

2012-09-15 Thread David Chanters
Hi, Earlier this month I asked how best to handle two branches without a common ancestor to sync changes from one branch to another. Initially I did this via the grafts mechanism, but this wasn't a shared solution, in that the graft was local to my checkout of the repository and no one else's.

Re: How do I pronounce blob?

2012-09-15 Thread Jan Engelhardt
On Saturday 2012-09-15 15:24, Yi, EungJun wrote: bee-lob or bla:b? http://en.wiktionary.org/wiki/blob BLOB as a Binary Large OBject reeks of a retronym. I guess bee-lob is correct if it means binary large object. But I'm not sure because gitglossary does not tell me about that. -- To

How to create the [PATCH 0/5] first email?

2012-09-15 Thread Philip Oakley
The git format-patch allows numbered patches to be created, however I'm not sure how folk generate the initial 0/n patch. Which of the various options should I be using? Also, being on windows, the various 'mbox' and 'MUA' discussions are new to me, so the format-patch step where :- Typically

Re: How do I pronounce blob?

2012-09-15 Thread Yi, EungJun
Thanks for your help, Jan! On Sat, Sep 15, 2012 at 10:26 PM, Jan Engelhardt jeng...@inai.de wrote: On Saturday 2012-09-15 15:24, Yi, EungJun wrote: bee-lob or bla:b? http://en.wiktionary.org/wiki/blob BLOB as a Binary Large OBject reeks of a retronym. I guess bee-lob is correct if it means

Re: How to create the [PATCH 0/5] first email?

2012-09-15 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: Typically it will be placed in a MUA’s drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with arch/arm config files were…. On the

RE: What's cooking in git.git (Sep 2012, #05; Fri, 14)

2012-09-15 Thread Joachim Schmitz
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Saturday, September 15, 2012 7:01 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: What's cooking in git.git (Sep 2012, #05; Fri, 14) Joachim Schmitz j...@schmitz-digital.de writes: Junio C Hamano wrote: I think we can

Re: How do I pronounce blob?

2012-09-15 Thread Martin Langhoff
On Sat, Sep 15, 2012 at 9:24 AM, Yi, EungJun semtlen...@gmail.com wrote: bee-lob or bla:b? Like Bob, add an L in there. m -- martin.langh...@gmail.com mar...@laptop.org -- Software Architect - OLPC - ask interesting questions - don't get distracted with shiny stuff - working code first

Re: Using git-replace in place of grafts -- and publishing .git/refs/replace between repos?

2012-09-15 Thread Junio C Hamano
David Chanters david.chant...@googlemail.com writes: 1. I thought the replace data in .git/refs/replace was published when I did git push so that others could use this information as a base-point, yet it seems not to be the case. How do I publish this? If you don't tell it what to push, the

[PATCH] test-generation.c: Fix a compiler warning

2012-09-15 Thread Ramsay Jones
gcc complains as follows: CC test-generation.o test-generation.c: In function `main': test-generation.c:105: warning: control reaches end of \ non-void function In order to suppress the warning, we simply add a suitable return statement to main(). Signed-off-by: Ramsay

[PATCH 0/3] rebase -i: Teach --edit-todo

2012-09-15 Thread Andrew Wong
The flag will allow the user to edit the todo file while they're in the middle of an interactive rebase. It simply invoke the editor and do nothing else. More discussions here: http://thread.gmane.org/gmane.comp.version-control.git/205133/focus=205182 Andrew Wong (3): rebase -i: Refactor

Re: [PATCHv2 01/12] git p4 test: remove bash-ism of combined export/assignment

2012-09-15 Thread Luke Diamand
Looks good to me, ack. On 09/09/12 21:16, Pete Wyckoff wrote: Signed-off-by: Pete Wyckoffp...@padd.com --- t/lib-git-p4.sh | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 2d753ab..482eeac 100644 --- a/t/lib-git-p4.sh +++

Re: Using git-replace in place of grafts -- and publishing .git/refs/replace between repos?

2012-09-15 Thread David Chanters
Hi, On 15 September 2012 18:21, Junio C Hamano gits...@pobox.com wrote: David Chanters david.chant...@googlemail.com writes: 2. If I do publish it, are there any caveats with that? i.e., because the replace data will likely point to a repo which in my working checkout I added with

Re: [PATCHv2 03/12] git p4: remove submit failure options [a]pply and [w]rite

2012-09-15 Thread Luke Diamand
git-p4 won't be quite the same without these completely misleading and confusing messages :-) Ack. On 09/09/12 21:16, Pete Wyckoff wrote: When a patch failed to apply, these interactive options offered to: 1) apply the patch anyway, leaving reject (.rej) files around, or, 2)

Re: [PATCHv2 04/12] git p4: move conflict prompt into run, add [q]uit input

2012-09-15 Thread Luke Diamand
I'll need to supply a followup patch to ensure that a config option can override the prompt. Ack. On 09/09/12 21:16, Pete Wyckoff wrote: When applying a commit to the p4 workspace fails, a prompt asks what to do next. This belongs up in run() instead of in applyCommit(), where run() can

Re: [PATCHv2 05/12] git p4: standardize submit cancel due to unchanged template

2012-09-15 Thread Luke Diamand
Ack. On 09/09/12 21:16, Pete Wyckoff wrote: When editing the submit template, if no change was made to it, git p4 offers a prompt Submit anyway?. Answering no cancels the submit. Previously, a no answer behaves like a [s]kip answer to the failed-patch prompt, in that it proceeded to try to

Re: Using git-replace in place of grafts -- and publishing .git/refs/replace between repos?

2012-09-15 Thread Christian Couder
Hi, On Sat, Sep 15, 2012 at 11:49 PM, David Chanters david.chant...@googlemail.com wrote: Hi, On 15 September 2012 18:21, Junio C Hamano gits...@pobox.com wrote: Assuming that they do, pushing the replacement ref makes the replacing object available in the pushed-into repository, so they

Unable to clone GIT project

2012-09-15 Thread Ankush_Aggarwal
I have created a GIT repository on Linux 64 bit machine. When I tried to clone GIT repository on windows 7 machine then I am getting below error. Error: git-upload-pack: error while loading shared libraries: libiconv.so.2: cannot open shared object file: No such file or directory fatal: The

[PATCH] Add userdiff patterns for Ada

2012-09-15 Thread Adrian Johnson
Add Ada xfuncname and wordRegex patterns to the list of builtin patterns. Signed-off-by: Adrian Johnson ajohn...@redneon.com --- Documentation/gitattributes.txt | 2 ++ t/t4018-diff-funcname.sh| 2 +- t/t4034-diff-words.sh | 1 + t/t4034/ada/expect | 27