Re: Problems pushing???

2012-07-09 Thread pbGit
Thanks for all your help. Running through this a few more times and reading the net I managed it ; ) I tested it cloning from the command line and all seems good. For developement I use eclipse with the eGit plugin. When I try cloning it putting all the relevant info in it fails. I am sure th

Re: [PATCH] rerere: make rr-cache fanout directory honor umask

2012-07-09 Thread Jeff King
On Mon, Jul 09, 2012 at 04:28:21PM -0700, Junio C Hamano wrote: > This is the last remaining call to mkdir(2) that restricts the permission > bits by passing 0755. Just use the same mkdir_in_gitdir() used to create > the leaf directories. > > Signed-off-by: Junio C Hamano Looks obviously corre

[PATCH] filter-branch: do not forget the '@' prefix to force git-timestamp

2012-07-09 Thread Junio C Hamano
For some reason, this script reinvents, instead of refactoring the existing one in git-sh-setup, in the ident logic, and it was missed when git-sh-setup was updated with 2c733fb (parse_date(): '@' prefix forces git-timestamp, 2012-02-02). Teach the script that it is OK to have a way ancient timest

[PATCH] rerere: make rr-cache fanout directory honor umask

2012-07-09 Thread Junio C Hamano
This is the last remaining call to mkdir(2) that restricts the permission bits by passing 0755. Just use the same mkdir_in_gitdir() used to create the leaf directories. Signed-off-by: Junio C Hamano --- rerere.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rerere.c b/rere

Re: [PATCH] Restore umasks influence on the permissions of work tree created by clone

2012-07-09 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> Does the mkdir of "rr-cache/*" in rerere.c make the same mistake? The >> rr-cache root is made with 0777, and the files inside each subdirectory >> are created with 0666. So it is the only thing preventing users of >> shared repos from using rerer

Re: [PATCH] Restore umasks influence on the permissions of work tree created by clone

2012-07-09 Thread Junio C Hamano
Jeff King writes: > Does the mkdir of "rr-cache/*" in rerere.c make the same mistake? The > rr-cache root is made with 0777, and the files inside each subdirectory > are created with 0666. So it is the only thing preventing users of > shared repos from using rerere. Quite possibly yes. I do no

Re: [PATCH] Restore umasks influence on the permissions of work tree created by clone

2012-07-09 Thread Jeff King
On Sun, Jul 08, 2012 at 06:41:39PM -0700, Junio C Hamano wrote: > Alex Riesen writes: > > > The original (shell coded) version of the git-clone just used mkdir(1) > > to create the working directories. The builtin changed the mode argument > > to mkdir(2) to 0755, which was a bit unfortunate, as

Re: [PATCH/RFC] git-svn: don't create master if another head exists

2012-07-09 Thread Junio C Hamano
Marcin Owsiany writes: >> This makes my idea to do the same to "my something else instead of >> master" much less attractive. In fact I don't think such behaviour would >> be useful. >> >> I think with the suggested patch git-svn works as I would like it to: >> - creates "master" at initial che

Re: [PATCH] Change configure to check if pthreads are usable without any extra flags

2012-07-09 Thread Junio C Hamano
Max Horn writes: > But all in all, I don't understand why this order independence > seems to be so important? Not so important as long as it is made clear for later people to patch that part of the code. I just wanted to make sure that somebody thought hard enough to judge that it is not worth

Re: [PATCH/RFC] git-svn: don't create master if another head exists

2012-07-09 Thread Marcin Owsiany
On Tue, Jun 26, 2012 at 11:32:15PM +0100, Marcin Owsiany wrote: > On Tue, Jun 26, 2012 at 03:03:07PM -0700, Junio C Hamano wrote: > > Marcin Owsiany writes: > > > > > diff --git a/git-svn.perl b/git-svn.perl > > > index 0b074c4..2379a71 100755 > > > --- a/git-svn.perl > > > +++ b/git-svn.perl > >

Re: [PATCH] Change configure to check if pthreads are usable without any extra flags

2012-07-09 Thread Max Horn
On 09.07.2012, at 21:23, Junio C Hamano wrote: > Max Horn writes: > >>> would it be feasible for the purpose of >>> the check to tweak the definition of "works" used in the loop so that >>> it considers the warning as "not working"? >> >> That would be possible, and probably a good idea. But i

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-09 Thread Jens Lehmann
Am 09.07.2012 21:38, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Cool, so let's drop this patch and I'll teach "rm" to handle >> populated submodules according to what we do for regular files: >> Make sure there are no modifications which could get lost (unless >> "-f") and remove all tra

What's cooking in git.git (Jul 2012, #02; Mon, 9)

2012-07-09 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The fourth and fifth batches of topics have graduated to 'master'. You can find the changes described here in the integration branches of the r

[GSoC] Designing a faster index format - Progress report week 12

2012-07-09 Thread Thomas Gummerer
== Work done in the previous 11 weeks == - Definition of a tentative index file v5 format [1]. This differs from the proposal in making it possible to bisect the directory entries and file entries, to do a binary search. The exact bits for each section were also defined. To further compres

Re: [PATCH v2] Allow edit of empty message with commit --amend

2012-07-09 Thread Junio C Hamano
Chris Webb writes: > If git commit --amend is used on a commit with an empty message, it fails > unless -m is given, whether or not --allow-empty-message is specified. > > Instead, allow it to proceed to the editor with an empty commit message. > Unless --allow-empty-message is in force, it will

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-09 Thread Junio C Hamano
Jens Lehmann writes: > Cool, so let's drop this patch and I'll teach "rm" to handle > populated submodules according to what we do for regular files: > Make sure there are no modifications which could get lost (unless > "-f") and remove all tracked files and the gitfile from the work > tree (unle

Re: [PATCH] Change configure to check if pthreads are usable without any extra flags

2012-07-09 Thread Junio C Hamano
Max Horn writes: >> would it be feasible for the purpose of >> the check to tweak the definition of "works" used in the loop so that >> it considers the warning as "not working"? > > That would be possible, and probably a good idea. But it is also > completely orthogonal to my patch. Indeed, if d

[PATCH v2] Allow edit of empty message with commit --amend

2012-07-09 Thread Chris Webb
If git commit --amend is used on a commit with an empty message, it fails unless -m is given, whether or not --allow-empty-message is specified. Instead, allow it to proceed to the editor with an empty commit message. Unless --allow-empty-message is in force, it will still abort later if an empty

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-09 Thread Jens Lehmann
Am 09.07.2012 04:17, schrieb Junio C Hamano: > Jens Lehmann writes: > So I still think "--recurse-submodules" does not make any sense to > the "rm" command. I would understand a "Do not attempt to remove > submodules and ignore their existence altogether" option, even > though I do not think it i

Re: [PATCH] Change configure to check if pthreads are usable without any extra flags

2012-07-09 Thread Max Horn
On 09.07.2012, at 19:44, Junio C Hamano wrote: > Max Horn writes: > diff --git a/configure.ac b/configure.ac index 4e9012f..d767ef3 100644 --- a/configure.ac +++ b/configure.ac @@ -1002,7 +1002,7 @@ if test -n "$USER_NOPTHREAD"; then # -D_REENTRANT' or some such. >

Re: [PATCH] Restore umasks influence on the permissions of work tree created by clone

2012-07-09 Thread Alex Riesen
On Mon, Jul 9, 2012 at 3:41 AM, Junio C Hamano wrote: > Alex Riesen writes: > >> The original (shell coded) version of the git-clone just used mkdir(1) >> to create the working directories. The builtin changed the mode argument >> to mkdir(2) to 0755, which was a bit unfortunate, as there are use

Re: Using git commit --amend on a commit with an empty message

2012-07-09 Thread Chris Webb
Junio C Hamano writes: > Yeah, it is a "bug" that exists only because nobody sane uses empty > message commits, let alone tries to amend such commits, hence went > unnoticed for a long time. Quite. I only noticed it because this is the default behaviour of Github gists and I wanted to replace th

Re: [PATCH] Change configure to check if pthreads are usable without any extra flags

2012-07-09 Thread Junio C Hamano
Max Horn writes: >>> diff --git a/configure.ac b/configure.ac >>> index 4e9012f..d767ef3 100644 >>> --- a/configure.ac >>> +++ b/configure.ac >>> @@ -1002,7 +1002,7 @@ if test -n "$USER_NOPTHREAD"; then >>> # -D_REENTRANT' or some such. >>> elif test -z "$PTHREAD_CFLAGS"; then >>> threads_found

Re: Using git commit --amend on a commit with an empty message

2012-07-09 Thread Junio C Hamano
Chris Webb writes: > In fact, we even fail to start the editor if --allow-empty-message is > explicitly provided: > > $ git commit --allow-empty --allow-empty-message -m '' > $ git commit --amend --allow-empty-message > fatal: commit has empty message > > Assuming this isn't intentional for

Re: Student project in Ensimag: thanks all!

2012-07-09 Thread Junio C Hamano
Matthieu Moy writes: > For the third year, I offered my students to contribute to open-source > software as part of a school project. This year, we had one team on the > core of Git (who implemented better advices for "git status", the XDG > configuration directory, and "git rebase -i --exec"), a

Re: [PATCH] Change configure to check if pthreads are usable without any extra flags

2012-07-09 Thread Max Horn
On 09.07.2012, at 16:50, Junio C Hamano wrote: > Max Horn writes: > >> The configure script checks whether certain flags / libraries are >> required to use pthreads. But so far it did not consider the possibility >> that no extra compiler flags are needed (as is the case on Mac OS X). As >> a r

Re: Git and Quilt

2012-07-09 Thread Jiang Xin
2012/7/9 Jimmy Thrasibule : > I have a core project on which I maintain a set of patches using Quilt. Git + Topgit is a better solution for your case. See: * http://repo.or.cz/w/topgit.git/blob/HEAD:/README E.g. In my fork of topgit, quilt patches resident in "debian/patches" directory: * htt

Re: [PATCH 2/2] Document rev^! and rev^@ as revision specifiers

2012-07-09 Thread Max Horn
> On 06.07.2012, at 21:18, Junio C Hamano wrote: > Max Horn writes: > +'{caret}!', e.g. 'HEAD{caret}!':: + A suffix '{caret}' followed by an exclamation mark + means commit '' but forces all of its parents to be excluded. For + commands that deal with a single revision, t

Re: [PATCH 02.5/11] Makefile: fold XDIFF_H and VCSSVN_H into LIB_H

2012-07-09 Thread Junio C Hamano
Jonathan Nieder writes: > Just like MISC_H (see previous commit), there is no reason to track > xdiff and vcs-svn headers separately from the rest of the headers. > The only purpose of these variables is to keep track of recompilation > dependencies. > > As a pleasant side effect, folding these i

Re: [PATCH] Change configure to check if pthreads are usable without any extra flags

2012-07-09 Thread Junio C Hamano
Max Horn writes: > The configure script checks whether certain flags / libraries are > required to use pthreads. But so far it did not consider the possibility > that no extra compiler flags are needed (as is the case on Mac OS X). As > a result, configure would always add "-mt" to the list of fl

Re: [PATCH v2 1/2] test: git-stash conflict sets up rerere

2012-07-09 Thread Phil Hord
Junio C Hamano wrote: > Phil Hord writes: > > > Add a failing test to confirm a conflicted stash apply invokes > > rerere to record the conflicts and resolve the the files it can. > > OK. > > > In this failing state, mergetool may be confused by a left-over > > state from previous rerere activity

Using git commit --amend on a commit with an empty message

2012-07-09 Thread Chris Webb
Github gists can be cloned as normal git repositories, but the commits made through the web interface appear with an empty commit message. Running git commit --amend against them exposes a slightly odd behaviour of git, which I can also demonstrate as follows: $ git init foo && cd foo $ touch

Re: Regarding download of one *.git repository

2012-07-09 Thread jaseem abid
On Mon, Jul 9, 2012 at 12:25 PM, Shraddha Shardul Desai wrote: > > Dear Sir, >I want to get RAxML source from > https://github.com/stamatak/RAxML-Light-1.0.5.git. >I have installed git utility on my linux. >What I need to do to download source of RAxML with help of GIT. $ git clone gi

Re: Git and Quilt

2012-07-09 Thread Jimmy Thrasibule
> Isn't what you're doing a perfect fit for rebasing [1]? > That is, you keep your changes as a series of commits on top of your > "upstream" branch and each time you're about to bring upstream changes > in, you rebase your local branch on top on the updated upstream branch. > > 1. http://git-scm.

Student project in Ensimag: thanks all!

2012-07-09 Thread Matthieu Moy
Hi, For the third year, I offered my students to contribute to open-source software as part of a school project. This year, we had one team on the core of Git (who implemented better advices for "git status", the XDG configuration directory, and "git rebase -i --exec"), and two working on the Git-

Re: Git and Quilt

2012-07-09 Thread Konstantin Khomoutov
On Mon, 09 Jul 2012 13:57:09 +0200 Jimmy Thrasibule wrote: > I have a core project on which I maintain a set of patches using > Quilt. This allows me to make changes to the project without touching > the files so I can upgrade to new versions easily. > > I keep my patches and the core project in

Git and Quilt

2012-07-09 Thread Jimmy Thrasibule
Hello, I have a core project on which I maintain a set of patches using Quilt. This allows me to make changes to the project without touching the files so I can upgrade to new versions easily. I keep my patches and the core project in a Git repository. When I want to change something, I apply my

Re: [PATCH 2/2] git p4: add support for 'p4 move' in P4Submit

2012-07-09 Thread Pete Wyckoff
gits...@pobox.com wrote on Thu, 05 Jul 2012 23:28 -0700: > Pete Wyckoff writes: > > > diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh > > index 84fffb3..8be74b6 100755 > > --- a/t/t9814-git-p4-rename.sh > > +++ b/t/t9814-git-p4-rename.sh > > @@ -77,16 +77,16 @@ test_expect_succes

Re: On using receive.denyNonFastForwards and advice.pushNonFastForward

2012-07-09 Thread Matthieu Moy
Hilco Wijbenga writes: > I was wondering how hard it would be to make "git push" more adamant > about not pushing non-ff updates. So I wanted to see the effects of > receive.denyNonFastForwards This changes the behavior only if you use --force (or some magic refspec starting with +). If you neve

git-svn fetch shows merge-base help

2012-07-09 Thread Piotr Krukowiecki
Hi, sometimes when I do git-svn fetch I get following: usage: git merge-base [-a|--all] ... or: git merge-base [-a|--all] --octopus ... or: git merge-base --independent ... -a, --all output all common ancestors --octopus find ancestors for a single n-way me

Regarding download of one *.git repository

2012-07-09 Thread Shraddha Shardul Desai
Dear Sir, I want to get RAxML source from https://github.com/stamatak/RAxML-Light-1.0.5.git. I have installed git utility on my linux. What I need to do to download source of RAxML with help of GIT. Regards, Shraddha S.Desai Senior Technical Engineer, HPC Solutions Group C-DAC R&D,Pune Ph