Re: [PATCH v3] config.c: split some variables to $GIT_DIR/config.worktree

2015-04-18 Thread Duy Nguyen
On Tue, Apr 14, 2015 at 02:37:39AM +0300, Max Kirillov wrote: On Tue, Mar 31, 2015 at 07:14:39PM +0700, Nguyễn Thái Ngọc Duy wrote: core.worktree and core.bare, which are treated specially in 31e26eb [1], are now moved to info/core.worktree and the special treatment reverted. ... - if

[PATCH v2] t1509: update prepare script to be able to run t1509 in chroot again

2015-04-18 Thread Nguyễn Thái Ngọc Duy
Tested on Gentoo and OpenSUSE 13.1, both x86-64 Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- On Sun, Apr 12, 2015 at 2:58 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: On Fri, Apr 3, 2015 at 7:01 PM, Jeff King p...@peff.net wrote: Aside

[FUN] Conflicting git merge runs for several minutes. (3,5)

2015-04-18 Thread Thore Husfeldt
For the cruciverbalists in this community, I constructed a cryptic crossword themed for git. http://thorehusfeldt.net/2015/04/03/conflicting-git-merge-runs-for-several-minutes-35/ Here are all the clues: 1 git rebase a ref, keeping the current branch. (11) 8 It horizontally connects a group of

REQUEST-PULL: Please pull from git-gui.

2015-04-18 Thread Pat Thoyts
The following changes since commit 1b2c79e63e5afa3cecb3ab4a40cb414dbe6511ce: git-gui 0.19 (2014-01-18 17:29:34 +) are available in the git repository at: http://repo.or.cz/r/git-gui.git tags/gitgui-0.20.0 for you to fetch changes up to 4498b3a50a0e839788682f672df267cbc1ba9292:

Re: REQUEST-PULL: Please pull from git-gui.

2015-04-18 Thread Johannes Schindelin
Hi Pat, On 2015-04-18 15:47, Pat Thoyts wrote: Sebastian Schuberth (1): git-gui/gitk: Do not depend on Cygwin's kill command on Windows Awesome! Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH v2 2/2] t0027: Support NATIVE_CRLF

2015-04-18 Thread Johannes Schindelin
Hi Junio, On 2015-04-17 23:04, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On 2015-04-17 17:44, Torsten Bögershausen wrote: Without this patch, t0027 expects the native end-of-lines to be a single line feed character. On Windows, however, we set it to a

[PATCH 2/2] index-pack: kill union delta_base to save memory

2015-04-18 Thread Nguyễn Thái Ngọc Duy
Once we know the number of objects in the input pack, we allocate an array of nr_objects of struct delta_entry. On x86-64, this struct is 32 bytes long. The union delta_base, which is part of struct delta_entry, provides enough space to store either ofs-delta (8 bytes) or ref-delta (20 bytes).

[PATCH 1/2] index-pack: reduce object_entry size to save memory

2015-04-18 Thread Nguyễn Thái Ngọc Duy
For each object in the input pack, we need one struct object_entry. On x86-64, this struct is 64 bytes long. Although: - The 8 bytes for delta_depth and base_object_no are only useful when show_stat is set. And it's never set unless someone is debugging. - The three fields hdr_size, type

[PATCH 0/2] nd/slim-index-pack-memory-usage update

2015-04-18 Thread Nguyễn Thái Ngọc Duy
The only change is in the commit message of 2/2 [1]. Sorry it took too long, I completely forgot about it. [1] http://article.gmane.org/gmane.comp.version-control.git/264544 Nguyễn Thái Ngọc Duy (2): index-pack: reduce object_entry size to save memory index-pack: kill union delta_base to

[PATCH/RFC v3 4/4] clean: improve performance when removing lots of directories

2015-04-18 Thread Erik Elfström
git clean uses resolve_gitlink_ref() to check for the presence of nested git repositories, but it has the drawback of creating a ref_cache entry for every directory that should potentially be cleaned. The linear search through the ref_cache list causes a massive performance hit for large number of

[PATCH/RFC v3 2/4] t7300: add tests to document behavior of clean and nested git

2015-04-18 Thread Erik Elfström
Signed-off-by: Erik Elfström erik.elfst...@gmail.com --- t/t7300-clean.sh | 127 +++ 1 file changed, 127 insertions(+) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 99be5d9..4b9a72a 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh

[PATCH/RFC v3 0/4] Improving performance of git clean

2015-04-18 Thread Erik Elfström
I've marked this RFC since there are known problems here. v2 of the patch can be found here: http://thread.gmane.org/gmane.comp.version-control.git/267023/focus=267023 Changes in v3: * Created setup.c:read_gitfile_gently to use for submodule probing * Cleanup of some tests by use of

[PATCH/RFC v3 1/4] setup: add gentle version of read_gitfile

2015-04-18 Thread Erik Elfström
read_gitfile will die on most error cases. This makes it unsuitable for speculative calls. Extract the core logic and provide a gentle version that returns NULL on failure. The first usecase of the new gentle version will be to probe for submodules during git clean. Helped-by: Junio C Hamano

[PATCH/RFC v3 3/4] p7300: add performance tests for clean

2015-04-18 Thread Erik Elfström
Signed-off-by: Erik Elfström erik.elfst...@gmail.com --- t/perf/p7300-clean.sh | 37 + 1 file changed, 37 insertions(+) create mode 100755 t/perf/p7300-clean.sh diff --git a/t/perf/p7300-clean.sh b/t/perf/p7300-clean.sh new file mode 100755 index

Re: [PATCH 0/2] git-p4: Improve client path detection

2015-04-18 Thread Vitor Antunes
Hi Junio, Junio C Hamano gits...@pobox.com wrote on Sun, 12 Apr 2015 20:40:58 -0700 Vitor Antunes vitor@gmail.com writes: Luke Diamand l...@diamand.org wrote on Sun, 05 Apr 2015 20:27:11 +0100 Vitor, one thing I wondered about with this part of the change: -if

[PATCH] git-p4: Improve client path detection when branches are used

2015-04-18 Thread Vitor Antunes
This patch makes the client path detection more robust by limiting the valid results from p4 where. The test case is also made more complex, to guarantee that such client views are supported. Signed-off-by: Vitor Antunes vitor@gmail.com --- git-p4.py|4 +++-

Re: [PATCH v8 2/4] cat-file: teach cat-file a '--literally' option

2015-04-18 Thread Charles Bailey
On Wed, Apr 15, 2015 at 10:29:34PM +0530, Karthik Nayak wrote: Currently 'git cat-file' throws an error while trying to print the type or size of a broken/corrupt object. This is because these objects are usually of unknown types. Teach git cat-file a '--literally' option where it prints

Re: [PATCH] git-p4: Improve client path detection when branches are used

2015-04-18 Thread Junio C Hamano
Vitor Antunes vitor@gmail.com writes: This patch makes the client path detection more robust by limiting the valid results from p4 where. The test case is also made more complex, to guarantee that such client views are supported. Signed-off-by: Vitor Antunes vitor@gmail.com --- Was

Re: [PATCH/RFC v3 0/4] Improving performance of git clean

2015-04-18 Thread Junio C Hamano
Erik Elfström erik.elfst...@gmail.com writes: Known Problems: * Unsure about the setup.c:read_gitfile refactor, feels a bit messy? The interface indeed feels somewhat messy. I suspect that a better interface might be more like setup_git_directory_gently() that is a gentler version of

[BUG] git pull will regress between 'master' and 'pu'

2015-04-18 Thread Junio C Hamano
This is primarily note-to-self; even though I haven't got around bisecting yet, I think I know I did some bad change myself. git pull $URL $tag seems to: * fail to invoke the editor without --edit. * show the summary merge log message twice. -- To unsubscribe from this list: send the line

Re: [PATCH] fast-import: add options to enable/disable case folding

2015-04-18 Thread Mike Hommey
On Fri, Apr 17, 2015 at 11:44:00AM -0700, Junio C Hamano wrote: So perhaps we should rip the case folding out altogether instead? The entry for the change in the Release Notes may say: * git fast-import incorrectly case-folded the paths recorded in the history when core.ignorease is set

Re: [PATCH v2 1/7] path.c: implement xdg_config_home()

2015-04-18 Thread Paul Tan
Hi, On Fri, Apr 17, 2015 at 5:41 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Tue, Apr 14, 2015 at 1:28 PM, Paul Tan pyoka...@gmail.com wrote: Below is the fixed patch. I also decided to return NULL if `filename` is NULL because such an input usually indicated an uncaught error.

Re: [PATCH v8 1/4] sha1_file.c: support reading from a loose object of unknown type

2015-04-18 Thread karthik nayak
On 04/18/2015 12:19 AM, Jeff King wrote: On Sat, Apr 18, 2015 at 12:15:28AM +0530, karthik nayak wrote: But now we use type_from_string_gently, which can accept a length[1]. So we could just count the bytes to the first space and pass the original buffer along with that length, no? Yes, we

Re: [PATCH v8 1/4] sha1_file.c: support reading from a loose object of unknown type

2015-04-18 Thread karthik nayak
On 04/18/2015 12:53 AM, Junio C Hamano wrote: karthik nayak karthik@gmail.com writes: + type = type_from_string_gently(buf, len, 1); + if (oi-typename) { + strbuf_add(oi-typename, buf, len); + strbuf_addch(oi-typename, '\0'); add() has setlen()

Re: [PATCH v2 1/7] path.c: implement xdg_config_home()

2015-04-18 Thread Paul Tan
Hi, On Fri, Apr 17, 2015 at 5:41 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Tue, Apr 14, 2015 at 1:28 PM, Paul Tan pyoka...@gmail.com wrote: Below is the fixed patch. I also decided to return NULL if `filename` is NULL because such an input usually indicated an uncaught error.

Re: [PATCH v8 1/4] sha1_file.c: support reading from a loose object of unknown type

2015-04-18 Thread karthik nayak
On 04/18/2015 05:01 AM, Eric Sunshine wrote: On Wed, Apr 15, 2015 at 12:59 PM, Karthik Nayak karthik@gmail.com wrote: Update sha1_loose_object_info() to optionally allow it to read from a loose object file of unknown/bogus type; as the function usually returns the type of the object it