Re: How can I tell if anything was fetched?

2012-10-11 Thread Johannes Sixt
Am 10/11/2012 18:25, schrieb Phil Lawrence: > What is the best way to know whether or not anything was received > during the fetch? I don't want to be stuck trying to parse the answer > out of STDOUT and STDERR... what="--all" # or "--remotes=the-remote" presha1s=$(git rev-parse $what) git fe

[PATCH] http: fix segfault in handle_curl_result

2012-10-11 Thread Jeff King
On Fri, Oct 12, 2012 at 12:58:21AM -0400, Brad Hein wrote: > In Fedora 17 > With git-1.7.11.7-1.fc17.x86_64 (rpm) > > I try to clone a particular repository but git just returns, having > not cloned the repo. Seems like a bug. Details follow: > $ git clone http://gnuradio.org/git/gnuradio.git

Re: build deps

2012-10-11 Thread Thiago Farina
On Thu, Oct 11, 2012 at 10:06 PM, Andrew Wong wrote: > On 10/11/12 16:54, Thiago Farina wrote: >> Just setting CC to gcc works for me. But still, I'd like to be able to >> build with clang (may be as you noted is just something with the + in >> my PATH). > Oh, I just realized you were using "sudo"

Re: A basic question

2012-10-11 Thread PJ Weisberg
On Thu, Oct 11, 2012 at 10:38 AM, Jim Vahl wrote: > 1) Does git have a built-in way to get a list of all of the "most recently > committed" files only at a given point in time, thus automatically recording > the revisions of all of the component files of a release? This implies > that for files

Re: build deps

2012-10-11 Thread Andrew Wong
On 10/11/12 16:54, Thiago Farina wrote: > Just setting CC to gcc works for me. But still, I'd like to be able to > build with clang (may be as you noted is just something with the + in > my PATH). Oh, I just realized you were using "sudo". The PATH environment was probably not inherited when you us

Re: A basic question

2012-10-11 Thread Sitaram Chamarty
On Thu, Oct 11, 2012 at 11:08 PM, Jim Vahl wrote: > Drew, > > Thanks for responding to my email! > > Yes, I did read most of the Book, although I admit that I skimmed over some > of the more technical parts. There is still a key part of how git is used > in a commercial environment which I don't

Re: [PATCH] git-cvsimport: support local timezone

2012-10-11 Thread Christopher Rorvick
On Thu, Oct 11, 2012 at 5:43 PM, Michael Haggerty wrote: > On 10/11/2012 10:48 PM, Chris Rorvick wrote: >> CVS patches are unconditionally imported with a UTC timezone. Allow >> the local timezone by adding -l to the command line or specifying >> cvsimport.l in the config. >> >> This could be mad

Re: [PATCH v4 00/12] Wildmatch v4

2012-10-11 Thread Junio C Hamano
Junio C Hamano writes: > Ahh, it must be this bits from t/test-lib.sh > > t/test-lib.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git i/t/test-lib.sh w/t/test-lib.sh > index 514282c..489bc80 100644 > --- i/t/test-lib.sh > +++ w/t/test-lib.sh > @@ -230,7 +230,7 @@ else >

Re: [minor] two tests broken when run with a --root directory that's a symlink

2012-10-11 Thread Junio C Hamano
Michael Haggerty writes: > I ran into the same problem a while ago, and submitted a patch series > that fixes t4035 (whose problems are related to GIT_CEILING_DIRECTORIES): > > http://thread.gmane.org/gmane.comp.version-control.git/206633 > > Junio didn't like the approach so much and I haven

Re: [minor] two tests broken when run with a --root directory that's a symlink

2012-10-11 Thread Michael Haggerty
On 10/11/2012 11:55 PM, Ævar Arnfjörð Bjarmason wrote: > These issues are minor, I noticed it because I test with /dev/shm/git > as the --root, which on Debian is symlinked to /run/.. > > $ rm -rf /tmp/{foo,bar} > $ mkdir /tmp/target; ln -s /tmp/target /tmp/link > $ prove ./t4035-diff-

Re: [PATCH] git-cvsimport: support local timezone

2012-10-11 Thread Michael Haggerty
On 10/11/2012 10:48 PM, Chris Rorvick wrote: > CVS patches are unconditionally imported with a UTC timezone. Allow > the local timezone by adding -l to the command line or specifying > cvsimport.l in the config. > > This could be made the default behavior, as setting TZ=UTC in the > environment b

[PATCH] bash prompt: fix tests when run with a symlink --root

2012-10-11 Thread SZEDER Gábor
Some __gitdir() tests fail when they're run with a --root directory which is a symlink, because they use $TRASH_DIRECTORY to construct the expected absolute paths. Use the path got from 'pwd -P' instead throughout the test script. Signed-off-by: SZEDER Gábor --- t/t9903-bash-prompt.sh | 34

[minor] two tests broken when run with a --root directory that's a symlink

2012-10-11 Thread Ævar Arnfjörð Bjarmason
These issues are minor, I noticed it because I test with /dev/shm/git as the --root, which on Debian is symlinked to /run/.. $ rm -rf /tmp/{foo,bar} $ mkdir /tmp/target; ln -s /tmp/target /tmp/link $ prove ./t4035-diff-quiet.sh ./t9903-bash-prompt.sh :: --root=/tmp/target ./t4035-d

[PATCH] gitweb.cgi: fix "comitter_tz" typo in feed

2012-10-11 Thread Dylan Alex Simon
gitweb's feeds sometimes contained committer timestamps in the wrong timezone due to a misspelling. Signed-off-by: Dylan Simon --- gitweb/gitweb.perl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 7f8c187..10ed9e5 100755 --- a

[PATCH] git-cvsimport: support local timezone

2012-10-11 Thread Chris Rorvick
CVS patches are unconditionally imported with a UTC timezone. Allow the local timezone by adding -l to the command line or specifying cvsimport.l in the config. This could be made the default behavior, as setting TZ=UTC in the environment before doing the import is equivalent to the current behav

Re: build deps

2012-10-11 Thread Thiago Farina
On Mon, Oct 8, 2012 at 7:52 PM, Andrew Wong wrote: > On 10/08/12 17:36, Thiago Farina wrote: >> OK, after running ./configure I tried the make command again. >> >> CC credential-store.o >> /bin/sh: clang: not found >> make: *** [credential-store.o] Error 127 >> >> $ which clang >> /home/tfarina/ch

Re: [BUG] "git commit" after "cherry-pick -n" conflict clobbers .git/COMMIT_EDITMSG

2012-10-11 Thread dirson
> > ~/softs/linux$ echo foo > .git/COMMIT_EDITMSG > > Why are you mucking with such an internal implementation detail in > the first place? I only tried to make it terse for the bugreport, I hit this while I was resolving conflicts during a merge. I aknowledge that using "cherry-pick -n" to bring

Re: filter-branch IO optimization

2012-10-11 Thread Thomas Rast
Enrico Weigelt writes: > for certain projects, I need to regularily run filter-branch on quite > large repos (>10k commits), and that needs to be run multiple times, > which takes several hours, so I'm looking for optimizations. [...] > #2: run a tree-filter which: > * removes all files not b

Re: [PATCH] MALLOC_CHECK: Allow checking to be disabled from config.mak

2012-10-11 Thread Ramsay Jones
Junio C Hamano wrote: > Ramsay Jones writes: > >> Yes, so I can simply disable the malloc checks in my ~/.bashrc file. >> However, it would be disappointing to have my config tweeks in two >> places ... :( >> >> I guess I can live with it ... > > You could write "export that-variable" in your co

[ANNOUNCE] Git v1.8.0-rc2

2012-10-11 Thread Junio C Hamano
A release candidate Git v1.8.0-rc2 is now available for testing 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: 6c8076b3bcf08ffc53a64bbfb0fa69f82096f711 git-1.8.0.rc2.tar.gz 86aca88717928d9d3a38c47a315d

Re: [Patch v2 0/8] Create single PDF for all HTML files

2012-10-11 Thread Junio C Hamano
Thomas Ackermann writes: > In general, the following problems had to be fixed in doc files in order to > create > HTML by using asciidoc and afterwards create a nice looking PDF using > wkhtmltopdf: > > - Wrong sectioning syntax (e.g. "===" instead of "---") > - Left-over shell scripting comman

Re: [Patch v2 2/8] Shorten two over-long lines in git-bisect-lk2009.txt by removing some white-space

2012-10-11 Thread Junio C Hamano
Thomas Ackermann writes: > @@ -331,7 +331,7 @@ Date: Sat May 3 11:59:44 2008 -0700 > > Linux 2.6.26-rc1 > > -:100644 100644 5cf8258195331a4dbdddff08b8d68642638eea57 > 4492984efc09ab72ff6219a7bc21fb6a957c4cd5 M Makefile > +:100644 100644 5cf8258195331a4dbdddff08b8d68642638eea57 >

Re: [Patch v2 5/8] Prerequisites for creating nice html for all files in Documentation/howto

2012-10-11 Thread Junio C Hamano
Thomas Ackermann writes: >>From 2b9538990e30ae097c8e3d8b6891c9de31cf Mon Sep 17 00:00:00 2001 > From: Thomas Ackermann > Date: Sat, 29 Sep 2012 17:28:54 +0200 > Subject: [PATCH] Prerequisites for creating nice html for all files in > Documentation/howto These four lines are not needed; ple

Re: A basic question

2012-10-11 Thread Enrico Weigelt
> 1) Does git have a built-in way to get a list of all of the "most > recently > committed" files only at a given point in time, thus automatically > recording > the revisions of all of the component files of a release? There is no concept of per-file revisions in git. But you can check which o

Re: A basic question

2012-10-11 Thread Dov Grobgeld
The way you typically work with git (and with most other version control systems) is that you have a fast changing trunk (in git often called the master), where development is done. Once you want to release you create a release branch off the trunk, and in that branch you do regression testing and

Re: A basic question

2012-10-11 Thread James Nylen
On 10/11/2012 1:38 PM, Jim Vahl wrote: For the sake of argument, I'll assume that a committing a change implies that the file has passed the testing process. So my questions are: You should not assume this. You / your developers should commit far more frequently than you test and release vers

Re: filter-branch IO optimization

2012-10-11 Thread Johannes Sixt
Am 11.10.2012 17:39, schrieb Enrico Weigelt: > The main goal of this filtering is splitting out many modules from a > large upstream repo into their own downstream repos. ... > The next step I have in mind is using --subdirectory-filter, but open > questsions are: > > * does it suffer from the sam

Re: How can I tell if anything was fetched?

2012-10-11 Thread Enrico Weigelt
> I think you'd only need to record the state of all refs (eg. the > output > of `git for-each-ref') to reliably detect any changes. I would just record the output of `git ls-remote . | sort -u` somewhere and compare it next time (maybe you even wanna grep for the desired ref namespaces). cu --

Re: git 1.8.0.rc0.18.gf84667d trouble with "git commit -p file"

2012-10-11 Thread Junio C Hamano
Conrad Irwin writes: > -i:: > --include:: > - Before making a commit out of staged contents so far, > - stage the contents of paths given on the command line > - as well. This is usually not what you want unless you > - are concluding a conflicted merge. > + In addition to

RE: A basic question

2012-10-11 Thread Jim Vahl
Drew, Thanks for responding to my email! Yes, I did read most of the Book, although I admit that I skimmed over some of the more technical parts. There is still a key part of how git is used in a commercial environment which I don't understand. When we release a new version of our product, it

[Patch v2 8/8] Wire everything into Makefile and Documentation/Makefile

2012-10-11 Thread Thomas Ackermann
>From ac7de86bd58c5849c12e2b05e7b7f68704d9093e Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Wed, 10 Oct 2012 19:30:55 +0200 Subject: [PATCH] Wire everything into Makefile and Documentation/Makefile - target "html" creates html for all files in Documentation/howto and Documentation/techn

[Patch v2 7/8] Create pdf from all html files

2012-10-11 Thread Thomas Ackermann
>From 31f86526e0a0bd00be57db3275c860913f668fb8 Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Mon, 1 Oct 2012 20:06:48 +0200 Subject: [PATCH] Create pdf from all html files - use wkhtmltopdf ("patched QT" version) to combine all html files into a single pdf file "git-doc.pdf" - insert pag

[Patch v2 6/8] Prerequisites for creating nice html for all files in Documentation/RelNotes

2012-10-11 Thread Thomas Ackermann
>From cd7a26f5e7ba8cc42bf81e1b78f800460510b71f Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Sat, 29 Sep 2012 11:00:00 +0200 Subject: [PATCH] Prerequisites for creating nice html for all files in Documentation/RelNotes - remove left-over shell-script fragments from some files Signed-off

[Patch v2 5/8] Prerequisites for creating nice html for all files in Documentation/howto

2012-10-11 Thread Thomas Ackermann
>From 2b9538990e30ae097c8e3d8b6891c9de31cf Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Sat, 29 Sep 2012 17:28:54 +0200 Subject: [PATCH] Prerequisites for creating nice html for all files in Documentation/howto - create headlines with asciidoc markup - asciidoc box markup for mail r

[Patch v2 4/8] Prerequisites for creating nice html for all files in Documentation/technical

2012-10-11 Thread Thomas Ackermann
>From 23b5272cbb27dca7e292f33c79cf3d8e21298b78 Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Sat, 29 Sep 2012 10:00:00 +0200 Subject: [PATCH] Prerequisites for creating nice html for all files in Documentation/technical - fix wrong asciidoc sectioning markup in index-format.txt, pack-for

[Patch v2 3/8] Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt

2012-10-11 Thread Thomas Ackermann
>From af1f0dc8e02ef178fc89f5fa3893a997a4a9b2eb Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Tue, 9 Oct 2012 20:19:34 +0200 Subject: [PATCH] Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt Signed-off-by: Thomas Ackermann

[Patch v2 2/8] Shorten two over-long lines in git-bisect-lk2009.txt by removing some white-space

2012-10-11 Thread Thomas Ackermann
>From e7c97695b676e1ebe66491b3ed256051b9a3b4f1 Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Thu, 4 Oct 2012 19:11:43 +0200 Subject: [PATCH] Shorten two over-long lines in git-bisect-lk2009.txt by removing some white-space Signed-off-by: Thomas Ackermann --- Documentation/git-bisect-lk

[Patch v2 1/8] Split over-long synopsis in git-fetch-pack.txt into several lines

2012-10-11 Thread Thomas Ackermann
>From 27b3105a374158fb8cb008c808a1ef94487a48f7 Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Thu, 4 Oct 2012 19:11:43 +0200 Subject: [PATCH] Split over-long synopsis in git-fetch-pack.txt into several lines Signed-off-by: Thomas Ackermann --- Documentation/git-fetch-pack.txt | 5 -

[Patch v2 0/8] Create single PDF for all HTML files

2012-10-11 Thread Thomas Ackermann
Hi, here is my reworked patch series for creating a single PDF for all git documentation files. Thanks to Junio Hamano, Philip Oakley and Jeff King for your comments! In general, the following problems had to be fixed in doc files in order to create HTML by using asciidoc and afterwards creat

Re: [PATCH v4 00/12] Wildmatch v4

2012-10-11 Thread Junio C Hamano
Junio C Hamano writes: >>> This probably is due to this part of the output: >>> >>> ok 72 - wildmatch 1 1 [ab] [\[:]ab] >>> ok 73 - wildmatch 1 1 ?a?b \??\?b >>> ok 74 - wildmatch 1 1 abc ^G^Hok 75 - wildmatch 0 0 foo >>> ok 76 - wildmatch 1 0 foo/bar/baz/to **/t[o] >>> ok 77

Re: [BUG] "git commit" after "cherry-pick -n" conflict clobbers .git/COMMIT_EDITMSG

2012-10-11 Thread Junio C Hamano
Yann Dirson writes: > (only tested with 1.7.10.x for now) > > ~/softs/linux$ echo foo > .git/COMMIT_EDITMSG Why are you mucking with such an internal implementation detail in the first place? > ~/softs/linux$ git cherry-pick -n b55f3d92cd > error: could not apply b55f3d9... Linux 2.6.32.26 > hi

Re: rm and add, but not rename, of identical files

2012-10-11 Thread Junio C Hamano
Drew Northup writes: > On Wed, 2012-10-10 at 14:47 -0700, Junio C Hamano wrote: >> Drew Northup writes: >> >> > # Untracked files: >> > # (use "git add ..." to include in what will be committed) >> > # >> > # rc.d/rc2.d/S08iptables >> > # rc.d/rc3.d/S08iptables >> > # rc.d/r

Re: How can I tell if anything was fetched?

2012-10-11 Thread Andreas Schwab
Phil Lawrence writes: > One approach might be to first generate a state-of-the-repo SHA1: > # http://stackoverflow.com/a/7350019/834039 > # http://git-scm.com/book/ch9-2.html > { > git rev-list --objects --all > git rev-list --objects -g --no-walk --all > git r

Re: [PATCH 1/3] quote: let caller reset buffer for quote_path_relative()

2012-10-11 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Thu, Oct 11, 2012 at 4:13 AM, Junio C Hamano wrote: >> This sounds a lot stronger than "let" to me. All existing callers >> that assumed that buf to be emptied by the function now has to clear >> it. "quote: stop resetting output buffer of quote_path_relative(

Re: push.default documented in "man git-push"?

2012-10-11 Thread Junio C Hamano
Matthieu Moy writes: > Nguyen Thai Ngoc Duy writes: > >> On Fri, Oct 05, 2012 at 01:03:28PM -0700, Junio C Hamano wrote: >> >>> OK, the messages are supposed to advise how to turn them off, so we >>> would want some code updates in that case. >> >> Something like this? It turns out none of the a

Re: [PATCH v4 00/12] Wildmatch v4

2012-10-11 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Thu, Oct 11, 2012 at 11:33 AM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Nguyễn Thái Ngọc Duy writes: >>> Really small updates. I did not want to resend it this soon but this may fix the compile errors for Junio. >> >> t3070 seems to br

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-11 Thread Junio C Hamano
Johannes Sixt writes: > I saw EINVAL errors when 'git grep pattern rev' was run on Windows. The > reason is that the code attempted to access "rev:dir/.gitattributes" in > the worktree, which is an invalid path on Windows due to the colon. The > lack of this warning indicates that the attempts to

filter-branch IO optimization

2012-10-11 Thread Enrico Weigelt
Hi folks, for certain projects, I need to regularily run filter-branch on quite large repos (>10k commits), and that needs to be run multiple times, which takes several hours, so I'm looking for optimizations. The main goal of this filtering is splitting out many modules from a large upstream rep

Re: rm and add, but not rename, of identical files

2012-10-11 Thread Drew Northup
On Wed, 2012-10-10 at 14:47 -0700, Junio C Hamano wrote: > Drew Northup writes: > > > # Untracked files: > > # (use "git add ..." to include in what will be committed) > > # > > # rc.d/rc2.d/S08iptables > > # rc.d/rc3.d/S08iptables > > # rc.d/rc4.d/S08iptables > > ... > > no c

Re: push.default documented in "man git-push"?

2012-10-11 Thread Nguyen Thai Ngoc Duy
On Thu, Oct 11, 2012 at 9:18 PM, Matthieu Moy wrote: > For example, it makes the output of git status look like: > > # On branch master > # Changes to be committed: > # (use "git reset HEAD ..." to unstage) > # Set advice.statusHints to false to turn off this message > # > # modified:

Re: push.default documented in "man git-push"?

2012-10-11 Thread Matthieu Moy
Nguyen Thai Ngoc Duy writes: > On Fri, Oct 05, 2012 at 01:03:28PM -0700, Junio C Hamano wrote: > >> OK, the messages are supposed to advise how to turn them off, so we >> would want some code updates in that case. > > Something like this? It turns out none of the advice messages says > anything a

Re: [PATCH 1/3] quote: let caller reset buffer for quote_path_relative()

2012-10-11 Thread Nguyen Thai Ngoc Duy
On Thu, Oct 11, 2012 at 4:13 AM, Junio C Hamano wrote: > This sounds a lot stronger than "let" to me. All existing callers > that assumed that buf to be emptied by the function now has to clear > it. "quote: stop resetting output buffer of quote_path_relative()" > may better describe what this r

Re: push.default documented in "man git-push"?

2012-10-11 Thread Nguyen Thai Ngoc Duy
On Fri, Oct 05, 2012 at 01:03:28PM -0700, Junio C Hamano wrote: > >>> OK. I think I was surprised that some messages were controlled by > >>> advice.* but gave no hints about that and I found that out by other > >>> means. I'll check all the advice messages. > > > > It's about the commands, not the

Re: [PATCH v4 00/12] Wildmatch v4

2012-10-11 Thread Nguyen Thai Ngoc Duy
On Thu, Oct 11, 2012 at 11:33 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Nguyễn Thái Ngọc Duy writes: >> >>> Really small updates. I did not want to resend it this soon but this >>> may fix the compile errors for Junio. > > t3070 seems to break TAP, > > *** prove *** > t307

Re: rebase fails mid way through due to locally modified file?

2012-10-11 Thread Peter Krefting
skillz...@gmail.com: I frequently see rebase fail after applying several commits because git thinks there are local changes. What operating system are you running on? I have seen simlar issues on Windows, which has a case-insensitive file system, in repositories where file names have either

Re: [BUG] Directory probing for aliases

2012-10-11 Thread Andreas Schwab
Vasiliy Yeremeyev writes: > Git aliases stop working when user doesn't have permissions to any > directory within $PATH list: > > % git config alias.br branch > % git br > fatal: cannot exec 'git-br': Permission denied This has been fixed in git-1.7.10.1. Andreas. -- Andreas Schwab, sch...@li

[BUG] "git commit" after "cherry-pick -n" conflict clobbers .git/COMMIT_EDITMSG

2012-10-11 Thread Yann Dirson
(only tested with 1.7.10.x for now) ~/softs/linux$ echo foo > .git/COMMIT_EDITMSG ~/softs/linux$ git cherry-pick -n b55f3d92cd error: could not apply b55f3d9... Linux 2.6.32.26 hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' ~/softs/linux$ cat .git/

Re: [PATCH 3/3] grep: stop looking at random places for .gitattributes

2012-10-11 Thread Nguyen Thai Ngoc Duy
On Thu, Oct 11, 2012 at 2:04 PM, Michael Haggerty wrote: > Maybe I'm being too much of a purist, but I don't think that git should > retroactively reinterpret history on its own initiative in a way that > might not be correct (e.g., maybe your encoding changed from ASCII to > Shift-JIS sometime in

Re: [PATCH v2 0/7] Tying loose ends on grep-pcre

2012-10-11 Thread Michael Haggerty
On 10/10/2012 06:52 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >>> The last one teaches "git log" family to honor the "grep.*" >>> configuration variables, e.g. "grep.patterntype", so that you can >>> say "git -c grep.patterntype=perl log --grep='(?:pcre)'". >> >> Maybe this has been

Re: [PATCH 3/3] grep: stop looking at random places for .gitattributes

2012-10-11 Thread Michael Haggerty
On 10/11/2012 07:55 AM, Johannes Sixt wrote: > Am 10/10/2012 21:44, schrieb Junio C Hamano: >> Johannes Sixt writes: >> >>> Is there already an established definition which the "correct" >>> .gitattributes are? >> >> No, and it is deliberately kept vague while waiting for us to come >> up with a c