Re: Git archiving only branch work

2014-11-14 Thread Junio C Hamano
Jeff King writes: > On Thu, Nov 13, 2014 at 01:48:12PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > I agree they are technically orthogonal, but I cannot think of a case >> > where I have ever generated actual _pathspecs_, which might have >> > wildcards, and needed to use "-z".

Re: Git archiving only branch work

2014-11-14 Thread Jeff King
On Thu, Nov 13, 2014 at 01:48:12PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I agree they are technically orthogonal, but I cannot think of a case > > where I have ever generated actual _pathspecs_, which might have > > wildcards, and needed to use "-z". The point of using "-z" is t

Re: Git archiving only branch work

2014-11-13 Thread Junio C Hamano
Jeff King writes: > I agree they are technically orthogonal, but I cannot think of a case > where I have ever generated actual _pathspecs_, which might have > wildcards, and needed to use "-z". The point of using "-z" is that you > do not know what crap you are feeding. You do not have to genera

Re: Git archiving only branch work

2014-11-13 Thread Jeff King
On Thu, Nov 13, 2014 at 01:36:48PM -0800, Junio C Hamano wrote: > > I agree it is probably OK in practice and for the OP's question, but it > > is nice to have "-z" variants so you do not have to worry about quoting > > at all. I'd argue that a "--stdin -z" should probably also accept raw > > file

Re: Git archiving only branch work

2014-11-13 Thread Junio C Hamano
Jeff King writes: > On Thu, Nov 13, 2014 at 01:10:17PM -0800, Junio C Hamano wrote: > >> > How about just adding --stdin, which matches other git commands? >> >> How about doing nothing and use the correct $IFS instead? > > Can you cover all cases with $IFS, including filenames with newlines? Y

Re: Git archiving only branch work

2014-11-13 Thread Jeff King
On Thu, Nov 13, 2014 at 01:10:17PM -0800, Junio C Hamano wrote: > > How about just adding --stdin, which matches other git commands? > > How about doing nothing and use the correct $IFS instead? Can you cover all cases with $IFS, including filenames with newlines? I agree it is probably OK in p

Re: Git archiving only branch work

2014-11-13 Thread Junio C Hamano
Jeff King writes: > On Thu, Nov 13, 2014 at 08:36:16PM +0700, Duy Nguyen wrote: > >> On Thu, Nov 13, 2014 at 12:32:40PM +, Graeme Geldenhuys wrote: >> > [alias] >> > deploy = !sh -c 'git archive --prefix=$1/ -o deploy_$1.zip HEAD >> > $(git diff --name-only -D $2)' - >> > >> > This work

Re: Git archiving only branch work

2014-11-13 Thread Jeff King
On Thu, Nov 13, 2014 at 08:36:16PM +0700, Duy Nguyen wrote: > On Thu, Nov 13, 2014 at 12:32:40PM +, Graeme Geldenhuys wrote: > > [alias] > > deploy = !sh -c 'git archive --prefix=$1/ -o deploy_$1.zip HEAD > > $(git diff --name-only -D $2)' - > > > > This works very well. The only problem

Re: Git archiving only branch work

2014-11-13 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Nov 13, 2014 at 12:32:40PM +, Graeme Geldenhuys wrote: >> [alias] >> deploy = !sh -c 'git archive --prefix=$1/ -o deploy_$1.zip HEAD >> $(git diff --name-only -D $2)' - >> >> This works very well. The only problem we have so far is that if we >> have files

Re: Git archiving only branch work

2014-11-13 Thread Thomas Koch
If your servers run a Unix and you can install Git on the servers than you might want to try the install script we use in our company: https://github.com/comsolit/comsolit_deploy There's a bare git repository on the server and a post-receive hook that exports the content of the git repository i

Re: Git archiving only branch work

2014-11-13 Thread Duy Nguyen
On Thu, Nov 13, 2014 at 12:32:40PM +, Graeme Geldenhuys wrote: > [alias] > deploy = !sh -c 'git archive --prefix=$1/ -o deploy_$1.zip HEAD > $(git diff --name-only -D $2)' - > > This works very well. The only problem we have so far is that if we > have files with spaces in the name (eg:

Re: Git archiving only branch work

2014-11-13 Thread Peter Krefting
Graeme Geldenhuys: This works very well. The only problem we have so far is that if we have files with spaces in the name (eg: SQL update scripts), then the command breaks. If you add -z to the git diff command-line, it will give you the names with nul terminators instead. If you couple that

Git archiving only branch work

2014-11-13 Thread Graeme Geldenhuys
Hi, I've strung together the following git alias command for our company. This command allows us to create a deployment package (archive) for a specific feature. The archive will contain only the files that changed during the development of that feature. We then deploy that archive to our cli