Re: [PATCH v3 1/1] abspath_part_inside_repo: respect core.fileMode

2018-12-24 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > diff --git a/setup.c b/setup.c > index 1be5037f12..291bfb2128 100644 > --- a/setup.c > +++ b/setup.c > @@ -39,7 +39,7 @@ static int abspath_part_inside_repo(char *path) > off = offset_1st_component(path); > > /* check if work tree is

Re: [PATCH] log: add %S option (like --source) to log --format

2018-12-24 Thread Issac Trotts
Got it, sounds good. On Sat, Dec 22, 2018 at 2:22 PM Jeff King wrote: > > On Thu, Dec 20, 2018 at 09:24:10PM -0800, Issac Trotts wrote: > > > Hi all, friendly ping. Is there still interest in merging this patch? > > Yes, but I think people are largely absent for holidays at this point. > If there

[PATCH v3 0/1] Make abspath() aware of case-insensitive filesystems

2018-12-24 Thread Johannes Schindelin via GitGitGadget
It is completely legitimate these days to call git add with absolute paths. Of course, on a case-insensitive file system, users rightfully expect the argument to be handled case-insensitively, too. This patch makes it so. Git for Windows carried this patch for over one and a half years already, I

[PATCH v3 1/1] abspath_part_inside_repo: respect core.fileMode

2018-12-24 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin If the file system is case-insensitive, we really must be careful to ignore differences in case only. This fixes https://github.com/git-for-windows/git/issues/735 Signed-off-by: Johannes Schindelin --- setup.c| 6 +++--- t/t3700-add.sh | 7 +++ 2 files ch

[PATCH v2 0/1] Make abspath() aware of case-insensitive filesystems

2018-12-24 Thread Johannes Schindelin via GitGitGadget
It is completely legitimate these days to call git add with absolute paths. Of course, on a case-insensitive file system, users rightfully expect the argument to be handled case-insensitively, too. This patch makes it so. Git for Windows carried this patch for over one and a half years already, I

[PATCH v2 1/1] abspath_part_inside_repo: respect core.fileMode

2018-12-24 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin If the file system is case-insensitive, we really must be careful to ignore differences in case only. This fixes https://github.com/git-for-windows/git/issues/735 Signed-off-by: Johannes Schindelin --- setup.c| 6 +++--- t/t3700-add.sh | 7 +++ 2 files ch

[PATCH 1/2] t5403: Refactor

2018-12-24 Thread orgads
From: Orgad Shaneh * Replace multiple clones and commits by test_commits. * Replace 3 invocations of awk by read. Signed-off-by: Orgad Shaneh --- t/t5403-post-checkout-hook.sh | 80 +-- 1 file changed, 29 insertions(+), 51 deletions(-) diff --git a/t/t5403-post

[PATCH 2/2] Rebase: Run post-checkout hook on checkout

2018-12-24 Thread orgads
From: Orgad Shaneh Signed-off-by: Orgad Shaneh --- builtin/rebase.c | 11 +-- t/t5403-post-checkout-hook.sh | 20 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index b5c99ec10c..7f7a2c738e 100644 ---

[PATCH] Rebase: Run post-checkout hook on checkout

2018-12-24 Thread orgads
From: Orgad Shaneh Signed-off-by: Orgad Shaneh --- builtin/rebase.c | 11 +-- t/t5403-post-checkout-hook.sh | 20 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index b5c99ec10c..7f7a2c738e 100644 ---

Re: [PATCH 2/2] Rebase: Run post-checkout hook on checkout

2018-12-24 Thread Orgad Shaneh
Hi Johannes, On Fri, Dec 21, 2018 at 6:12 PM Johannes Schindelin wrote: > > Hi Orgad, > > On Thu, 20 Dec 2018, org...@gmail.com wrote: > > > From: Orgad Shaneh > > > > Signed-off-by: Orgad Shaneh > > Feel free to steal the PR description I added to your PR at > https://github.com/git-for-window

Re: [PATCH 1/2] t5403: Refactor

2018-12-24 Thread Orgad Shaneh
Hi Johannes, Thanks for reviewing this. On Fri, Dec 21, 2018 at 6:06 PM Johannes Schindelin wrote: > > Hi Orgad, > > On Thu, 20 Dec 2018, org...@gmail.com wrote: > > > diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh > > index fc898c9eac..7e941537f9 100755 > > --- a/t/t

Re: Unable to install latest git version. Claims git process pid running

2018-12-24 Thread Johannes Schindelin
Hi David, On Fri, 21 Dec 2018, David Brown wrote: > Unfortunately I have hit refresh many times in previous attempts. > > Notwithstanding, the dialog maintains the error condition claiming pid 10128 > must be closed prior to install. That must mean that there *is* a process with that ID. Have y

Re: [PATCH 1/1] abspath_part_inside_repo: respect core.fileMode

2018-12-24 Thread Johannes Schindelin
Hi Carlo, On Sat, 22 Dec 2018, Carlo Arenas wrote: > On Fri, Dec 21, 2018 at 8:34 AM Johannes Schindelin via GitGitGadget > wrote: > > +test_expect_success MINGW 'path is case-insensitive' ' > > CASE_INSENSITIVE_FS might be a better prereq You're right, the path that I downcase in the test con

Re: Parsing trailers

2018-12-24 Thread William Chargin
Hi Christian: thanks for your reply. > Changing the default separator as shown above, should make it easier > to parse the result. But this actually also changes which lines are considered trailers, right? If the commit message ends with Signed-off-by: one Signed-off-by| two and the use

[PATCH v2 1/6] ref-filter: add objectsize:disk option

2018-12-24 Thread Olga Telezhnaya
Add new formatting option objectsize:disk to know exact size that object takes up on disk. Signed-off-by: Olga Telezhnaia --- ref-filter.c | 23 --- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 5de616befe46e..fd95547676047 1

[PATCH v2 5/6] ref-filter: add tests for deltabase

2018-12-24 Thread Olga Telezhnaya
Test new formatting option deltabase. Signed-off-by: Olga Telezhnaia --- t/t6300-for-each-ref.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 097fdf21fe196..0ffd63071392e 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each

[PATCH v2 4/6] ref-filter: add deltabase option

2018-12-24 Thread Olga Telezhnaya
Add new formatting option: deltabase. If the object is stored as a delta on-disk, this expands to the 40-hex sha1 of the delta base object. Otherwise, expands to the null sha1 (40 zeroes). We have same option in cat-file command. Hopefully, in the end I will remove formatting code from cat-file and

[PATCH v2 6/6] ref-filter: add docs for new options

2018-12-24 Thread Olga Telezhnaya
Add documentation for formatting options objectsize:disk and deltabase. Signed-off-by: Olga Telezhnaia --- Documentation/git-for-each-ref.txt | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each

[PATCH v2 2/6] ref-filter: add check for negative file size

2018-12-24 Thread Olga Telezhnaya
If we have negative file size, we are doing something wrong. Signed-off-by: Olga Telezhnaia --- ref-filter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ref-filter.c b/ref-filter.c index fd95547676047..45c558bcbd521 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1491,6 +1491,8 @@ sta

[PATCH v2 3/6] ref-filter: add tests for objectsize:disk

2018-12-24 Thread Olga Telezhnaya
Test new formatting atom. Signed-off-by: Olga Telezhnaia --- t/t6300-for-each-ref.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 97bfbee6e8d69..097fdf21fe196 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -

[PATCH v2 0/5] ref-filter: add new formatting options

2018-12-24 Thread Оля Тележная
пт, 9 нояб. 2018 г. в 10:37, Оля Тележная : > > Add formatting options %(objectsize:disk) and %(deltabase), as in > cat-file command. > > I can not test %(deltabase) properly (I mean, I want to have test with > meaningful deltabase in the result - now we have only with zeros). I > tested it manuall

Re: Parsing trailers

2018-12-24 Thread Christian Couder
On Sun, Dec 23, 2018 at 11:44 PM William Chargin wrote: > > I'm interested in parsing the output of `git-interpret-trailers` in a > script. I had hoped that the `--parse` option would make this easy, but > it seems that the `trailer.separators` configuration option is used to > specify both the in

[PATCH v4 1/3] ref-filter: add worktreepath atom

2018-12-24 Thread nbelakovski
From: Nickolai Belakovski Add an atom providing the path of the linked worktree where this ref is checked out, if it is checked out in any linked worktrees, and empty string otherwise. --- Documentation/git-for-each-ref.txt | 5 +++ ref-filter.c | 72 ++

[PATCH v4 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree

2018-12-24 Thread nbelakovski
From: Nickolai Belakovski In order to more clearly display which branches are active, the output of git branch is modified to mark branches checkout out in a linked worktree with a "+" and color them in cyan (in contrast to the current branch, which will still be denoted with a "*" and colored in

[PATCH v4 3/3] branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktree

2018-12-24 Thread nbelakovski
From: Nickolai Belakovski --- builtin/branch.c | 4 1 file changed, 4 insertions(+) diff --git a/builtin/branch.c b/builtin/branch.c index 2a24153b78..56589a3684 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -366,6 +366,10 @@ static char *build_format(struct ref_filter *filter, i

[PATCH v4 0/3]

2018-12-24 Thread nbelakovski
From: Nickolai Belakovski > I don't think that works. The default function is always_equal(), which > will treat two entries equal if they have the same hash value. I.e., any > collisions would be considered a match. You're absolutely right. I've added a compare function, but I left out the func

Re: [PATCH v2] sha1-name.c: Fix handling of revisions that contain paths with brackets

2018-12-24 Thread Duy Nguyen
On Sun, Dec 23, 2018 at 11:40:59PM +, Stan Hu wrote: > Previously, calling ls-tree with a revision such as > `master^{tree}:foo/{{path}}` would show the root tree instead of the > correct tree pointed by foo/{{path}}. If a colon is present in the revision > name, peel_onion() should assume that