Re: best practices against long git rebase times?

On Fri, 04 Dec 2015 15:31:03 +, John Keeping wrote: ... > I'm pretty sure that you're right and the cherry-pick analysis is where > the time is spent. But I'm pretty surprised as to the amount of CPU time that goes there. I'm now rebasing a single commit with a single blank line added, and

Re: [PATCH/RFC 3/3] ls-files/dir: use is_git_repo to detect submodules

On Sat, 05 Dec 2015 02:37:44 +, Jeff King wrote: ... > Hrm. Weird. You'd think it would break with the existing code if I do > this, then: > ... > - (cd a/b/c; git init) && > + (cd a/b/c; git init && git commit --allow-empty -m foo) && > git config

Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

Hi, Junio, Jeff! On Fri, Dec 4, 2015 at 5:15 PM, Junio C Hamano wrote: > * ec/annotate-deleted (2015-11-20) 1 commit > - annotate: skip checking working tree if a revision is provided > > Usability fix for annotate-specific " " syntax with deleted > files. > > Waiting for

[PATCH v2 2/2] clean: new option --exclude-from

From: James Rouzier Specify a file to read for exclude patterns. --- Documentation/git-clean.txt | 5 +++- builtin/clean.c | 15 ++-- t/t7300-clean.sh| 60 + 3 files changed, 77 insertions(+), 3

[PATCH v2 1/2] modernize t7300

From: James Rouzier --- t/t7300-clean.sh | 382 +++ 1 file changed, 190 insertions(+), 192 deletions(-) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 86ceb38..d555bb6 100755 --- a/t/t7300-clean.sh +++

Re: best practices against long git rebase times?

On Fri, 04 Dec 2015 18:09:33 +, demerphq wrote: ... > I bet you have a lot of refs; tags, or branches. We do, but removing them doesn't noticably change the times (12k refs vs. 120, mostly tags). I'm just running the second series, the first (with many refs) ended with rebasing over 3000

Re: Multiple fetches when unshallowing a shallow clone

On Sun, Dec 6, 2015 at 8:01 AM, Jeff King wrote: > On Sun, Dec 06, 2015 at 01:37:18AM -0500, Jeff King wrote: > >> And indeed, replacing the logic with what I wrote does make the backfill >> go away in my test case. But it's so far from what is there that I feel >> like I must be

Re: [PATCH 1/2] git-p4: support multiple depot paths in p4 submit

Thanks for the patch! Do you see a way to demonstrate the bug in a test case similar to t9821 [1]? Cheers, Lars [1] https://github.com/git/git/blob/master/t/t9821-git-p4-path-variations.sh > On 05 Dec 2015, at 12:22, Sam Hocevar wrote: > > When submitting from a repository

Re: [PATCH 5/5] git-worktree.txt: mention about the config file split

On Wed, Dec 2, 2015 at 2:13 PM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt > @@ -147,6 +147,19 @@ to `/path/main/.git/worktrees/test-next` then a file

[PATCH 2/2] gitk: let .bleft.mid widgets 'breathe'

The widgets on top of the diff window are very tightly packed. Make them breathe a little by adding an 'i'-spaced padding between them. --- gitk | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index e04264b..b621762 100755 --- a/gitk +++ b/gitk @@ -2361,6

[PATCH 0/2] gitk spacing/sizing tuning for HiDPI

On my HiDPI monitor, most elements in gitk are correctly rendered, with two exceptions: * when using ttk, some elements do not use the same fonts as gitk would use without, and since ttk picks _unscaled_ sizes this is very noticeable (and borderline illegible); the first patch fixes this; * the

[PATCH 1/2] gitk: match ttk fonts to gitk fonts

The fonts set in setoptions aren't consistently picked up by ttk, who uses its own predefined fonts. This is noticeable when switching between using and not using ttk with custom fonts or in HiDPI settings (where the default TTK fonts do _not_ respect tk sclaing). Fix by mapping the ttk fontset

Re: [PATCH 2/5] config.c: move worktree-specific variables to .git/worktrees/...

On Sun, Dec 6, 2015 at 8:47 AM, Eric Sunshine wrote: > On Wed, Dec 2, 2015 at 2:13 PM, Nguyễn Thái Ngọc Duy > wrote: >> .git/info/config.worktree is a pattern list that splits .git/config in >> to sets: the worktree set matches the patterns, the

Re: [PATCH 0/2] format-patch: introduce option to suppress commit hashes

On Sun, Dec 06, 2015 at 06:49:14PM -0800, Junio C Hamano wrote: > "brian m. carlson" writes: > > > git format-patch is often used to create patches that are then stored in > > version control or displayed with diff. Having the commit hash in the > > "From " line

Re: git subtree bug produces divergent descendants

Sorry for the double post, I received a mail blocking notification message (due to the attached .sh file) and erroneously thought this message had been blocked from the entire list. My later one includes the test case as part of the attached patch. Cheers, Dave Ware On Mon, Dec 7, 2015 at 9:41

Re: [PATCH] filter-branch: pass tag name via stdin without newline

"Eric N. Vander Weele" writes: > "git filter-branch --tag-name-filter" fails when the user-provided > command attempts to trivially append text to the originally tag name, > passed via stdin, due to an unexpected newline ('\n'). The newline is > introduced due to "echo" piping

[PATCH] filter-branch: pass tag name via stdin without newline

"git filter-branch --tag-name-filter" fails when the user-provided command attempts to trivially append text to the originally tag name, passed via stdin, due to an unexpected newline ('\n'). The newline is introduced due to "echo" piping the original tag name to the user-provided tag name filter

Re: [PATCH 0/2] format-patch: introduce option to suppress commit hashes

"brian m. carlson" writes: > git format-patch is often used to create patches that are then stored in > version control or displayed with diff. Having the commit hash in the > "From " line usually just creates diff noise in these cases, so this > series introduces

Show total commit count of two authors or more authors into first author

I usually count commits as below command $ git shortlog -s -n 149 Jagan Teki 148 Otavio Salvador 143 Bo Shen 137 Lokesh Vutla 134 Minkyu Kang 132 Marian Balakowicz 129 Haavard Skinnemoen 127 Holger Brunck 124 Tim Harvey 122 Jagannadha Teki 120 Daniel

[PATCH v6] ls-files: Add eol diagnostics

When working in a cross-platform environment, a user wants to check if text files are stored normalized in the repository and if .gitattributes are set appropriately. Make it possible to let Git show the line endings in the index and in the working tree and the effective text/eol attributes. The

Re: Show total commit count of two authors or more authors into first author

On 7 December 2015 at 01:01, Andreas Schwab wrote: > Jagan Teki writes: > >> Out of which below three names are with same author which changed >> while submitted patches. >> 149 Jagan Teki >> 122 Jagannadha Teki >> 116 Jagannadha

git subtree bug produces divergent descendants

My group has run into a bug with "git-subtree split". Under some circumstances a split created from a descendant of another earlier split is not a descendant of that earlier split (thus blocking pushes). We originally noticed this on v1.9.1 but have also checked it on v2.6.3 When scanning the

git subtree bug produces divergent descendants

My group has run into a bug with "git-subtree split". Under some circumstances a split created from a descendant of another earlier split is not a descendant of that earlier split (thus blocking pushes). We originally noticed this on v1.9.1 but have also checked it on v2.6.3 When scanning the

Re: Show total commit count of two authors or more authors into first author

Jagan Teki writes: > Out of which below three names are with same author which changed > while submitted patches. > 149 Jagan Teki > 122 Jagannadha Teki > 116 Jagannadha Sutradharudu Teki > > I need a command to show to add all commits and show first one as >

Re: Show total commit count of two authors or more authors into first author

On Mon, Dec 07, 2015 at 01:45:19AM +0530, Jagan Teki wrote: > Thanks for the info, I'm able to map two author with e-mail but it's > not working when I group 3 > > $ .mailmap > Jagan Teki Jagannadha Teki > > The above worked but how about 3 names mapping > > $

[PATCH 1/2] Introduce a null_oid constant.

null_oid is the struct object_id equivalent to null_sha1. Signed-off-by: brian m. carlson --- cache.h | 1 + sha1_file.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cache.h b/cache.h index 5ab6cb50..c63fcc11 100644 --- a/cache.h +++ b/cache.h @@

[PATCH 0/2] format-patch: introduce option to suppress commit hashes

git format-patch is often used to create patches that are then stored in version control or displayed with diff. Having the commit hash in the "From " line usually just creates diff noise in these cases, so this series introduces --no-hash to set that to all zeros. The idea for this series came

[PATCH 2/2] format-patch: add an option to suppress commit hash

Oftentimes, patches created by git format-patch will be stored in version control or compared with diff. In these cases, two otherwise identical patches can have different commit hashes, leading to diff noise. Teach git format-patch a --no-hash option that instead produces an all-zero hash to

Git 2.3.7 hangs on fetch but not clone

I have some strange behaviour I am trying to diagnose on the NonStop port of git 2.3.7. The situation is we have a *LARGE* cloned repository with some local modifications of openssl, which we are trying to clone again for a Jenkins build. The command: git clone /local/openssl openssl works

Re: [PATCH v6] ls-files: Add eol diagnostics

On Sun, Dec 6, 2015 at 3:38 PM, Torsten Bögershausen wrote: > When working in a cross-platform environment, a user wants to > check if text files are stored normalized in the repository and if > .gitattributes are set appropriately. > [...] > Signed-off-by: Torsten Bögershausen

Can't get 'git archive' to work

Getting the errors, see below. Why "operation is not supported" through http and https? 'archive' is supposed to be the most efficient operation to get the specific snapshot of the repository, and it should be available without authentication. In case of ssh with the key there is the strange

Re: [PATCH 0/2] gitk spacing/sizing tuning for HiDPI

On Sun, Dec 6, 2015 at 7:25 AM, Giuseppe Bilotta wrote: > On my HiDPI monitor, most elements in gitk are correctly rendered, with two > exceptions: > > * when using ttk, some elements do not use the same fonts as gitk would use > without, and since ttk picks

Re: [RFC/PATCH 2/8] update-index: add --test-untracked-cache

On Wed, Dec 2, 2015 at 8:17 PM, Duy Nguyen wrote: > On Tue, Dec 1, 2015 at 9:31 PM, Christian Couder > wrote: >> diff --git a/builtin/update-index.c b/builtin/update-index.c >> index e568acc..b7b5108 100644 >> --- a/builtin/update-index.c >> +++

Re: [PATCHv3] gitweb: fill in missing parts of JavaScript minify support

i find a free online tool to minify javascript . -- View this message in context: http://git.661346.n2.nabble.com/PATCHv3-gitweb-fill-in-missing-parts-of-JavaScript-minify-support-tp4767036p7643775.html Sent from the git mailing list archive at

Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

On Sun, Dec 6, 2015 at 11:12 AM, Edmundo Carmona Antoranz wrote: > And, another thing, I had sent the fifth version of my patch about > progress for blame where I took care of all the comments hat Junio > stated before and I got no comments since. I hoped that patch would be

Re: git subtree bug produces divergent descendants

On Mon, Dec 07, 2015 at 11:09:48AM +1300, David Ware wrote: > My group has run into a bug with "git-subtree split". Under some > circumstances a split created from a descendant of another earlier > split is not a descendant of that earlier split (thus blocking > pushes). [...] I'm not a

Re: [RFC/PATCH] config: add core.trustmtime

On Wed, Dec 2, 2015 at 8:28 PM, Duy Nguyen wrote: > On Wed, Nov 25, 2015 at 10:00 AM, Ævar Arnfjörð Bjarmason > wrote: >> Aside from the slight hassle of enabling this and keeping it enabled >> this feature is great. It's sped up "git status" across the board

Re: Show total commit count of two authors or more authors into first author

On 7 December 2015 at 02:50, brian m. carlson wrote: > On Mon, Dec 07, 2015 at 01:45:19AM +0530, Jagan Teki wrote: >> Thanks for the info, I'm able to map two author with e-mail but it's >> not working when I group 3 >> >> $ .mailmap >> Jagan Teki

Re: [PATCH] filter-branch: pass tag name via stdin without newline

On Sun, Dec 6, 2015 at 6:55 PM, Junio C Hamano wrote: > "Eric N. Vander Weele" writes: > >> "git filter-branch --tag-name-filter" fails when the user-provided >> command attempts to trivially append text to the originally tag name, >> passed via stdin, due to

Re: [RFC/PATCH 7/8] update-index: prevent --untracked-cache from performing tests

On Wed, Dec 2, 2015 at 8:18 PM, Duy Nguyen wrote: > On Tue, Dec 1, 2015 at 9:31 PM, Christian Couder > wrote: > diff --git a/t/t7063-status-untracked-cache.sh > b/t/t7063-status-untracked-cache.sh >> index 0e8d0d4..8c3e703 100755 >> ---