git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* Re: Closing the merge window for 1.6.0
  @ 2008-07-15 17:28  4%                   ` Petr Baudis
  0 siblings, 0 replies; 17+ results
From: Petr Baudis @ 2008-07-15 17:28 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Johannes Schindelin, Dmitry Potapov, Junio C Hamano, Gerrit Pape,
	git

On Tue, Jul 15, 2008 at 12:26:48PM -0400, Nicolas Pitre wrote:
> Anyway this is all hand waving until someone can come with some evidence 
> that git 1.4.4 is actually used by a significant amount of people, and 
> that those people depend on dumb transfer protocols.

That will be hard to produce. :-) _My_ personal story is that I have
Git-1.4.4.4 installed system-wide on repo.or.cz and follow git#next
locally, and quite panicked when I was inspecting some repositories
as root (using the system-wide Git) and these error messages popped up.
This may become a similar experience for others on multi-user systems
where people want to share work but don't realize that one of them has
Git installed locally and the other one doesn't. We can save them the
head-slapping and a bit of wasted life.

Out of interest, I did a simple statistics of HTTP user agents on
repo.or.cz; the dumb access does not seem very widely used overally,
it turns out. The stats begin at 19/May/2008:10:54:32 +0200. Here is the
breakdown, counting unique clients only:

# zgrep '"GET /r/.*/info/packs' /var/log/apache2/repo-access.log* | egrep -v bot\|slurp\|Gecko\|Opera |
	cut -d " " -f 1,12- | sed 's/\.g[a-f0-9]*\(\.dirty\)*"/"/' | sort -u |
	cut -d ' ' -f 2 | sort | uniq -c | sort -rn | head -n 50
   1501 "git/1.5.4.3"	<- Ubuntu Hardy (heh.. is just that it?)
    278 "git/1.5.5.1"	<- RHEL5 (ditto)
    151 "git/1.5.2.5"	<- Ubuntu Gutsy
    133 "git/1.5.5.3"	<- ? (maybe Gentoo ~x86 for some time)
    125 "git/1.5.4.5"	<- OpenSUSE 11.0, FC9, Gentoo x86, Dapper backports
    104 "git/1.5.6"	<- Debian Lenny
     94 "git/1.5.5"
     66 "git/1.5.3.7"
     63 "git/1.5.5.4"
     63 "git/1.5.5.1015"
     55 "git/1.5.2.4"	<- OpenSUSE 10.3
     51 "Mozilla/4.0 (compatible;)"	<- huh?
     42 "git/1.5.3.8"
     37 "git/1.5.5.GIT"
     37 "git/1.5.3.5.2229"
     34 "git/1.5.6.1"
     33 "git/1.5.3.6"	<- Feisty backports
     31 "git/1.5.4.1"
     30 "git/1.5.6.2"
     20 "git/1.5.6.GIT"
     18 "git/1.5.3"
     17 "git/1.5.2.2"
     17 "git/1.4.4.4"
     15 "git/1.5.6.1.1071"
     14 "git/1.5.3.3"
     13 "git/1.5.4.4"
     13 "git/1.5.4"
     11 "git/1.5.6.1062"
     11 "git/1.5.5.2"
     10 "git/1.5.5.1.316"

(I also got two 1.4.4.2 (feisty?) fetches from one client. No older
Git versions.)

So wrt. keeping backwards compatibility, this is not _very_ convincing,
I admit. ;-)

-- 
				Petr "Pasky" Baudis
GNU, n. An animal of South Africa, which in its domesticated state
resembles a horse, a buffalo and a stag. In its wild condition it is
something like a thunderbolt, an earthquake and a cyclone. -- A. Pierce

^ permalink raw reply	[relevance 4%]

* Re: Bug in git-show with "%ai" and "%ci" formats?
  2007-10-29 13:32  0% ` Johannes Schindelin
@ 2007-10-29 14:28  0%   ` Wincent Colaiuta
  0 siblings, 0 replies; 17+ results
From: Wincent Colaiuta @ 2007-10-29 14:28 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: Git Mailing List

El 29/10/2007, a las 14:32, Johannes Schindelin escribió:

> On Mon, 29 Oct 2007, Wincent Colaiuta wrote:
>
>> Can anybody reproduce the following behaviour? Basically all the  
>> author and
>> committer date formats documented in the git-show man page work  
>> except for
>> "%ai" and "%ci". This is with Git 1.5.2.4 running on Darwin 9.0.0:
>
> It was added in v1.5.3-rc2~17.
>
> Usually, it is a good idea to use the documentation which  
> corresponds with
> the git version you are using ;-)

Doh... funny... This was only yesterday; I installed 1.5.2.4  
(stupidly, a typo) and the 1.5.3.4 man pages. If I'd just done a "git  
stash" or something I would've realized that I was using an older  
version...

Cheers,
Wincent

^ permalink raw reply	[relevance 0%]

* Re: Bug in git-show with "%ai" and "%ci" formats?
  2007-10-29 13:18  5% Bug in git-show with "%ai" and "%ci" formats? Wincent Colaiuta
@ 2007-10-29 13:32  0% ` Johannes Schindelin
  2007-10-29 14:28  0%   ` Wincent Colaiuta
  0 siblings, 1 reply; 17+ results
From: Johannes Schindelin @ 2007-10-29 13:32 UTC (permalink / raw)
  To: Wincent Colaiuta; +Cc: Git Mailing List

Hi,

On Mon, 29 Oct 2007, Wincent Colaiuta wrote:

> Can anybody reproduce the following behaviour? Basically all the author and
> committer date formats documented in the git-show man page work except for
> "%ai" and "%ci". This is with Git 1.5.2.4 running on Darwin 9.0.0:

It was added in v1.5.3-rc2~17.

Usually, it is a good idea to use the documentation which corresponds with 
the git version you are using ;-)

Hth,
Dscho

^ permalink raw reply	[relevance 0%]

* Bug in git-show with "%ai" and "%ci" formats?
@ 2007-10-29 13:18  5% Wincent Colaiuta
  2007-10-29 13:32  0% ` Johannes Schindelin
  0 siblings, 1 reply; 17+ results
From: Wincent Colaiuta @ 2007-10-29 13:18 UTC (permalink / raw)
  To: Git Mailing List

Can anybody reproduce the following behaviour? Basically all the  
author and committer date formats documented in the git-show man page  
work except for "%ai" and "%ci". This is with Git 1.5.2.4 running on  
Darwin 9.0.0:

$ git show -s --pretty=format:"%ad"
Sun Oct 28 20:58:39 2007 +0100
$ git show -s --pretty=format:"%aD"
Sun, 28 Oct 2007 20:58:39 +0100
$ git show -s --pretty=format:"%ar"
17 hours ago
$ git show -s --pretty=format:"%at"
1193601519
$ git show -s --pretty=format:"%ai"
%ai
$ git show -s --pretty=format:"%cd"
Sun Oct 28 20:58:39 2007 +0100
$ git show -s --pretty=format:"%cD"
Sun, 28 Oct 2007 20:58:39 +0100
$ git show -s --pretty=format:"%cr"
17 hours ago
$ git show -s --pretty=format:"%ct"
1193601519
$ git show -s --pretty=format:"%ci"
%ci

Cheers,
Wincent

^ permalink raw reply	[relevance 5%]

* Re: 1.5.3-rc5 regression on OS X?
@ 2007-08-15 22:01  0% Perrin Meyer
  0 siblings, 0 replies; 17+ results
From: Perrin Meyer @ 2007-08-15 22:01 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git


Nothing has changed,, I just did a git checkout v1.5.2.4; make clean; make ; make test, and that same test passes. Then I did a git checkout v1.5.3-rc5 ; make clean ; make ; make test, and the same test fails. 

I'll try updating to a newer version of Xcode and see if that helps. 

Perrin


----- Original Message ----
From: Junio C Hamano <gitster@pobox.com>
To: Perrin Meyer <perrinmeyer@yahoo.com>
Cc: git@vger.kernel.org
Sent: Wednesday, August 15, 2007 2:33:04 PM
Subject: Re: 1.5.3-rc5 regression on OS X?

Perrin Meyer <perrinmeyer@yahoo.com> writes:

> I was able to build and test git 1.5.2.4 fine, with no errors in the test suite. 
>
> I also just build 1.5.3-rc5 on a redhat box, with no errors in the testsuite. 
The above sounds as if you built 1.5.2.4 on your Mac in not so
recent past, and 1.5.3-rc5 on your Mac and RH recently.

Has anything changed on your Mac between the time you built
1.5.2.4 and failed to pass the test for 1.5.3-rc5?

^ permalink raw reply	[relevance 0%]

* Re: 1.5.3-rc5 regression on OS X?
  2007-08-15 21:19  4% 1.5.3-rc5 regression on OS X? Perrin Meyer
@ 2007-08-15 21:33  0% ` Junio C Hamano
  0 siblings, 0 replies; 17+ results
From: Junio C Hamano @ 2007-08-15 21:33 UTC (permalink / raw)
  To: Perrin Meyer; +Cc: git

Perrin Meyer <perrinmeyer@yahoo.com> writes:

> I was able to build and test git 1.5.2.4 fine, with no errors in the test suite. 
>
> I also just build 1.5.3-rc5 on a redhat box, with no errors in the testsuite. 
The above sounds as if you built 1.5.2.4 on your Mac in not so
recent past, and 1.5.3-rc5 on your Mac and RH recently.

Has anything changed on your Mac between the time you built
1.5.2.4 and failed to pass the test for 1.5.3-rc5?

^ permalink raw reply	[relevance 0%]

* 1.5.3-rc5 regression on OS X?
@ 2007-08-15 21:19  4% Perrin Meyer
  2007-08-15 21:33  0% ` Junio C Hamano
  0 siblings, 1 reply; 17+ results
From: Perrin Meyer @ 2007-08-15 21:19 UTC (permalink / raw)
  To: git


Hi,

When I try to build and test 1.5.3-rc5 on my OS X box, I get a failure on "make test"

*   ok 82: 15 (fail) - must match A in O && A && B && O==A && O==B case
* FAIL 83: 16 - A matches in one and B matches in another.
        rm -f .git/index F16 &&
            echo F16 >F16 &&
            git update-index --add F16 &&
            tree0=`git write-tree` &&
            echo E16 >F16 &&
            git update-index F16 &&
            tree1=`git write-tree` &&
            git read-tree -m $tree0 $tree1 $tree1 $tree0 &&
            git ls-files --stage
* failed 1 among 83 test(s)
make[1]: *** [t1000-read-tree-m-3way.sh] Error 1
make: *** [test] Error 2


I was able to build and test git 1.5.2.4 fine, with no errors in the test suite. 

I also just build 1.5.3-rc5 on a redhat box, with no errors in the testsuite. 

My OS X box is a quad G5 running OS X 10.4.10, with gcc version: 

perrin-meyers-power-mac-g5:~/GIT/git perrin$ gcc -v
Using built-in specs.
Target: powerpc-apple-darwin8
Configured with: /private/var/tmp/gcc/gcc-5026.obj~19/src/configure --disable-checking --prefix=/usr --mandir=/share/man --enable-languages=c,objc,c++,obj-c++ --program-transform-name=/^[cg][^+.-]*$/s/$/-4.0/ --with-gxx-include-dir=/include/gcc/darwin/4.0/c++ --build=powerpc-apple-darwin8 --host=powerpc-apple-darwin8 --target=powerpc-apple-darwin8
Thread model: posix
gcc version 4.0.0 (Apple Computer, Inc. build 5026)

I define "NO_EXPAT" when I build on OS X. 

Am I doing something wrong?

Thanks,

Perrin

^ permalink raw reply	[relevance 4%]

* Re: $GIT_DIR usage
  2007-08-05 11:55  0% ` Dmitry Kakurin
@ 2007-08-05 12:22  0%   ` Dan Zwell
  0 siblings, 0 replies; 17+ results
From: Dan Zwell @ 2007-08-05 12:22 UTC (permalink / raw)
  To: Dmitry Kakurin; +Cc: git

Dmitry Kakurin wrote:
> I think you also need to set GIT_WORK_TREE.
> This way Git will know the root of directories that it controls.
> 
> - Dmitry
> ----- Original Message ----- From: "Dan Zwell" <dzwell@gmail.com>
> Newsgroups: gmane.comp.version-control.git
> To: <git@vger.kernel.org>
> Sent: Sunday, 5 August 2007 2:58
> Subject: $GIT_DIR usage
> 
> 
>> Hi, I had a question about $GIT_DIR. That is to say, it doesn't seem 
>> to work. I am using Git 1.5.2.4. See the following: (all the commands 
>> I tried besides "git-init" failed).
>>
>> $ export GIT_DIR="`pwd`/.git_public"
>> $ git init
>> warning: templates not found /usr/share//git-core/templates/
>> Initialized empty Git repository in /home/user/temp/.git_public/
>> $ echo > new_file
>> $ git add new_file
>> fatal: add must be run in a work tree
>> $ git commit -a
>> fatal: /usr/bin/git-commit cannot be used without a working tree.
>> $ git commit
>> fatal: /usr/bin/git-commit cannot be used without a working tree.
>> $
>>
>> Is $GIT_DIR not meant to be used this way? Does it have a different 
>> purpose / use case, or is this just a bug?
>>
>> Thanks,
>> Dan
> 

Thank you. I also had to upgrade Git to the as-yet unreleased version 
(this variable doesn't exist in the current stable release), but what 
you said makes sense and seems like it should work.

Dan

^ permalink raw reply	[relevance 0%]

* Re: $GIT_DIR usage
  2007-08-05  9:58  5% $GIT_DIR usage Dan Zwell
@ 2007-08-05 11:55  0% ` Dmitry Kakurin
  2007-08-05 12:22  0%   ` Dan Zwell
  0 siblings, 1 reply; 17+ results
From: Dmitry Kakurin @ 2007-08-05 11:55 UTC (permalink / raw)
  To: Dan Zwell; +Cc: git

I think you also need to set GIT_WORK_TREE.
This way Git will know the root of directories that it controls.

- Dmitry
----- Original Message ----- 
From: "Dan Zwell" <dzwell@gmail.com>
Newsgroups: gmane.comp.version-control.git
To: <git@vger.kernel.org>
Sent: Sunday, 5 August 2007 2:58
Subject: $GIT_DIR usage


> Hi, I had a question about $GIT_DIR. That is to say, it doesn't seem to 
> work. I am using Git 1.5.2.4. See the following: (all the commands I 
> tried besides "git-init" failed).
> 
> $ export GIT_DIR="`pwd`/.git_public"
> $ git init
> warning: templates not found /usr/share//git-core/templates/
> Initialized empty Git repository in /home/user/temp/.git_public/
> $ echo > new_file
> $ git add new_file
> fatal: add must be run in a work tree
> $ git commit -a
> fatal: /usr/bin/git-commit cannot be used without a working tree.
> $ git commit
> fatal: /usr/bin/git-commit cannot be used without a working tree.
> $
> 
> Is $GIT_DIR not meant to be used this way? Does it have a different 
> purpose / use case, or is this just a bug?
> 
> Thanks,

^ permalink raw reply	[relevance 0%]

* $GIT_DIR usage
@ 2007-08-05  9:58  5% Dan Zwell
  2007-08-05 11:55  0% ` Dmitry Kakurin
  0 siblings, 1 reply; 17+ results
From: Dan Zwell @ 2007-08-05  9:58 UTC (permalink / raw)
  To: git

Hi, I had a question about $GIT_DIR. That is to say, it doesn't seem to 
work. I am using Git 1.5.2.4. See the following: (all the commands I 
tried besides "git-init" failed).

$ export GIT_DIR="`pwd`/.git_public"
$ git init
warning: templates not found /usr/share//git-core/templates/
Initialized empty Git repository in /home/user/temp/.git_public/
$ echo > new_file
$ git add new_file
fatal: add must be run in a work tree
$ git commit -a
fatal: /usr/bin/git-commit cannot be used without a working tree.
$ git commit
fatal: /usr/bin/git-commit cannot be used without a working tree.
$

Is $GIT_DIR not meant to be used this way? Does it have a different 
purpose / use case, or is this just a bug?

Thanks,
Dan

^ permalink raw reply	[relevance 5%]

* Re: minor makefile issues
  2007-08-02 18:04  7% minor makefile issues Joe Eykholt
@ 2007-08-02 19:00  0% ` David Kastrup
  0 siblings, 0 replies; 17+ results
From: David Kastrup @ 2007-08-02 19:00 UTC (permalink / raw)
  To: Joe Eykholt; +Cc: git

Joe Eykholt <joe@nuovasystems.com> writes:

> Hi All,
>
> Due to my unusual environment, I ran into two issues when installing
> git 1.5.2.4 from source.
> Although these are unusual, they might not be unique and the fixes are easy:
>
>    1.  The make install failed because of line 49 in templates/Makefile:
>           (cd blt && $(TAR) cf - .) | \
>           (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)
>    because I have CDPATH set, the 'cd blt' actually outputs the new
> directory on stdout
>    which confuses the second tar.  Changing this to 'cd ./blt' fixes
> it.  Perhaps this could
>    be considered a bash bug.

No, it is a user bug.  You don't want a script to _ever_ walk around
on its own volition, so you must _not_ export CDPATH.  Instead, set it
in .bashrc without exporting it.  That way, it will be available with
every interactive shell, and not interfering with scripts.

>    2.  My home directory containing my build tree is NFS-mounted, and
> root doesn't have any
>    permission to write it.  So, when doing 'make prefix=/usr/local
> install-doc' as root, I got these errors:
>
>    # make prefix=/usr/local install-doc
>    make -C Documentation install
>    make[1]: Entering directory
> /net/da01/home/jre/build/git-1.5.2.4/Documentation'
>    rm -f doc.dep+ doc.dep
>    rm: cannot remove `doc.dep': Permission denied
>    make[1]: *** [doc.dep] Error 1
>    make[1]: Leaving directory
> /net/da01/home/jre/build/git-1.5.2.4/Documentation'
>    make: *** [install-doc] Error 2
>
> I'm not sure what the best fix is for the second problem.  rm -f
> ignores non-existent files but not permission errors.
> I guess you could do 'rm -f doc.dep || true'.

First do "make doc" for your normal user, then make doc-install as
root.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

^ permalink raw reply	[relevance 0%]

* minor makefile issues
@ 2007-08-02 18:04  7% Joe Eykholt
  2007-08-02 19:00  0% ` David Kastrup
  0 siblings, 1 reply; 17+ results
From: Joe Eykholt @ 2007-08-02 18:04 UTC (permalink / raw)
  To: git

Hi All,

Due to my unusual environment, I ran into two issues when installing git 
1.5.2.4 from source.
Although these are unusual, they might not be unique and the fixes are easy:

    1.  The make install failed because of line 49 in templates/Makefile:
           (cd blt && $(TAR) cf - .) | \
           (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)
    because I have CDPATH set, the 'cd blt' actually outputs the new 
directory on stdout
    which confuses the second tar.  Changing this to 'cd ./blt' fixes 
it.  Perhaps this could
    be considered a bash bug.

    2.  My home directory containing my build tree is NFS-mounted, and 
root doesn't have any
    permission to write it.  So, when doing 'make prefix=/usr/local 
install-doc' as root, I got these errors:

    # make prefix=/usr/local install-doc
    make -C Documentation install
    make[1]: Entering directory 
`/net/da01/home/jre/build/git-1.5.2.4/Documentation'
    rm -f doc.dep+ doc.dep
    rm: cannot remove `doc.dep': Permission denied
    make[1]: *** [doc.dep] Error 1
    make[1]: Leaving directory 
`/net/da01/home/jre/build/git-1.5.2.4/Documentation'
    make: *** [install-doc] Error 2

I'm not sure what the best fix is for the second problem.  rm -f ignores 
non-existent files but not permission errors.
I guess you could do 'rm -f doc.dep || true'.

No response necessary.  Just thought you might like to know about 
these.  Otherwise, git seems nice!

    Thanks,
    Joe Eykholt

^ permalink raw reply	[relevance 7%]

* Re: git-gui ignores core.excludesFile
  2007-07-23 15:07  5% git-gui ignores core.excludesFile Lars Noschinski
@ 2007-07-29  7:22  0% ` Shawn O. Pearce
  0 siblings, 0 replies; 17+ results
From: Shawn O. Pearce @ 2007-07-29  7:22 UTC (permalink / raw)
  To: Lars Noschinski; +Cc: git

Lars Noschinski <lars@public.noschinski.de> wrote:
> It seems git-gui (0.7.5 from git 1.5.2.4 tarball) ignores the global
> ignore file configured with the core.excludesfile option. My
> ~/.gitconfig contains
> 
> [core]
> excludesFile = /home/noschinski/.gitignore
> 
> which is honoured by git-status but not by git-gui.

Whoops.  Thanks.  git-gui 0.8.0 will include the following patch:

-->8--
From 94a4dd9bfda79a226f8dd57fd20c39c6603ec194 Mon Sep 17 00:00:00 2001
From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 29 Jul 2007 03:22:27 -0400
Subject: [PATCH] git-gui: Honor core.excludesfile when listing extra files

Recent git versions have a git-status that honors the core.excludesfile
configuration option when it reports on untracked files.  Unfortunately
I missed the introduction of this configuration option in the core
porcelain implementation, so it was not reflected here in git-gui.

Found and reported by Lars Noschinski <lars@public.noschinski.de>.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 git-gui.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/git-gui.sh b/git-gui.sh
index d7fad46..4e3b58c 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -872,6 +872,10 @@ proc rescan_stage2 {fd after} {
 	if {[file readable $info_exclude]} {
 		lappend ls_others "--exclude-from=$info_exclude"
 	}
+	set user_exclude [get_config core.excludesfile]
+	if {$user_exclude ne {} && [file readable $user_exclude]} {
+		lappend ls_others "--exclude-from=$user_exclude"
+	}
 
 	set buf_rdi {}
 	set buf_rdf {}
-- 
1.5.3.rc3.843.g25b4


-- 
Shawn.

^ permalink raw reply related	[relevance 0%]

* Re: having problems with building the manpages
  @ 2007-07-24  7:38  7%   ` VMiklos
  0 siblings, 0 replies; 17+ results
From: VMiklos @ 2007-07-24  7:38 UTC (permalink / raw)
  To: Julian Phillips; +Cc: git

[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]

Hello,

Na Mon, Jul 23, 2007 at 07:40:04PM +0100, Julian Phillips <julian@quantumfyre.co.uk> pisal(a):
> Are you using docbook xsl 1.72?  There are known problems building the
> manpages with that version.  1.71 works, and 1.73 should work when it
> get released.

yes, i'm was uging 1.72. in the mentime 1.73 has been released, here is
the error i get when using it:

asciidoc -b docbook -d manpage -f asciidoc.conf \
                 -a asciidoc7compatible -agit_version=1.5.2.4 -o git-add.xml+ git-add.txt
mv git-add.xml+ git-add.xml
xmlto -m callouts.xsl man git-add.xml
runtime error: file file:///usr/share/xml/docbook/manpages/other.xsl line 129 element call-template
The called template 'read-character-map' was not found.
Note: meta date   : no date; using generated date                  git-add
Note: meta date   : see http://docbook.sf.net/el/date              git-add
runtime error: file file:///usr/share/xml/docbook/manpages/other.xsl line 537 element call-template
The called template 'apply-character-map' was not found.
Note: Writing git-add.1
error: file /var/tmp/fst/src/git-1.5.2.4/Documentation/git-add.xml
xsltRunStylesheet : run failed
make[1]: *** [git-add.1] Error 1
rm git-add.xml
make[1]: Leaving directory `/var/tmp/fst/src/git-1.5.2.4/Documentation'
make: *** [doc] Error 2

thanks,
- VMiklos

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[relevance 7%]

* git-gui ignores core.excludesFile
@ 2007-07-23 15:07  5% Lars Noschinski
  2007-07-29  7:22  0% ` Shawn O. Pearce
  0 siblings, 1 reply; 17+ results
From: Lars Noschinski @ 2007-07-23 15:07 UTC (permalink / raw)
  To: git, spearce

Hello!

It seems git-gui (0.7.5 from git 1.5.2.4 tarball) ignores the global
ignore file configured with the core.excludesfile option. My
~/.gitconfig contains

[core]
excludesFile = /home/noschinski/.gitignore

which is honoured by git-status but not by git-gui.


Greetings,
    Lars.

^ permalink raw reply	[relevance 5%]

* [ANNOUNCE] GIT 1.5.2.4
  @ 2007-07-12 20:57 14% ` Junio C Hamano
  0 siblings, 0 replies; 17+ results
From: Junio C Hamano @ 2007-07-12 20:57 UTC (permalink / raw)
  To: git; +Cc: linux-kernel

The latest maintenance release GIT 1.5.2.4 is available at the
usual places:

  http://www.kernel.org/pub/software/scm/git/

  git-1.5.2.4.tar.{gz,bz2}			(tarball)
  git-htmldocs-1.5.2.4.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.2.4.tar.{gz,bz2}		(preformatted docs)
  RPMS/$arch/git-*-1.5.2.4-1.$arch.rpm	(RPM)

----------------------------------------------------------------

GIT v1.5.2.4 Release Notes
==========================

Fixes since v1.5.2.3
--------------------

 * Bugfixes

   - "git-gui" bugfixes, including a handful fixes to run it
     better on Cygwin/MSYS.

   - "git checkout" failed to switch back and forth between
     branches, one of which has "frotz -> xyzzy" symlink and
     file "xyzzy/filfre", while the other one has a file
     "frotz/filfre".

   - "git prune" used to segfault upon seeing a commit that is
     referred to by a tree object (aka "subproject").

   - "git diff --name-status --no-index" mishandled an added file.

   - "git apply --reverse --whitespace=warn" still complained
     about whitespaces that a forward application would have
     introduced.

 * Documentation Fixes and Updates

   - A handful documentation updates.

----------------------------------------------------------------

Changes since v1.5.2.3 are as follows:

Andy Parkins (2):
      Make git-prune submodule aware (and fix a SEGFAULT in the process)
      user-manual: grammar and style fixes

Gerrit Pape (1):
      git-gui: properly popup error if gitk should be started but is not installed

J. Bruce Fields (2):
      tutorial: Fix typo
      user-manual: more explanation of push and pull usage

Jim Meyering (1):
      Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long

Johannes Schindelin (3):
      diff --no-index: fix --name-status with added files
      glossary: add 'reflog'
      Fix "apply --reverse" with regard to whitespace

Junio C Hamano (2):
      Teach read-tree 2-way merge to ignore intermediate symlinks
      GIT 1.5.2.4

Michael Hendricks (1):
      Correctly document the name of the global excludes file configuration

Miklos Vajna (1):
      Document -<n> for git-format-patch

Shawn O. Pearce (10):
      git-gui: Unlock the index when cancelling merge dialog
      git-gui: Don't bind F5/M1-R in all windows
      git-gui: Bind M1-P to push action
      git-gui: Include a Push action on the left toolbar
      git-gui: Ensure windows shortcuts always have .bat extension
      git-gui: Skip nicknames when selecting author initials
      git-gui: Correct ls-tree buffering problem in browser
      git-gui: Don't linewrap within console windows
      Clarify documentation of fast-import's D subcommand
      git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}

William Pursell (1):
      user-manual: fix directory name in git-archive example

^ permalink raw reply	[relevance 14%]

* Re: [PATCH] Enable "git rerere" by the config variable rerere.enabled
  @ 2007-07-08 22:00  7%   ` Shawn O. Pearce
  0 siblings, 0 replies; 17+ results
From: Shawn O. Pearce @ 2007-07-08 22:00 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Johannes Schindelin, git

Junio C Hamano <gitster@pobox.com> wrote:
> I'll exclude git-gui part and commit with a minor tweaks; having
> extra "does the directory exist" check in git-gui would not hurt
> people who are used to how rerere works in the short term, and I
> think I read somewhere that I should expect git-gui updates over
> the weekend anyway.

There is a slew of git-gui updates already made but not yet pulled
in by you, and a pile yet still coming.

I'm going to be hacking on git-gui pretty much the rest of today,
and probably a good deal tomorrow too.  I'm trying to simplify
the workflow for users in my 400+ branch production repository.
They are actively using git-gui now and really need the tool to
handle things for them.  Especially since all but 1 of the users
is _not_ command-line friendly.

So you can feel free to pull maint and master over if you want,
but you might just want to wait another day or two.

Are you thinking of doing a git 1.5.2.4?  I'd like to get the bug
fixes accumulating in git-gui's maint into 1.5.2.4 as gitgui-0.7.5.
If you are doing a 1.5.2.4 release that is...

-- 
Shawn.

^ permalink raw reply	[relevance 7%]

Results 1-17 of 17 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2007-06-17  1:57     [ANNOUNCE] GIT 1.5.2.2 Junio C Hamano
2007-07-12 20:57 14% ` [ANNOUNCE] GIT 1.5.2.4 Junio C Hamano
2007-07-06 12:05     [PATCH] Enable "git rerere" by the config variable rerere.enabled Johannes Schindelin
2007-07-07  5:49     ` Junio C Hamano
2007-07-08 22:00  7%   ` Shawn O. Pearce
2007-07-23 15:07  5% git-gui ignores core.excludesFile Lars Noschinski
2007-07-29  7:22  0% ` Shawn O. Pearce
2007-07-23 18:23     having problems with building the manpages VMiklos
2007-07-23 18:40     ` Julian Phillips
2007-07-24  7:38  7%   ` VMiklos
2007-08-02 18:04  7% minor makefile issues Joe Eykholt
2007-08-02 19:00  0% ` David Kastrup
2007-08-05  9:58  5% $GIT_DIR usage Dan Zwell
2007-08-05 11:55  0% ` Dmitry Kakurin
2007-08-05 12:22  0%   ` Dan Zwell
2007-08-15 21:19  4% 1.5.3-rc5 regression on OS X? Perrin Meyer
2007-08-15 21:33  0% ` Junio C Hamano
2007-08-15 22:01  0% Perrin Meyer
2007-10-29 13:18  5% Bug in git-show with "%ai" and "%ci" formats? Wincent Colaiuta
2007-10-29 13:32  0% ` Johannes Schindelin
2007-10-29 14:28  0%   ` Wincent Colaiuta
2008-07-14  7:50     Closing the merge window for 1.6.0 Junio C Hamano
2008-07-14  8:55     ` Petr Baudis
2008-07-14 11:57       ` Johannes Schindelin
2008-07-14 12:41         ` Gerrit Pape
2008-07-14 17:54           ` Nicolas Pitre
2008-07-14 19:00             ` Junio C Hamano
2008-07-15  9:20               ` Petr Baudis
2008-07-15 15:06                 ` Dmitry Potapov
2008-07-15 15:27                   ` Johannes Schindelin
2008-07-15 16:26                     ` Nicolas Pitre
2008-07-15 17:28  4%                   ` Petr Baudis

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).