Re: [PATCH v2] format-patch --signature-file file

2014-05-20 Thread Jeff King
On Mon, May 19, 2014 at 10:46:21PM -0700, Jeremiah Mahler wrote: Avoiding that is easy with an indirection, no? Something like this at the top: static const char *the_default_signature = git_version_string; static const char *signature = the_default_signature; and comparing

Re: [PATCH v3 2/5] t4041, t4205, t6006, t7102: Don't hardcode tested encoding value

2014-05-20 Thread Alexey Shumkin
On Tue, May 20, 2014 at 01:49:31AM +, brian m. carlson wrote: On Mon, May 19, 2014 at 07:28:17PM +0400, Alexey Shumkin wrote: The tested encoding is always available in a variable. Use it instead of hardcoding. Also, to be in line with other tests use ISO8859-1 (uppercase) rather then

Re: format-patch crashes with a huge patchset

2014-05-20 Thread Jeff King
On Mon, May 19, 2014 at 10:35:56PM +0300, Michael S. Tsirkin wrote: I tried to fump the whole history of qemu with format-patch. It crashes both with v2.0.0-rc2-21-g6087111 and with git 1.8.3.1: ~/opt/libexec/git-core/git-format-patch --follow -o patches/all

[PATCH] rebase -i: test Nothing to do case with autostash

2014-05-20 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- Ram's patch lacks a test. Here it is. Fails without Ram's patch, and passes with it. Can be squashed into Ram's patch. t/t3420-rebase-autostash.sh | 17 + 1 file changed, 17 insertions(+) diff --git

Re: [PATCH] rebase -i: test Nothing to do case with autostash

2014-05-20 Thread Eric Sunshine
On Tue, May 20, 2014 at 2:55 AM, Matthieu Moy matthieu@imag.fr wrote: Signed-off-by: Matthieu Moy matthieu@imag.fr --- Ram's patch lacks a test. Here it is. Fails without Ram's patch, and passes with it. Can be squashed into Ram's patch. t/t3420-rebase-autostash.sh | 17

[PATCH v2] rebase -i: test Nothing to do case with autostash

2014-05-20 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- Eric Sunshine sunsh...@sunshineco.com writes: Simpler (replace above two lines): test_set_editor $(pwd)/abort-editor.sh Indeed. And I had debug statements left. Hopefully, this after-coffee-v2 will be clear enough and correct ;-).

[PATCH v5] format-patch --signature-file file

2014-05-20 Thread Jeremiah Mahler
Added option that allows a signature file to be used with format-patch so that signatures with newlines and other special characters can be easily included. $ git format-patch --signature-file ~/.signature -1 The config variable format.signaturefile is also provided so that it can be added by

[PATCH v5] format-patch --signature-file file

2014-05-20 Thread Jeremiah Mahler
v5 of patch to add format-patch --signature-file file option. This revision includes more suggestions from Jeff King and Junio C Hamano: - Use git_config_pathname instead of git_config_string for ~ expansion. - Eliminated head/tail --lines which is not POSIX compliant. Replaced with sed

Re: [PATCH v5] format-patch --signature-file file

2014-05-20 Thread Jeff King
On Tue, May 20, 2014 at 01:00:06AM -0700, Jeremiah Mahler wrote: Added option that allows a signature file to be used with format-patch so that signatures with newlines and other special characters can be easily included. $ git format-patch --signature-file ~/.signature -1 The config

Re: [msysGit] Re: [PATCH/RFC] send-pack.c: Allow to disable side-band-64k

2014-05-20 Thread Erik Faye-Lund
On Tue, May 20, 2014 at 10:46 AM, Thomas Braun thomas.br...@byte-physics.de wrote: Am 19.05.2014 22:29, schrieb Erik Faye-Lund: [...] Would we need to wrap both ends, shouldn't wrapping only reading be good enough to prevent deadlocking? compat/poll/poll.c already contains a function called

[PATCH 1/2] remote: defer repacking packed-refs when deleting refs

2014-05-20 Thread Jens Lindström
When 'git remote rm' or 'git remote prune' were used in a repository with many refs, and needed to delete many refs, a lot of time was spent deleting those refs since for each deleted ref, repack_without_refs() was called to rewrite packed-refs without just that deleted ref. To avoid this, defer

[PATCH 2/2] remote prune: optimize dangling symref check/warning

2014-05-20 Thread Jens Lindström
When 'git remote prune' was used to delete many refs in a repository with many refs, a lot of time was spent checking for (now) dangling symbolic refs pointing to the deleted ref, since warn_dangling_symref() was once per deleted ref to check all other refs in the repository. Avoid this using the

[PATCH 09/19] git-rebase--interactive.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 07/19] git-bisect.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 06/19] contrib/examples/git-resolve.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 02/19] contrib/examples/git-clone.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 00/19] convert test -a/-o to and || patch series

2014-05-20 Thread Elia Pinto
These patch series convert test -a/-o to and ||. This is the second version. Changes: - Modified commit comment based on Jonathan Nieder suggestions (was don't use the -a or -o option with the test command) - Modified patch on git-submodule.sh based on Jonathan Nieder suggestions Elia

[PATCH 04/19] contrib/examples/git-merge.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 13/19] t/t4102-apply-rename.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 10/19] git-submodule.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 17/19] t/t5538-push-shallow.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 05/19] contrib/examples/git-repack.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 19/19] t/test-lib-functions.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 12/19] t/t0026-eol-config.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 14/19] t/t5000-tar-tree.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 18/19] t/t9814-git-p4-rename.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 08/19] git-mergetool.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 03/19] contrib/examples/git-commit.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 15/19] t/t5403-post-checkout-hook.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 11/19] t/t0025-crlf-auto.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH 16/19] t/t5537-fetch-shallow.sh: convert test -a/-o to and ||

2014-05-20 Thread Elia Pinto
The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto

[PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Ramsay Jones
Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Alexey, If you need to re-roll your 'as/pretty-truncate' branch, could you please squash the relevant parts of this patch into the corresponding patches of your patch series. (ie this is a patch against the head of the current pu

Re: [PATCH 10/19] git-submodule.sh: convert test -a/-o to and ||

2014-05-20 Thread Matthieu Moy
Elia Pinto gitter.spi...@gmail.com writes: - test $status = D -o $status = T echo $sm_path continue + { + test $status = D || + test $status = T + } + echo $sm_path

Re: [PATCH 00/19] convert test -a/-o to and || patch series

2014-05-20 Thread Matthieu Moy
Elia Pinto gitter.spi...@gmail.com writes: Elia Pinto (19): I went through the series (not very thoroughly) and it sounds good to me. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Alexey Shumkin
On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote: Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Alexey, If you need to re-roll your 'as/pretty-truncate' branch, could you please squash the relevant parts of this patch into the corresponding patches of your

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Alexey Shumkin
On Tue, May 20, 2014 at 06:19:36PM +0400, Alexey Shumkin wrote: On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote: Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Alexey, If you need to re-roll your 'as/pretty-truncate' branch, could you please squash

Re: [PATCH 3/4] rebase: test ack

2014-05-20 Thread Michael S. Tsirkin
On Mon, May 19, 2014 at 02:34:26PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: test ack! handling Signed-off-by: Michael S. Tsirkin m...@redhat.com Will queue with this squashed in. 4/4 seems to have some style issues as well, but I didn't look very

Re: [PATCH 10/19] git-submodule.sh: convert test -a/-o to and ||

2014-05-20 Thread Johannes Sixt
Am 5/20/2014 15:50, schrieb Elia Pinto: # If we don't already have a -f flag and the submodule has never been checked out - if test -z $subsha1 -a -z $force + if test -z $subsha1 || test -z $force Should not be ||, but !

[PATCH] t6006 (rev-list-format): quote format strings to avoid error on some shells

2014-05-20 Thread Alexey Shumkin
Added in 0a144b3 (t4205, t6006: add failing tests for the case when i18n.logOutputEncoding is set, 2014-05-19) tests give no error (somehow) with Bash as /bin/sh but fail for some other shells. Quote format strings to avoid errors. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Michael Haggerty
On 05/19/2014 11:31 PM, Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: After looking at the reverse-depends list of packages, my faith is strengthened in that the Git ecosystem is truly maturing and useful third-party plug-ins will be picked

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Ramsay Jones
On 20/05/14 15:19, Alexey Shumkin wrote: On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote: Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Alexey, If you need to re-roll your 'as/pretty-truncate' branch, could you please squash the relevant parts of this patch

Re: [PATCH] t6006 (rev-list-format): quote format strings to avoid error on some shells

2014-05-20 Thread Ramsay Jones
On 20/05/14 15:48, Alexey Shumkin wrote: Added in 0a144b3 (t4205, t6006: add failing tests for the case when i18n.logOutputEncoding is set, 2014-05-19) tests give no error (somehow) with Bash as /bin/sh but fail for some other shells. Quote format strings to avoid errors. Signed-off-by:

Re: [PATCH v2] format-patch --signature-file file

2014-05-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: You could do: #define DEFAULT_SIGNATURE git_version_string static const char *signature = DEFAULT_SIGNATURE; ... if (signature == DEFAULT_SIGNATURE) ... but maybe that is getting a little unwieldy, considering the scope of the original

Re: [PATCH 3/4] rebase: test ack

2014-05-20 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: Just to clarify I can post v2 of 4/4 without reposting 1-3 since they are queued? If you need to update anything queued only on 'pu' but not yet in 'next', it is customary to resend the whole for everybody to see (what is already in 'next' should only

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Johan Herland
On Tue, May 20, 2014 at 4:55 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 05/19/2014 11:31 PM, Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Where is git-imerge packaged? I didn't see it on the archive the said Ubuntu box slurps from, but I did not check

GIT and large files

2014-05-20 Thread Stewart, Louis (IS)
Can GIT handle versioning of large 20+ GB files in a directory? Lou Stewart AOCWS Software Configuration Management 757-269-2388 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Alexey Shumkin
On Tue, May 20, 2014 at 04:01:22PM +0100, Ramsay Jones wrote: On 20/05/14 15:19, Alexey Shumkin wrote: On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote: Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Alexey, If you need to re-roll your

untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Arup Rakshit
I was following some tutorial (http://gitref.org/branching/#merge) - and doing it in my console : Arup-iMac:arup_git shreyas$ git status # On branch master nothing to commit, working directory clean Arup-iMac:arup_git shreyas$ touch test.rb Arup-iMac:arup_git shreyas$ ls git_1.txttest.rb

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Ramsay Jones
On 20/05/14 17:02, Alexey Shumkin wrote: On Tue, May 20, 2014 at 04:01:22PM +0100, Ramsay Jones wrote: On 20/05/14 15:19, Alexey Shumkin wrote: On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote: Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Alexey, If you need

RE: EXT :Re: GIT and large files

2014-05-20 Thread Stewart, Louis (IS)
The files in question would be in directory containing many files some small other huge (example: text files, docs,and jpgs are Mbs, but executables and ova images are GBs, etc). Lou From: Gary Fixler [mailto:gfix...@gmail.com] Sent: Tuesday, May 20, 2014 12:09 PM To: Stewart, Louis (IS) Cc:

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 10:38 AM, Arup Rakshit wrote: I was following some tutorial (http://gitref.org/branching/#merge) - and doing it in my console : Arup-iMac:arup_git shreyas$ git status # On branch master nothing to commit, working directory clean Arup-iMac:arup_git shreyas$ touch test.rb

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Arup Rakshit
On Tuesday, May 20, 2014 11:56:57 AM you wrote: On 5/20/2014 10:38 AM, Arup Rakshit wrote: I was following some tutorial (http://gitref.org/branching/#merge) - and doing it in my console : Because you never committed the original file to the master branch before you created and switched

RE: GIT and large files

2014-05-20 Thread Jason Pyeron
-Original Message- From: Stewart, Louis (IS) Sent: Tuesday, May 20, 2014 11:38 Can GIT handle versioning of large 20+ GB files in a directory? Are you asking 20 files of a GB each or files 20GB each? A what and why may help with the underlying questions. v/r, Jason Pyeron --

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 11:03 AM, Arup Rakshit wrote: On Tuesday, May 20, 2014 11:56:57 AM you wrote: On 5/20/2014 10:38 AM, Arup Rakshit wrote: I was following some tutorial (http://gitref.org/branching/#merge) - and doing it in my console : Because you never committed the original file to the

Re: GIT and large files

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 10:37 AM, Stewart, Louis (IS) wrote: Can GIT handle versioning of large 20+ GB files in a directory? Maybe you're looking for git-annex? https://git-annex.branchable.com/ -- .marius -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: AFAIU, Junio already applied my patches (existance of a branch as/pretty-truncate tells us that). So, we can only send other patches that fix errors brought with former patches. No, NO, NO The existence of a branch merely means that I saw

Re: GIT and large files

2014-05-20 Thread Junio C Hamano
Stewart, Louis (IS) louis.stew...@ngc.com writes: Can GIT handle versioning of large 20+ GB files in a directory? I think you can git add such files, push/fetch histories that contains such files over the wire, and git checkout such files, but naturally reading, processing and writing 20+GB

RE: EXT :Re: GIT and large files

2014-05-20 Thread Stewart, Louis (IS)
Thanks for the reply. I just read the intro to GIT and I am concerned about the part that it will copy the whole repository to the developers work area. They really just need the one directory and files under that one directory. The history has TBs of data. Lou -Original Message-

Re: [PATCH] Documentation/technical/api-hashmap: Remove source highlighting

2014-05-20 Thread Junio C Hamano
Anders Kaseorg ande...@mit.edu writes: How bad does the documentation look with the patch applied (I know how bad it looks without source-highlight installed)? If it is not too bad, then it sounds like a sensible solution to drop the highlight markup unconditionally like the patch that

Re: bug: autostash is lost after aborted rebase

2014-05-20 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: [ Cc-ing Ramkumar ] Karen Etheridge et...@cpan.org writes: scenario: - edit some tracked files; do not add them to the index - git config rebase.autostash true - git rebase -i HEAD~3 (an autostash will be created) - delete the entire

Re: format-patch crashes with a huge patchset

2014-05-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, May 19, 2014 at 10:35:56PM +0300, Michael S. Tsirkin wrote: I tried to fump the whole history of qemu with format-patch. It crashes both with v2.0.0-rc2-21-g6087111 and with git 1.8.3.1: ~/opt/libexec/git-core/git-format-patch --follow -o

Re: [PATCH v5] format-patch --signature-file file

2014-05-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: But one could easily specify a longer, multi-line signature, like: git format-patch --signature=' this is my long signature it has multiple lines ' ... We should notice that it already has its own trailing newline, and suppress one of ours.

Re: [PATCH 00/19] convert test -a/-o to and || patch series

2014-05-20 Thread Junio C Hamano
Elia Pinto gitter.spi...@gmail.com writes: These patch series convert test -a/-o to and ||. This is the second version. Perhaps slightly off-topic, but has the remainder of the previous $(...) series been perfected and ready to apply? -- To unsubscribe from this list: send the line

Re: [PATCH 01/19] check_bindir: convert test -a/-o to and ||

2014-05-20 Thread Junio C Hamano
Elia Pinto gitter.spi...@gmail.com writes: The interaction with unary operators and operator precedence for and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things.

Re: EXT :Re: GIT and large files

2014-05-20 Thread Junio C Hamano
Stewart, Louis (IS) louis.stew...@ngc.com writes: Thanks for the reply. I just read the intro to GIT and I am concerned about the part that it will copy the whole repository to the developers work area. They really just need the one directory and files under that one directory. The history

RE: EXT :Re: GIT and large files

2014-05-20 Thread Stewart, Louis (IS)
From you response then there is a method to only obtain the Project, Directory and Files (which could hold 80 GBs of data) and not the rest of the Repository that contained the full overall Projects? -Original Message- From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Tuesday, May

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Arup Rakshit
On Tuesday, May 20, 2014 12:06:49 PM you wrote: It never came to the new branch, as it was never version controlled, it was an untracked file left behind when you switched branches. Once you added it to the new branch, change_class, it became a version controlled file, This is still

Re: [PATCH 00/19] convert test -a/-o to and || patch series

2014-05-20 Thread Jonathan Nieder
Hi, Elia Pinto wrote: These patch series convert test -a/-o to and ||. Should this come with a new check in t/check-non-portable-shell.pl so we don't regress in the future? Elia Pinto (19): [...] check_bindir|2 +- contrib/examples/git-clone.sh |2 +-

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Junio C Hamano
Arup Rakshit arupraks...@rocketmail.com writes: On Tuesday, May 20, 2014 12:06:49 PM you wrote: It never came to the new branch, as it was never version controlled, it was an untracked file left behind when you switched branches. Once you added it to the new branch, change_class, it

Re: [PATCH v5] format-patch --signature-file file

2014-05-20 Thread Jeff King
On Tue, May 20, 2014 at 10:53:11AM -0700, Junio C Hamano wrote: I actually think these supress extra LFs trying to be overly smart and inviting unnecessary surprises. Unlike log messages people type (in which we do squash runs of blank lines and other prettifying), mail-signature string is

Re: EXT :Re: GIT and large files

2014-05-20 Thread Thomas Braun
Am Dienstag, den 20.05.2014, 17:24 + schrieb Stewart, Louis (IS): Thanks for the reply. I just read the intro to GIT and I am concerned about the part that it will copy the whole repository to the developers work area. They really just need the one directory and files under that one

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 12:20 PM, Arup Rakshit wrote: On Tuesday, May 20, 2014 12:06:49 PM you wrote: It never came to the new branch, as it was never version controlled, it was an untracked file left behind when you switched branches. Once you added it to the new branch, change_class, it became a

Re: [PATCH v2] rebase -i: test Nothing to do case with autostash

2014-05-20 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: Signed-off-by: Matthieu Moy matthieu@imag.fr --- Eric Sunshine sunsh...@sunshineco.com writes: Simpler (replace above two lines): test_set_editor $(pwd)/abort-editor.sh Indeed. And I had debug statements left. Hopefully, this

Re: [PATCH] git-prompt.sh: don't assume the shell expands the value of PS1

2014-05-20 Thread Junio C Hamano
Richard Hansen rhan...@bbn.com writes: Not all shells subject the prompt string to parameter expansion. Test whether the shell will expand the value of PS1, and use the result to control whether raw ref names are included directly in PS1. This fixes a regression introduced in commit 8976500

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Arup Rakshit
On Tuesday, May 20, 2014 11:24:11 AM you wrote: Arup Rakshit arupraks...@rocketmail.com writes: Untracked files and modifications to files in your working directory do not belong to your current branch. This is to allow you, after starting to work on one branch then realizing that the

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 12:40 PM, Arup Rakshit wrote: On Tuesday, May 20, 2014 11:24:11 AM you wrote: Arup Rakshit arupraks...@rocketmail.com writes: Untracked files and modifications to files in your working directory do not belong to your current branch. This is to allow you, after starting to work on

Re: [PATCH v5] format-patch --signature-file file

2014-05-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: If it were just --signature, I'd agree. After all, nobody is even complaining. But this is also in preparation for --signature-file. Should the user create a file without a trailing newline? Ahh, I missed that part. I am fine with processing it with

Re: [PATCH 01/19] check_bindir: convert test -a/-o to and ||

2014-05-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: As I already said, I think better known is much less of an issue than that -a/-o is more error prone, and that is the reason why we may want to do this rewrite. I do not know offhand how busy the tree would be when we can apply these patches

Re: [PATCH] Windows: Allow using UNC path for git repository

2014-05-20 Thread Junio C Hamano
Stepan Kasal ka...@ucw.cz writes: From: Cezary Zawadka czawa...@gmail.com Date: Tue, 13 Jul 2010 16:17:43 +0200 [efl: moved MinGW-specific part to compat/] [jes: fixed compilation on non-Windows] Eric Sunshine fixed mingw_offset_1st_component() to return consistently foo for UNC

Re: EXT :Re: GIT and large files

2014-05-20 Thread Konstantin Khomoutov
On Tue, 20 May 2014 18:18:08 + Stewart, Louis (IS) louis.stew...@ngc.com wrote: From you response then there is a method to only obtain the Project, Directory and Files (which could hold 80 GBs of data) and not the rest of the Repository that contained the full overall Projects? Please

[RFC/PATCH v4 0/3] add performance tracing facility

2014-05-20 Thread Karsten Blees
This is the POSIX port of the patches I typically use to track down msysgit performance issues (thus v4, the latest windows-only version is here [1]). Sebastian and Dscho thought this might be useful in core git, so here it is. [1] https://github.com/msysgit/git/pull/46 Karsten Blees (3): add

[RFC/PATCH v4 2/3] add trace_performance facility to debug performance issues

2014-05-20 Thread Karsten Blees
Add trace_performance and trace_performance_since macros that print file name, line number, time and an optional printf-formatted text to the file specified in environment variable GIT_TRACE_PERFORMANCE. Unless enabled via GIT_TRACE_PERFORMANCE, these macros have no noticeable impact on

[RFC/PATCH v4 1/3] add high resolution timer function to debug performance issues

2014-05-20 Thread Karsten Blees
Add a getnanotime() function that returns nanoseconds since 01/01/1970 as unsigned 64-bit integer (i.e. overflows in july 2554). This is easier to work with than e.g. struct timeval or struct timespec. The implementation uses gettimeofday() by default; supports high precision time sources on the

[RFC/PATCH v4 3/3] add command performance tracing to debug scripted commands

2014-05-20 Thread Karsten Blees
Add performance tracing to identify which git commands are called and how long they execute. This is particularly useful to debug performance issues of scripted commands. Usage example: GIT_TRACE_PERFORMANCE=~/git-trace.log git stash list Creates a log file like this: performance: at

Re: [PATCH] Windows: Allow using UNC path for git repository

2014-05-20 Thread Stepan Kasal
Hello, On Tue, May 20, 2014 at 11:57:56AM -0700, Junio C Hamano wrote: It would be nice if somebody in the S-o-b chain can double-check that the combined version is sane. [...] Combined was an unfortunate word. There was a pair of successive commits in msysgit all the time. I just decided

Re: [PATCH 1/2] remote: defer repacking packed-refs when deleting refs

2014-05-20 Thread Junio C Hamano
Jens Lindström j...@opera.com writes: When 'git remote rm' or 'git remote prune' were used in a repository with many refs, and needed to delete many refs, a lot of time was spent deleting those refs since for each deleted ref, repack_without_refs() was called to rewrite packed-refs without

Re: [PATCH] Windows: Allow using UNC path for git repository

2014-05-20 Thread Junio C Hamano
Stepan Kasal ka...@ucw.cz writes: Hello, On Tue, May 20, 2014 at 11:57:56AM -0700, Junio C Hamano wrote: It would be nice if somebody in the S-o-b chain can double-check that the combined version is sane. [...] Combined was an unfortunate word. There was a pair of successive commits in

Re: [PATCH v8 25/44] receive-pack.c: use a reference transaction for updating the refs

2014-05-20 Thread Jonathan Nieder
Ronnie Sahlberg wrote: Wrap all the ref updates inside a transaction to make the update atomic. Interesting. [...] --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -46,6 +46,8 @@ static void *head_name_to_free; static int sent_capabilities; static int shallow_update;

Re: [PATCH 1/2] remote: defer repacking packed-refs when deleting refs

2014-05-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: A bit safer way to organize might be to first create a list of the refs to be removed in-core, update packed-refs without these refs to be removed, and then finally remove the loose ones, but I haven't thought things through. Perhaps a removal of

Re: [PATCH v8 25/44] receive-pack.c: use a reference transaction for updating the refs

2014-05-20 Thread Ronnie Sahlberg
On Tue, May 20, 2014 at 12:42 PM, Jonathan Nieder jrnie...@gmail.com wrote: Ronnie Sahlberg wrote: Wrap all the ref updates inside a transaction to make the update atomic. Interesting. [...] --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -46,6 +46,8 @@ static void

Re: [PATCH v8 26/44] fast-import.c: use a ref transaction when dumping tags

2014-05-20 Thread Jonathan Nieder
Ronnie Sahlberg wrote: [Subject: fast-import.c: use a ref transaction when dumping tags] This seems like an odd thing to do: either it would make sense to have a single transaction for all imported refs so all fail or succeed together, or there would be separate transactions for each ref. That

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: 2. add warning that is given every time the scripts are run and give the same instruction as in README. 3. (optional) cripple the script to make them always fail after

Re: [PATCH v8 26/44] fast-import.c: use a ref transaction when dumping tags

2014-05-20 Thread Ronnie Sahlberg
On Tue, May 20, 2014 at 1:38 PM, Jonathan Nieder jrnie...@gmail.com wrote: Ronnie Sahlberg wrote: [Subject: fast-import.c: use a ref transaction when dumping tags] This seems like an odd thing to do: either it would make sense to have a single transaction for all imported refs so all fail or

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: After looking at the reverse-depends list of packages, my faith is strengthened in that the Git ecosystem is truly maturing and useful third-party plug-ins will be picked up by distro

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Let's try this in a different way, as I sense there is a misunderstanding somewhere about your wish. ... No, I already said I do not want the code removed from v2.0, that's why I sent patches that simply added a warning, and I specifically

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: ... Which will generate the integration instructions for you: % git reintegrate --cat base master merge jl/submodule-mv Moving a regular file in a repository with a .gitmodules file was

[PATCH/RFC] t0000-*.sh: Fix the GIT_SKIP_TESTS sub-tests

2014-05-20 Thread Ramsay Jones
Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- The test suite has been failing for me on the pu branch for a while now. I finally found a few minutes to take a look. This failure is specific to the dash shell (/bin/sh) on my system (ie it may well affect other shells, but I haven't

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

2014-05-20 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Or have an option to specify a dynamic instruction sheet, so you can cat the instructions of 'match-next' and replace the base. However, I don't see the point of re-applying the branches for 'next' if you already know that 'next' and

Re: [PATCH/RFC] t0000-*.sh: Fix the GIT_SKIP_TESTS sub-tests

2014-05-20 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: This patch is an RFC, because I take a different approach to the above solution, only because the diff is much smaller and easier to read! Is it a better solution? ATB, Ramsay Jones t/t-basic.sh | 15 +-- 1 file changed, 9

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Let's try this in a different way, as I sense there is a misunderstanding somewhere about your wish. ... No, I already said I do not want the code removed from v2.0, that's why I sent patches that simply added a

  1   2   >