[Bug] incomplete defence agains creating a branch named HEAD

2015-08-05 Thread Dennis Kaarsemaker
s mirroring a mercurial repo that has a branch named '@'. Whether or not git should allow branches named '@' I don't have an opinion on, I know '@' is pretty special when dealing with refs. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from t

Re: [RFC/PATCH v1] Add Travis CI support

2015-09-24 Thread Dennis Kaarsemaker
ment status (where it can put "this commit failed tests"), repository hooks (to set up build triggers), team membership (ro) and email addresses (ro). -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of

Re: [PATCH v2 43/43] refs: tests for db backend

2015-10-03 Thread Dennis Kaarsemaker
git update-ref -d refs/heads/self test_must_fail: command succeeded: git update-ref -d refs/heads/self not ok 18 - update-ref -d is not confused by self-reference # # git symbolic-ref refs/heads/self refs/heads/self && # test_when_finished "delete_ref refs/heads/self&qu

Re: [RFC/PATCH v1] Add Travis CI support

2015-10-04 Thread Dennis Kaarsemaker
clone of git/git with a different ci system enabled, and it hasn't really caught anything. Only the occasional test failure in pu like the one I mailed about yesterday. The automated testing of pull requests could be useful, but pull requests don't seem to be used much yet. -- Denn

Re: [RFC/PATCH v1] Add Travis CI support

2015-10-04 Thread Dennis Kaarsemaker
gt; I am wondering if that can be an avenue for a possible mischief. The latter. And it can, as it can enable notifications. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kerne

Re: Minor bug report

2015-06-03 Thread Dennis Kaarsemaker
esolve 'HEAD' as a valid ref. The solution there is simple, git rm --cached, but I think git could produce more helpful messages when a repo is empty. I think you are growing bitter with age ;) -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send

Re: RFC: reverse history tree, for faster & background clones

2015-06-12 Thread Dennis Kaarsemaker
nd. This could actually be a good thing, and can be emulated now with git clone --depth=1 and subsequent fetches in the background to deepen the history. I can see some value in clone doing this by itself, first doing a depth=1 fetch, then launching itself into the background, gi

Re: RFC: reverse history tree, for faster & background clones

2015-06-12 Thread Dennis Kaarsemaker
On vr, 2015-06-12 at 13:39 +0200, Andres G. Aragoneses wrote: > On 12/06/15 13:33, Dennis Kaarsemaker wrote: > > On vr, 2015-06-12 at 13:26 +0200, Andres G. Aragoneses wrote: > > > >> AFAIU git stores the contents of a repo as a sequence of patches in the > >> .git

incomplete footers added by list server?

2015-06-23 Thread Dennis Kaarsemaker
o at http://vger.kernel.org/majordomo-info.html Only the first line is now added, actually making it fairly useless :) -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More maj

Reset sometimes updates mtime

2015-07-09 Thread Dennis Kaarsemaker
n safely make? If it is, then I'll debug further (e.g. I don't even know yet if the file gets rewritten or just touched, why the index gets updated as well etc.). -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git"

Re: Reset sometimes updates mtime

2015-07-10 Thread Dennis Kaarsemaker
On do, 2015-07-09 at 10:56 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > I'm seeing some behaviour with git reset that I find odd. Basically if I > > do > > > > git fetch && \ > > git reset --hard simple-tag-that-points-to-th

Re: git branch -v output ambiguous for parser

2015-07-23 Thread Dennis Kaarsemaker
On do, 2015-07-23 at 15:29 +0200, Thibault Kruse wrote: > Hi, > > trying to write a git wrapper, I wanted to parse the output of git branch -v The output of git branch is not meant to be machine-parsed. Try using git for-each-ref :) -- Dennis Kaarsemaker http://www.kaarsemaker.n

Re: [BUG REPORT] git 2.9.0 clone --recursive fails on cloning a submodule

2016-06-19 Thread Dennis Kaarsemaker
On zo, 2016-06-19 at 18:09 -0700, Stefan Beller wrote: > How often do we see a depth != 1 in practice? Travis clones with --depth=50 D. -- 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 http://vger.kern

Re: [PATCH v2] Refactor recv_sideband()

2016-06-24 Thread Dennis Kaarsemaker
On vr, 2016-06-24 at 14:14 -0400, Jeff King wrote: > On Fri, Jun 24, 2016 at 07:45:04PM +0200, Johannes Schindelin wrote: >> Do we *actually* send color via the sideband, like, ever? > We don't, but remember that we forward arbitrary output from hooks. > If the consensus is "nah, it is probably c

Re: Dependencies required for offline installation

2016-07-05 Thread Dennis Kaarsemaker
On di, 2016-07-05 at 07:45 -0400, Kevin Paxton wrote: > Hi, > > I’m looking to install git on a separate network that is running > Redhat 5.5. That's ancient and unsupported. If you insist on using rhel 5, at least do 5.11 so you get the security updates. > I need to know what is the list of pa

Re: Dependencies required for offline installation

2016-07-05 Thread Dennis Kaarsemaker
ion be applicable to 6.5 as well as the > dependencies that you mentioned? Red hat actually ships a version of git with RHEL 6.  So the version will be different (I believe it's a 1.7.something). The dependencies should be similar, if not the same. > On Tue, Jul 5, 2016 at 1:53 PM,

Re: Https password present in git output

2016-07-13 Thread Dennis Kaarsemaker
On wo, 2016-07-13 at 20:26 +0300, ervion wrote: > One possibility for this in git is to save remote in the  > https://username:passw...@domain.com/repo.git format. This is not recommended. Git has credential helpers to help you store passwords outside the git configuration. Which then makes your

Re: [PATCH v2 3/6] update_unicode.sh: pin the uniset repo to a known good commit

2016-12-15 Thread Dennis Kaarsemaker
On Wed, 2016-12-14 at 00:31 +0100, Beat Bolli wrote: > +   ( cd uniset && git checkout 4b186196dd ) Micronit, but this is perhaps better written as git -C uniset checkout 4b186196dd to avoid the subshell and cd. D.

Re: "git fsck" not detecting garbage at the end of blob object files...

2017-01-07 Thread Dennis Kaarsemaker
On Sat, 2017-01-07 at 07:50 -0500, John Szakmeister wrote: > I was perusing StackOverflow this morning and ran across this > question: > http://stackoverflow.com/questions/41521143/git-fsck-full-only-checking-directories/ > > It was a simple question about why "checking objects" was not > appeari

[PATCH v2 1/2] diff --no-index: follow symlinks

2017-01-13 Thread Dennis Kaarsemaker
ption has been added to disable this behaviour. Signed-off-by: Dennis Kaarsemaker --- Documentation/diff-options.txt | 7 +++ diff-no-index.c| 7 --- diff.c | 10 -- diff.h | 2 +- t/t4053-diff-no-index.sh

[PATCH v2 0/2] diff --no-index: support symlinks and pipes

2017-01-13 Thread Dennis Kaarsemaker
tests and documentation Specifically not changed: These changes affect only diff --no-index. Using --no-dereference is an error without --no-index. Dennis Kaarsemaker (2): diff --no-index: follow symlinks diff --no-index: support reading from pipes Documentation/diff-options.txt | 7 +++

[PATCH v2 2/2] diff --no-index: support reading from pipes

2017-01-13 Thread Dennis Kaarsemaker
diff <(command1) <(command2) provides useful output, let's make it possible for git to do the same. Signed-off-by: Dennis Kaarsemaker --- diff-no-index.c | 8 diff.c | 13 +++-- t/t4053-diff-no-index.sh | 10 ++ t/test-lib.sh

Re: Bug? git worktree fails with master on bare repo

2016-10-09 Thread Dennis Kaarsemaker
On Sat, 2016-10-08 at 19:30 -0500, Michael Tutty wrote: > Hey all, > I'm working on some server-side software to do a merge. By using git > worktree it's possible to check out a given branch for a bare repo and > merge another branch into it. It's very fast, even with large > repositories. > > The

Re: Problem with submodules

2016-10-09 Thread Dennis Kaarsemaker
On Sun, 2016-10-09 at 16:41 +0200, ven...@gmail.com wrote: > Hi, I want to report a regression. > > After cloning for example https://git.gnome.org/browse/epiphany with > git 2.10 and running ./autogen.sh I get the following errors: > http://pastebin.com/93AunRhu > > The developer told me that it

Re: [PATCH 1/2] submodule: ignore trailing slash on superproject URL

2016-10-10 Thread Dennis Kaarsemaker
[And now with CC to the list, sorry Stefan] On Mon, 2016-10-10 at 10:56 -0700, Stefan Beller wrote: > Before 63e95beb0 (2016-04-15, submodule: port resolve_relative_url from > shell to C), it did not matter if the superprojects URL had a trailing > slash or not. It was just chopped off as one of t

Re: [PATCH] contrib: add credential helper for libsecret

2016-10-10 Thread Dennis Kaarsemaker
On Sun, 2016-10-09 at 15:34 +0300, Mantas Mikulėnas wrote: > This is based on the existing gnome-keyring helper, but instead of > libgnome-keyring (which was specific to GNOME and is deprecated), it > uses libsecret which can support other implementations of XDG Secret > Service API. > > Passes t0

Re: [PATCH] contrib: add credential helper for libsecret

2016-10-11 Thread Dennis Kaarsemaker
s always overwrites c->username, the original gnome-keyring version only does that when the username isn't set. Other than that it looks good to me. Reviewed-by: Dennis Kaarsemaker Tested-by: Dennis Kaarsemaker D.

Re: [PATCH] contrib: add credential helper for libsecret

2016-10-11 Thread Dennis Kaarsemaker
On Mon, 2016-10-10 at 16:46 -0400, Jeff King wrote: > On Mon, Oct 10, 2016 at 10:20:50PM +0200, Dennis Kaarsemaker wrote: > > > On Sun, 2016-10-09 at 15:34 +0300, Mantas Mikulėnas wrote: > > > This is based on the existing gnome-keyring helper, but instead of > > &g

Re: [PATCH] contrib: add credential helper for libsecret

2016-10-11 Thread Dennis Kaarsemaker
On Tue, 2016-10-11 at 22:48 +0300, Mantas Mikulėnas wrote: > On 2016-10-11 22:36, Junio C Hamano wrote: > > Thanks for a review. I'll wait until one of (1) a squashable patch > > to address the "we do not want unconditional overwrite" issue, (2) a > > reroll from Mantas to do the same, or (3) a co

Re: [PATCH] contrib: add credential helper for libsecret

2016-10-11 Thread Dennis Kaarsemaker
On Tue, 2016-10-11 at 13:13 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > On Tue, 2016-10-11 at 22:48 +0300, Mantas Mikulėnas wrote: > > > On 2016-10-11 22:36, Junio C Hamano wrote: > > > > Thanks for a review. I'll wait until one of (1)

[PATCH] worktree: allow the main brach of a bare repository to be checked out

2016-10-12 Thread Dennis Kaarsemaker
In bare repositories, get_worktrees() still returns the main repository, so git worktree list can show it. ignore it in find_shared_symref so we can still check out the main branch. Signed-off-by: Dennis Kaarsemaker --- t/t2025-worktree-add.sh | 8 worktree.c | 2 ++ 2

Re: [PATCH] worktree: allow the main brach of a bare repository to be checked out

2016-10-12 Thread Dennis Kaarsemaker
On Wed, 2016-10-12 at 11:37 -0700, Junio C Hamano wrote: > > ++test_expect_success '"add" default branch of a bare repo' ' > > Huh? Copy paste error. And I missed ok 17 - checkout from a bare repo without "add" ./t2025-worktree-add.sh: 141: ./t2025-worktree-add.sh: +test_expect_success: not fou

Re: [PATCH v12 3/8] graph: add support for --line-prefix on all graph-aware output

2016-10-19 Thread Dennis Kaarsemaker
On Wed, 2016-08-31 at 16:27 -0700, Jacob Keller wrote: > From: Jacob Keller > > Add an extension to git-diff and git-log (and any other graph-aware > displayable output) such that "--line-prefix=" will print the > additional line-prefix on every line of output. This patch breaks git rev-list --h

[PATCH] rev-list: restore the NUL commit separator in --header mode

2016-10-19 Thread Dennis Kaarsemaker
Commit 660e113 (graph: add support for --line-prefix on all graph-aware output) changed the way commits were shown. Unfortunately this dropped the NUL between commits in --header mode. Restore the NUL and add a test for this feature. Signed-off-by: Dennis Kaarsemaker --- builtin/rev-list.c

Re: [PATCH] rev-list: restore the NUL commit separator in --header mode

2016-10-20 Thread Dennis Kaarsemaker
On Wed, 2016-10-19 at 15:39 -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > Hi, > > > > On Wed, Oct 19, 2016 at 2:04 PM, Dennis Kaarsemaker > > wrote: > > > Commit 660e113 (graph: add support for --line-prefix on all graph-aware > >

Re: [PATCH] rev-list: restore the NUL commit separator in --header mode

2016-10-20 Thread Dennis Kaarsemaker
On Wed, 2016-10-19 at 15:41 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > + touch expect && > > + printf "\0" > expect && > > > What's the point of that "touch", especially if you are going to >

Re: [PATCH] rev-list: use hdr_termination instead of a always using a newline

2016-10-20 Thread Dennis Kaarsemaker
On Thu, 2016-10-20 at 11:19 -0700, Jacob Keller wrote: > Here's my solution, with an updated test using a helper function based > on using sed (which I think is more portable than tail -n1 ?). The > change actually is very simple. I ran the test suite and it appears to > be not breaking anyone else

Re: Drastic jump in the time required for the test suite

2016-10-20 Thread Dennis Kaarsemaker
On Thu, 2016-10-20 at 08:31 -0400, Jeff King wrote: > I'm also not entirely convinced that the test suite being a shell script > is the main culprit for its slowness. We run git a lot of times, and > that's inherent in testing it. I ran the whole test suite under > "strace -f -e execve". There are

Re: password forgot

2016-10-25 Thread Dennis Kaarsemaker
On Tue, 2016-10-25 at 12:52 -0300, Luciano Schillagi wrote: > Hi, > > I forgot my password in git, such as resetting? Hi Luciano, Git itself doesn't do any authentication, so I assume you lost the password for an account on a hosted git solution such as gitlab or github. You should contact the

Re: password forgot

2016-10-25 Thread Dennis Kaarsemaker
a little confused > > and this?  > > > > > 2016-10-25 13:16 GMT-03:00 Dennis Kaarsemaker : > > On Tue, 2016-10-25 at 12:52 -0300, Luciano Schillagi wrote: > > > Hi, > > > > > > I forgot my password in git, such as resetting? > > >

Re: [PATCH] push: do not use potentially ambiguous default refspec

2016-10-31 Thread Dennis Kaarsemaker
squashable that fails before your patch and succeeds after. >8 Subject: [PATCH] push: test pushing ambiguously named branches Signed-off-by: Dennis Kaarsemaker --- t/t5528-push-default.sh | 10 ++ 1 file changed, 10 insertions(+) diff --git a/t/t5528-push-default.sh b/t/t5528-p

Re: Forbid access to /gitweb but authorize the sub projets

2016-11-09 Thread Dennis Kaarsemaker
n gitweb.conf for example: sub no_index { die_error(403, "No access to the repository list"); } $actions{project_list} = \&no_index; $actions{project_index} = \&no_index; $actions{opml} = \&no_index; -- Dennis Kaarsemaker http://www.kaarsemaker.net

Re: [RFC] Add way to make Git credentials accessible from clean/smudge filter

2016-11-11 Thread Dennis Kaarsemaker
On Fri, 2016-11-11 at 10:40 +0100, Lars Schneider wrote: > On 11 Nov 2016, at 10:31, Jeff King wrote: > > > On Fri, Nov 11, 2016 at 10:28:56AM +0100, Lars Schneider wrote: > > > > > > Yeah, that is the solution I was going to suggest. The credentials are > > > > totally orthogonal to the filters

[PATCH 2/2] diff --no-index: support reading from pipes

2016-11-11 Thread Dennis Kaarsemaker
diff <(command1) <(command2) provides useful output, let's make it possible for git to do the same. Signed-off-by: Dennis Kaarsemaker --- diff-no-index.c | 8 diff.c | 13 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/diff-no-index.

[RFC/PATCH 0/2] git diff <(command1) <(command2)

2016-11-11 Thread Dennis Kaarsemaker
ex (and only the --no-index variant) and 2/2 adds support for reading from pipes. No tests or documentation updates yet, and I'm not sure whether --follow-symlinks in other modes than --no-index should be supported, ignored (as it is now) or cause an error, but I'm leaning towards

[PATCH 1/2] diff --no-index: add option to follow symlinks

2016-11-11 Thread Dennis Kaarsemaker
Git's diff machinery does not follow symlinks, which makes sense as git itself also does not, but stores the symlink destination. In --no-index mode however, it is useful for diff to be able to follow symlinks, matching the behaviour of ordinary diff. Signed-off-by: Dennis Kaarsemaker ---

Re: [RFC/PATCH 0/2] git diff <(command1) <(command2)

2016-11-11 Thread Dennis Kaarsemaker
On Fri, 2016-11-11 at 13:27 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > No tests or documentation updates yet, and I'm not sure whether > > --follow-symlinks in other modes than --no-index should be supported, > > ignored > > (as it is now)

Re: Feature request - show result of URL rewrites

2016-11-12 Thread Dennis Kaarsemaker
On Sat, 2016-11-12 at 18:49 +0100, Git User wrote: > Hello > > Hopefully this is the right place to submit feature requests - let me > know if there's somewhere else I should use! > > Git lets you rewrite URLs using "url..insteadOf" > > https://stackoverflow.com/a/11383587 > https://git-scm.com/

Re: [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-23 Thread Dennis Kaarsemaker
do just fine, and the GfW installer can also set such variables, like it does for the crlf config I believe. -- Dennis Kaarsemaker http://www.kaarsemaker.net

Re: git-daemon regression: 650c449250d7 common-main: call git_extract_argv0_path()

2016-11-26 Thread Dennis Kaarsemaker
Hi Mike, On Sat, 2016-11-26 at 15:03 +0100, Mike Galbraith wrote: > Greetings, > > git-daemon went broke on me post v2.9.3 due to binaries being installed > in /usr/lib/git, which is not in PATH. Reverting 650c449250d7 fixes it > up, as does ln -s /usr/lib/git/git-daemon /usr/bin/git-daemon 'cou

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-10 Thread Dennis Kaarsemaker
ling on a physical one. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- 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 http://vger.kernel.org/majordomo-info.html

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-10 Thread Dennis Kaarsemaker
, 60 22200 <... write resumed> ) = 15 22200 write(7, "", 4)   = -1 EPIPE (Broken pipe) 22200 --- SIGPIPE {si_signo=SIGPIPE, si_code=SI_USER, si_pid=22200, si_uid=1000} --- 22200 rt_sigaction(SIGPIPE, {SIG_DFL, [PIPE], SA_RESTORER|SA_RESTART, 0x7fcc463fd

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-10 Thread Dennis Kaarsemaker
On di, 2016-05-10 at 19:28 +0200, Dennis Kaarsemaker wrote: > On ma, 2016-05-09 at 15:32 -0700, Junio C Hamano wrote: > > > > Junio C Hamano writes: > > > > > > > > > > > David Turner writes: > > > > > > > >

Re: [PATCH v10 00/20] index-helper/watchman

2016-05-14 Thread Dennis Kaarsemaker
On do, 2016-05-12 at 16:19 -0400, David Turner wrote: > This version fixes that.  I didn't test on a virtual machine, but I > did test by adding a sleep(). I can confirm that on my single-cpu test VM, this no longer triggers errors. D. -- To unsubscribe from this list: send the line "unsubscribe

Re: [bug] assertion in 2.8.4 triggering on old-ish worktree

2016-06-16 Thread Dennis Kaarsemaker
On do, 2016-06-16 at 17:02 +1200, Chris Packham wrote: > On Thu, Jun 16, 2016 at 4:59 PM, Chris Packham om> wrote: > > > > Hi All, > > > > I have the git-sh-prompt configured in my .bashrc today I visited > > an > > old worktree that I haven't really touched in a few years (sorry > > can't > > r

[PATCH] make dist: allow using an installed version of git

2016-08-27 Thread Dennis Kaarsemaker
the tarball and avoid the overhead of building git-archive. Signed-off-by: Dennis Kaarsemaker --- Makefile | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d96ecb7..3dabb75 100644 --- a/Makefile +++ b/Makefile @@ -378,6 +378,9 @@ all:: # #

Re: [Ksummit-discuss] checkkpatch (in)sanity ?

2016-08-28 Thread Dennis Kaarsemaker
On zo, 2016-08-28 at 12:52 -0700, Joe Perches wrote: > On Sun, 2016-08-28 at 11:59 +0200, Julia Lawall wrote: > > > > On Sun, 28 Aug 2016, Alexey Dobriyan wrote: > [] > > > > > > > > The problem is that c-h.pl generates noise in the commit history > > > and > > > makes git-blame less useful than

Re: [PATCH 01/22] sequencer: use static initializers for replay_opts

2016-08-29 Thread Dennis Kaarsemaker
On ma, 2016-08-29 at 10:03 +0200, Johannes Schindelin wrote: > +#define REPLAY_OPTS_INIT { -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, > NULL, 0, 0, NULL } This looked off to me, as it replaces memset(..., 0, ...) so is not 100% equivalent. But the changed functions both set opts.action an

Re: [PATCH 04/22] sequencer: future-proof remove_sequencer_state()

2016-08-29 Thread Dennis Kaarsemaker
On ma, 2016-08-29 at 10:04 +0200, Johannes Schindelin wrote: > +   if (read_and_refresh_cache(opts)) > +   return -1; > + This doesn't seem to be related to the get_dir changes? D.

Re: [PATCH 12/22] sequencer: refactor the code to obtain a short commit name

2016-08-29 Thread Dennis Kaarsemaker
On ma, 2016-08-29 at 10:05 +0200, Johannes Schindelin wrote: I fail to see the point of this patch, would you mind enlightening me? D.

Re: [PATCH 15/22] sequencer: introduce a helper to read files written by scripts

2016-08-29 Thread Dennis Kaarsemaker
On ma, 2016-08-29 at 10:06 +0200, Johannes Schindelin wrote: > +   if (strbuf_read_file(buf, path, 0) < 0) { > +   warning_errno("could not read '%s'", path); > +   return 0; > +   } > + > +   if (buf->len > orig_len && buf->buf[buf->len - 1] == '\n') { > +  

Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

2016-08-29 Thread Dennis Kaarsemaker
On ma, 2016-08-29 at 10:06 +0200, Johannes Schindelin wrote: > The return value of do_recursive_merge() may be positive (indicating merge > conflicts), se let's OR later error conditions so as not to overwrite them > with 0. s/se/so/? D.

Re: [PATCH 00/22] Prepare the sequencer for the upcoming rebase -i patches

2016-08-29 Thread Dennis Kaarsemaker
On ma, 2016-08-29 at 10:03 +0200, Johannes Schindelin wrote: > Therefore I would be most grateful for every in-depth review. Tried to do that, but could come up only with a few nits. I think the approach is sensible. D.

Re: Reducing CPU load on git server

2016-08-29 Thread Dennis Kaarsemaker
On ma, 2016-08-29 at 13:57 -0700, W. David Jarvis wrote: > >  * If you do need branches consider archiving stale tags/branches > > after some time. I implemented this where I work, we just have a > > $REPO-archive.git with every tag/branch ever created for a given > > $REPO.git, and delete refs af

Re: git blame [was: Reducing CPU load on git server]

2016-08-31 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 01:42 -0400, Jeff King wrote: > On Tue, Aug 30, 2016 at 12:46:20PM +0200, Jakub Narębski wrote: > > > I wonder if having support for 'git blame ' in Git core would > > be something interesting to Git users.  I once tried to implement it, > > but it went nowhere.  Would it be h

Re: bug: 'core.logallrefupdates' is not set by default in non-bare repository

2016-08-31 Thread Dennis Kaarsemaker
That is indeed a bug. git reads the config of t1 and then thinks a template config has set that value, so it won't override it. This is caused by git init reading the config via get_shared_repository. The comment above it indicates that this may not be needed, and indeed not doing it makes this bu

Re: bug: 'core.logallrefupdates' is not set by default in non-bare repository

2016-08-31 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 06:48 -0400, Jeff King wrote: > On Wed, Aug 31, 2016 at 11:12:26AM +0200, Dennis Kaarsemaker wrote: > > > > > That is indeed a bug. git reads the config of t1 and then thinks a > > template config has set that value, so it won't override it. >

Re: [PATCH 05/34] sequencer (rebase -i): learn about the 'verbose' mode

2016-08-31 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > +   if (file_exists(rebase_path_verbose())) > +   opts->verbose = 1; I don't see anything in this series that creates this file, will that be part of a later series? D.

Re: [PATCH 15/34] sequencer (rebase -i): leave a patch upon error

2016-08-31 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 10:55 +0200, Johannes Schindelin wrote: > Just like the interactive rebase, we want to leave a 'patch' file for > further inspection by the user (even if we never tried to actually apply > that patch, since we're cherry-picking instead). > > Signed-off-by: Johannes Schindelin

Re: [PATCH 00/34] Teach the sequencer to act as rebase -i's backend

2016-08-31 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 10:53 +0200, Johannes Schindelin wrote: > This marks the count down to '3': two more patch series after this > (really tiny ones) and we have a faster rebase -i. I got to 16/34 (and skipped 07/34), will continue tomorrow. I hope the comments are useful. D.

Re: [PATCH 06/34] sequencer (rebase -i): write the 'done' file

2016-08-31 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > In the interactive rebase, commands that were successfully processed are > not simply discarded, but appended to the 'done' file instead. This is > used e.g. to display the current state to the user in the output of > `git status` or th

Re: [PATCH 20/34] sequencer (rebase -i): copy commit notes at end

2016-09-01 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 10:55 +0200, Johannes Schindelin wrote: > +   if (!stat(rebase_path_rewritten_list(), &st) && > +   st.st_size > 0) { > +   struct child_process child = CHILD_PROCESS_INIT; > + > +   child.in = open

Re: [PATCH 32/34] sequencer (rebase -i): show the progress

2016-09-01 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 10:56 +0200, Johannes Schindelin wrote: > The interactive rebase keeps the user informed about its progress. > If the sequencer wants to do the grunt work of the interactive > rebase, it also needs to show that progress. > > Signed-off-by: Johannes Schindelin > --- >  sequenc

Re: [PATCH 27/34] sequencer (rebase -i): differentiate between comments and 'noop'

2016-09-01 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 10:56 +0200, Johannes Schindelin wrote: > diff --git a/sequencer.c b/sequencer.c > index 51c2f76..4c902e5 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -763,7 +763,8 @@ enum todo_command { > TODO_SQUASH, > TODO_EXEC, > TODO_NOOP, > -   TODO_DRO

Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

2016-09-01 Thread Dennis Kaarsemaker
On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > +static int is_fixup(enum todo_command command) > +{ > + return command == TODO_FIXUP || command == TODO_SQUASH; > +} It sounds wrong to have a function named is_fixup return true when the command isn't a fixup but a squash. Maybe

Re: [PATCH 27/34] sequencer (rebase -i): differentiate between comments and 'noop'

2016-09-01 Thread Dennis Kaarsemaker
On do, 2016-09-01 at 17:32 +0200, Johannes Schindelin wrote: > Hi Dennis, > > On Thu, 1 Sep 2016, Dennis Kaarsemaker wrote: > > > > > On wo, 2016-08-31 at 10:56 +0200, Johannes Schindelin wrote: > > > > > > diff --git a/sequencer.c b/sequencer.c >

Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

2016-09-01 Thread Dennis Kaarsemaker
On do, 2016-09-01 at 17:17 +0200, Johannes Schindelin wrote: > Hi Dennis, > > On Thu, 1 Sep 2016, Dennis Kaarsemaker wrote: > > > > > On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > > > > > > > > +static int is_fixup(enum todo_

Re: `make profile-install` fails in 2.9.3

2016-09-01 Thread Dennis Kaarsemaker
On do, 2016-09-01 at 18:08 +0200, Jan Keromnes wrote: > However, this fails (and has failed in previous versions), because it > runs the whole test-suite to get the profile, but bails out if there > were test failures (which happens often). Working around failing tests is fixing a symptom, not th

Re: [PATCH] make dist: allow using an installed version of git

2016-09-01 Thread Dennis Kaarsemaker
On do, 2016-09-01 at 10:43 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > b1de9de2 back in 2005 ensured that we could create a tarball with 'make > > dist' even if git wasn't installed yet. These days however, chances are > > higher

Re: bug: 'core.logallrefupdates' is not set by default in non-bare repository

2016-09-02 Thread Dennis Kaarsemaker
On vr, 2016-09-02 at 04:04 -0400, Jeff King wrote: > On Wed, Aug 31, 2016 at 05:32:33PM +0200, Dennis Kaarsemaker wrote: > > > > > > > > > We may need to do something like turn off the > > > need_shared_repository_from_config in init-db, since I think it

Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

2016-09-02 Thread Dennis Kaarsemaker
On vr, 2016-09-02 at 09:13 +0200, Johannes Schindelin wrote: > As Git for Windows does not ship with translations (for multiple > reasons), it would not be a regression. I'm confused, how does "git for windows does not ship with translations" translate to "this is not a regression"? Is this patch

Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

2016-09-02 Thread Dennis Kaarsemaker
On vr, 2016-09-02 at 16:22 +0200, Johannes Schindelin wrote: > I hope this clarifies why I am not so concerned about some issues > such as translation, or commit messages, or grammar, and more so > about others, such as incorrect code. It does, thanks! D.

Re: [PATCH 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper

2016-09-02 Thread Dennis Kaarsemaker
On vr, 2016-09-02 at 18:23 +0200, Johannes Schindelin wrote: > This is crucial to improve performance on Windows, as the speed is now > mostly dominated by the SHA-1 transformation (because it spawns a new > rev-parse process for *every* line, and spawning processes is pretty > slow from Git for Wi

Re: [PATCH 6/9] rebase -i: check for missing commits in the rebase--helper

2016-09-02 Thread Dennis Kaarsemaker
On vr, 2016-09-02 at 18:23 +0200, Johannes Schindelin wrote: > In particular on Windows, where shell scripts are even more expensive > than on MacOSX or Linux, it makes sense to move a loop that forks > Git at least once for every line in the todo list into a builtin. Heh, this was the one thing t

Re: [PATCH v2] rebase -i: improve advice on bad instruction lines

2016-09-07 Thread Dennis Kaarsemaker
Hi Ralf, There are quite a few patch series in flight these days around interactive rebase. Have you checked for conflicts with those? On di, 2016-09-06 at 20:59 +0200, Ralf Thielow wrote: > If we found bad instruction lines in the instruction sheet > of interactive rebase, we give the user advic

Re: [PATCH 0/16] fix config-reading in non-repos

2016-09-14 Thread Dennis Kaarsemaker
ead .git/config from configured repos >   [15/16]: init: expand comments explaining config trickery >   [16/16]: init: reset cached config when entering new repo Couldn't find anything to comment on, and I've tested that this does indeed fix the symptoms we saw. Reviewed-by: Dennis Kaarsemaker -- Dennis Kaarsemaker http://www.kaarsemaker.net

Re: Git Ignore Exception bug

2016-09-14 Thread Dennis Kaarsemaker
it status On branch master Untracked files:   (use "git add ..." to include in what will be committed) foo/ nothing added to commit but untracked files present (use "git add" to track) -- Dennis Kaarsemaker http://www.kaarsemaker.net

Re: Bug

2016-09-14 Thread Dennis Kaarsemaker
On Tue, 2016-09-13 at 13:18 -0400, Mike Hawes wrote: > To whom this may concern, > > I found a bug in git while trying to push my website. > I redid the process and it happened again. > I also tried it on another computer and it happened again. > I was wondering how to claim a bug? Hi Mike, When

Re: Repeatable Extraction

2016-09-27 Thread Dennis Kaarsemaker
s://gitter.im/git-for-windows/git -- these may be of more assistance in this case. -- Dennis Kaarsemaker http://www.kaarsemaker.net

[PATCH 1/3] connect.[ch]: make parse_feature_value non-static

2016-01-30 Thread Dennis Kaarsemaker
We'll need it in the next patch. Signed-off-by: Dennis Kaarsemaker --- connect.c | 3 +-- connect.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/connect.c b/connect.c index fd7ffe1..9e64b0b 100644 --- a/connect.c +++ b/connect.c @@ -12,7 +12,6 @@ #include "t

[PATCH 0/3] Propagating push options to remote hooks

2016-01-30 Thread Dennis Kaarsemaker
--quiet and --force. I've been thinking of allowing the user of push to specify arbitrary values, but don't see the value of that yet. It would be easy to add though. Dennis Kaarsemaker (3): connect.[ch]: make parse_feature_value non-static receive-pack: add a capability for hook

[PATCH 3/3] send-pack: propagate --force and --quiet to remote hooks

2016-01-30 Thread Dennis Kaarsemaker
When a server supports hook options, we send it options for quiet and force if the user used push --force/--quiet. Signed-off-by: Dennis Kaarsemaker --- send-pack.c | 10 ++ t/t5544-push-hook-options.sh | 37 + 2 files changed, 47

[PATCH 2/3] receive-pack: add a capability for hook options

2016-01-30 Thread Dennis Kaarsemaker
or ignore. The default hooks do not respect these options. Signed-off-by: Dennis Kaarsemaker --- Documentation/technical/protocol-capabilities.txt | 9 + builtin/receive-pack.c| 19 +-- 2 files changed, 26 insertions(+), 2 deletions(-) diff

git log -g bizarre behaviour

2016-01-31 Thread Dennis Kaarsemaker
trying to display a reflog of a ref that has no reflog. Objections? -- Dennis Kaarsemaker www.kaarsemaker.net -- 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 http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 1/6] worktree: new repo extension to manage worktree behaviors

2016-02-01 Thread Dennis Kaarsemaker
the better as we find out more of the edge cases. One thing that may benefit especially the former is a 'git worktree rm' which removes the worktree (iff there are no local changes) and prunes it, but nothing in the current implementation or proposed changes will stop the addition of t

Re: git log -g bizarre behaviour

2016-02-02 Thread Dennis Kaarsemaker
On ma, 2016-02-01 at 15:37 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > I'm attempting to understand the log [-g] / reflog code enough to > > untangle them and make reflog walking work for more than just > > commit > > objects [see gmane

Re: git log -g bizarre behaviour

2016-02-02 Thread Dennis Kaarsemaker
On di, 2016-02-02 at 11:32 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > On ma, 2016-02-01 at 15:37 -0800, Junio C Hamano wrote: > > > > > Do you mean > > > > > > $ git checkout -b testing > > > $ rm -f .git/logs

[PATCH] log -g: ignore revision parameters that have no reflog

2016-02-02 Thread Dennis Kaarsemaker
at-is-not-a ref makes no sense, so let's die when the user is trying that. git log -g ref-that-has-no-reflog is perfectly sensible, so we just ignore it. Signed-off-by: Dennis Kaarsemaker --- revision.c | 12 t/t1411-reflog-show.sh | 10 ++ 2 files c

Re: [PATCH] log -g: ignore revision parameters that have no reflog

2016-02-03 Thread Dennis Kaarsemaker
On di, 2016-02-02 at 16:21 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > + if (revs->reflog_info) { > > + /* > > +  * The reflog iterator gets confused when fed > > things that don't > > +

Re: whither merge-tree?

2016-02-23 Thread Dennis Kaarsemaker
hat. > > So that's a "please don't" leave the code as-is but provide a  > (transitional) solution that fixes the reported bug and has the best  > chances of not causing any more headaches :) I am also actively using it. It's the only way (I know of) of trying to preview

  1   2   3   >