Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

2017-12-17 Thread Jeff King
On Sun, Dec 17, 2017 at 08:03:41PM -0800, Jacob Keller wrote: > I do find it a bit weird that --global writes to one of either file, > and doesn't read from both. I'd rather have --global "only" be > .gitconfig, and instead add a new option for handling XDG file, and > then have it such that it

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

2017-12-17 Thread Jacob Keller
On Sat, Dec 16, 2017 at 2:01 PM, brian m. carlson wrote: > On Mon, Dec 11, 2017 at 05:05:01PM -0800, Junio C Hamano wrote: >> Jonathan Nieder writes: >> > As for "git config --global", I think the best thing would be to split >> > it into two

Re: [PATCH] git-gui: Make push remote combobox full width

2017-12-17 Thread Eric Sunshine
On Sun, Dec 17, 2017 at 8:49 AM, Peter Urbanec wrote: > Just wondering if I submitted this patch correctly and to the right place. You sent it to the right place. Unfortunately, Pat hasn't been around much lately, so the git-gui project is apparently slumbering. Junio has

Re: feature-request: git "cp" like there is git mv.

2017-12-17 Thread Igor Djordjevic
Hi Simon, On 12/12/2017 11:53, Simon Doodkin wrote: > > please develop a new feature, git "cp" like there is git mv > tomovefile1 tofile2 (to save space). > > there is a solution in https://stackoverflow.com/a/44036771/466363 > however, it is not single easy command. While having `git cp`

[PATCH v2 1/3] repository: fix repo_read_index with submodules

2017-12-17 Thread Thomas Gummerer
repo_read_index calls read_index_from, which takes an path argument for the location of the index file. For the split index however it relies on the current working directory to construct the path using git_path. repo_read_index calls read_index_from with the full path for the index file,

[PATCH v2 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

2017-12-17 Thread Thomas Gummerer
Split index mode only has a few dedicated tests, but as the index is involved in nearly every git operation, this doesn't quite cover all the ways repositories with split index can break. To use split index mode throughout the test suite a GIT_TEST_SPLIT_INDEX environment variable can be set,

[PATCH v2 0/3] fixes for split index mode

2017-12-17 Thread Thomas Gummerer
The previous round was at <20171210212202.28231-1-t.gumme...@gmail.com>. Thanks Brandon, Eric, Szeder, Lars and Junio for the comments on the previous round. Changes since the previous round: - pass in the_repository to do_read_index_from, so we don't have to special case NULL anymore. -

[PATCH v2 2/3] prune: fix pruning with multiple worktrees and split index

2017-12-17 Thread Thomas Gummerer
be489d02d2 ("revision.c: --indexed-objects add objects from all worktrees", 2017-08-23) made sure that pruning takes objects from all worktrees into account. It did that by reading the index of every worktree and adding the necessary index objects to the set of pending objects. The index is read

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-17 Thread Thomas Gummerer
On 12/16, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Maybe the best solution would be to introduce 'git reset --hard -- > > ', or maybe someone who knows shell programming a little > > better than me has an idea? > > > > diff --git a/git-stash.sh b/git-stash.sh

Re: [PATCH v1] convert: add support for 'encoding' attribute

2017-12-17 Thread Torsten Bögershausen
On Mon, Dec 11, 2017 at 04:50:23PM +0100, lars.schnei...@autodesk.com wrote: > From: Lars Schneider > > Git and its tools (e.g. git diff) expect all text files in UTF-8 > encoding. Git will happily accept content in all other encodings, too, > but it might not be able

Re: [PATCH] git-gui: Make push remote combobox full width

2017-12-17 Thread Peter Urbanec
Just wondering if I submitted this patch correctly and to the right place. On 11/12/17 11:48, Peter Urbanec wrote: When pushing changes, the Remote combobox for the Destination Repository does not take all available space in the layout. With long remote names, this causes the combobox to have

Grüße an Dich

2017-12-17 Thread Meinze Klaus Peter
"In einer kurzen Einführung, Ich bin ein Rechtsanwalt Meinze Klaus Peter, aus Deutschland, lebe ich in London, habe ich Ihnen eine E-Mail über meine verstorbene Familie geschickt, aber ich habe keine Antwort von Ihnen erhalten, der Verstorbene ist ein Bürger in Ihrem Land mit dem gleichen

Re: [PATCH] revision: introduce prepare_revision_walk_extended()

2017-12-17 Thread Martin Ågren
On 16 December 2017 at 13:12, René Scharfe wrote: > prepare_revision_walk() allows callers to take ownership of the array of > pending objects by setting the rev_info flag "leak_pending" and copying > the object_array "pending". They use it to clear commit marks after > setup is