[PATCH] credential-libsecret: unlock locked secrets

Credentials exposed by the secret service DBUS interface may be locked. Setting the SECRET_SEARCH_UNLOCK flag will make the secret service unlock these secrets, possibly prompting the user for credentials to do so. Without this flag, the secret is simply not loaded. Signed-off-by: Dennis

Re: git, isolation

On Fri, 2017-11-03 at 17:33 +0100, Péter wrote: > Hi, > > If I do a "git commit", issue git operations, and at the end, issue a "rm > ", is there any guarantee that my > filesystem will be "clean", No. > i.e. not polluted or otherwise modified by some git command? Are the git > operations

Re: Git libsecret No Unlock Dialog Issue

On Thu, 2017-11-02 at 11:35 -0700, Stefan Beller wrote: > On Thu, Nov 2, 2017 at 9:00 AM, Yaroslav Sapozhnyk > wrote: > > When using Git on Fedora with locked password store > > credential-libsecret asks for username/password instead of displaying > > the unlock

Re: Multiple paths in GIT_EXEC_PATH

On Tue, 2017-10-17 at 18:21 +0300, Nikolay Yakimov wrote: > For why I need that is another matter. Long story short, I need git to > look for '.gitignore' in a particular non-standard location, since I > have multiple git repositories in the same workdir (that workdir being > $HOME and git

Re: Git diff --no-index and file descriptor inputs

; > > I was hoping to leverage --word-diff-regex, but the > > > > --no-index option > > > does not seem to work with <(...) notation. > > > > > > I am I doing something wrong or is this a bug? > > > > There were some patches floating around

Re: git send-email does not work with Google anymore?!

On Thu, 2017-10-05 at 12:52 +0200, Lars Schneider wrote: > Hi, > > I used to use the Google SMTP server to send my patches to the list with > the following config: >8 --- > Apparently that stopped working today. I get this error: > > (mbox) Adding cc: Lars Schneider

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

On Thu, 2017-06-01 at 07:50 +0900, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > Second ping. This problem is not going away, so if this solution is not > > acceptable, I'd like to know what needs to be improved. > > Perha

Re: persistent-https, url insteadof, and `git submodule`

On Fri, 2017-05-19 at 23:43 +0200, Dennis Kaarsemaker wrote: > On Fri, 2017-05-19 at 14:57 -0500, Elliott Cable wrote: > > Set up `persistent-https` as described in the [README][]; including the > > ‘rewrite https urls’ feature in `.gitconfig`: > > > >

Re: persistent-https, url insteadof, and `git submodule`

On Fri, 2017-05-19 at 14:57 -0500, Elliott Cable wrote: > Set up `persistent-https` as described in the [README][]; including the > ‘rewrite https urls’ feature in `.gitconfig`: > > [url "persistent-https"] > insteadof = https > [url "persistent-http"] > insteadof = http >

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

Second ping. This problem is not going away, so if this solution is not acceptable, I'd like to know what needs to be improved. On Thu, 2017-05-04 at 09:01 +0200, Dennis Kaarsemaker wrote: > Ping. It's a little over a month since I sent this, but I haven't seen > any comments. Is this commi

Re: Bug report: Git Stash; spelling mistake of stash followed by a yes prints character 'y' infinite times.

On Wed, 2017-05-03 at 14:51 +0530, Rashmi Pai wrote: > I am a corporate user of git. I noticed that when you switch between > the branches and do a git stash ( I miss spelled it as git stahs). Git > asked if i meant git stash. and i entered yes. and git printed the > character y infinite times.

Re: Script to rebase branches

On Sat, 2017-05-06 at 12:23 +0200, Lars Schneider wrote: > Hi, > > I am about to write a bash/sh script that helps me to rebase a bunch of > branches (e.g. select branches based on prefix, conflict resolution/ > rerere support, ...). > > I wonder if anyone has such a script already and is

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

Ping. It's a little over a month since I sent this, but I haven't seen any comments. Is this commit good to go? On Fri, 2017-03-24 at 22:37 +0100, Dennis Kaarsemaker wrote: > Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine > since version 1.28, and Net::SMTP::SSL

Re: ttk error when starting git gui

On Thu, 2017-03-30 at 15:54 -0400, Peter van der Does wrote: > It looks like the git gui needs TCL/TK 8.6.0 or higher. Since that > version the command 'ttk::style theme use' has been changed, which > allows the command to be run without an argument and then returning the > current theme used. >

Re: [PATCH v4 1/2] diff --no-index: optionally follow symlinks

On Fri, 2017-03-24 at 15:56 -0700, Junio C Hamano wrote: > diff --git a/diff.c b/diff.c > > index be11e4ef2b..2afecfb939 100644 > > --- a/diff.c > > +++ b/diff.c > > @@ -2815,7 +2815,7 @@ int diff_populate_filespec(struct diff_filespec *s, > > unsigned int flags) > > s->size =

[PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

as such. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- git-send-email.perl | 54 ++--- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index eea0a517f7..0d90439d9a

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

error. A test has been added for this behaviour. Dennis Kaarsemaker (2): diff --no-index: optionally follow symlinks diff --no-index: support reading from pipes Documentation/diff-options.txt | 9 +++ builtin/diff.c | 2 ++ diff-no-index.c

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

) option has been added to enable this behaviour. --no-dereference can be used to disable it again. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- Documentation/diff-options.txt | 9 + builtin/diff.c | 2 ++ diff-no-index.c| 7 ---

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

diff <(command1) <(command2) provides useful output, let's make it possible for git to do the same. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- diff-no-index.c | 9 + diff.c | 18 -- t/t4053-diff-no-i

Re: blame --line-porcelain is providing me with funny output

s this mapping, where git cat-file does not. -- Dennis Kaarsemaker http://www.kaarsemaker.net

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

On Sun, 2017-03-19 at 15:08 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > Normal diff provides arguably better output: the diff of the output of the > > commands. This series makes it possible for git diff --no-index to follow &g

Re: [PATCH v3 1/2] diff --no-index: optionally follow symlinks

On Sun, 2017-03-19 at 15:14 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > diff --git a/diff.c b/diff.c > > index be11e4ef2b..2afecfb939 100644 > > --- a/diff.c > > +++ b/diff.c > > @@ -2815,7 +2815,7 @@ int diff

Re: [PATCH] send-email: Net::SMTP::SSL is obsolete, use only when necessary

On Sat, 2017-03-18 at 23:47 +0100, Ævar Arnfjörð Bjarmason wrote: > On Sat, Mar 18, 2017 at 11:23 PM, Dennis Kaarsemaker > <den...@kaarsemaker.net> wrote: > > > + require Net::SMTP; > > + my $use_net_smtp_ssl = $

Re: How do I make 'git diff --no-index' follow symlinks?

On Sat, 2017-03-18 at 12:30 -0700, Junio C Hamano wrote: > Sounds like > > https://public-inbox.org/git/2016201958.2175-1-den...@kaarsemaker.net/ > > to me. A key message in the thread may be: > > > https://public-inbox.org/git/alpine.DEB.2.20.1611121106110.3746@virtualbox/ Sorry

[PATCH] send-email: Net::SMTP::SSL is obsolete, use only when necessary

Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine since version 1.28, and Net::SMTP::SSL is now deprecated. Since 1.28 isn't that old yet, keep the old code in place and use it when necessary. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- Note: I've onl

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

) option has been added to enable this behaviour. --no-dereference can be used to disable it again. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- Documentation/diff-options.txt | 9 + diff-no-index.c| 7 --- diff.c

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

files to override behaviour for pipes. - Turn the !S_ISREG(...) check into a should_mmap_file_contents helper. Dennis Kaarsemaker (2): diff --no-index: optionally follow symlinks diff --no-index: support reading from pipes Documentation/diff-options.txt | 9 +++ diff-no-i

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

diff <(command1) <(command2) provides useful output, let's make it possible for git to do the same. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- diff-no-index.c | 9 + diff.c | 18 -- t/t4053-diff-no-i

Re: [PATCH 4/4] ident: do not ignore empty config name/email

that's a prerequisite. I provide daily[*] snapshots of git's master and next tree as packages for Ubuntu, Debian, Fedora and CentOS on launchpad and SuSE's openbuildservice. If there's sufficient interest in this (I know of only a few users), I can try to put more effort into this. -- Dennis Kaarsemaker http://www.kaarsemaker.net [*]When the tooling isn't broken for some reason.

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

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

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

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 1/2] diff --no-index: follow symlinks

has been added to disable this behaviour. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- Documentation/diff-options.txt | 7 +++ diff-no-index.c| 7 --- diff.c | 10 -- diff.h | 2 +- t/t405

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

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 >

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

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-daemon regression: 650c449250d7 common-main: call git_extract_argv0_path()

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

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

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: Feature request - show result of URL rewrites

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 >

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

On Fri, 2016-11-11 at 13:27 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > No tests or documentation updates yet, and I'm not sure whether > > --follow-symlinks in other modes than --no-index should be supported, > > ignor

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

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 <

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

d 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 the third option.

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

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

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

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

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

onf for example: sub no_index { die_error(403, "No access to the repository list"); } $actions{project_list} = \_index; $actions{project_index} = \_index; $actions{opml} = \_index; -- Dennis Kaarsemaker http://www.kaarsemaker.net

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

shable that fails before your patch and succeeds after. >8 Subject: [PATCH] push: test pushing ambiguously named branches Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- t/t5528-push-default.sh | 10 ++ 1 file changed, 10 insertions(+) diff --git a/t/t5528-push

Re: password forgot

sed > > and this?  > > > > > 2016-10-25 13:16 GMT-03:00 Dennis Kaarsemaker <den...@kaarsemaker.net>: > > On Tue, 2016-10-25 at 12:52 -0300, Luciano Schillagi wrote: > > > Hi, > > > > > > I forgot my password in git, such as res

Re: password forgot

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: Drastic jump in the time required for the test suite

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

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

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

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

On Wed, 2016-10-19 at 15:41 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > + touch expect && > > + printf "\0" > expect && > > > What's the point of that "touch", especially i

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

On Wed, 2016-10-19 at 15:39 -0700, Junio C Hamano wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > > > Hi, > > > > On Wed, Oct 19, 2016 at 2:04 PM, Dennis Kaarsemaker > > <den...@kaarsemaker.net> wrote: > > > Commit 660e113 (grap

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

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 <den...@kaarsemaker.

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

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] worktree: allow the main brach of a bare repository to be checked out

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 <den...@kaarsemaker.net> --- t/t2025-worktree-add.sh | 8 work

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

On Tue, 2016-10-11 at 13:13 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> 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.

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

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

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

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 > >

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

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 <den...@kaarsemaker.net> Tested-by: Dennis Kaarsemaker <den...@kaarsemaker.net> D.

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

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

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

[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

Re: Problem with submodules

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

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

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. > >

Re: Repeatable Extraction

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

Re: Bug

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: Git Ignore Exception bug

atus 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: [PATCH 0/16] fix config-reading in non-repos

d 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 <den...@kaarsemaker.net> -- Dennis Kaarsemaker http://www.kaarsemaker.net

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

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

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

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

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

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

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

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 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

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

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

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] make dist: allow using an installed version of git

On do, 2016-09-01 at 10:43 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> 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 >

Re: `make profile-install` fails in 2.9.3

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

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

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: [PATCH 27/34] sequencer (rebase -i): differentiate between comments and 'noop'

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/seque

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

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, > -   

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

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

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

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.

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

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

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

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

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

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

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 05/34] sequencer (rebase -i): learn about the 'verbose' mode

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: bug: 'core.logallrefupdates' is not set by default in non-bare repository

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. > Thi

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

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

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

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

Re: Reducing CPU load on git server

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

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

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: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

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 15/22] sequencer: introduce a helper to read files written by scripts

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 12/22] sequencer: refactor the code to obtain a short commit name

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 04/22] sequencer: future-proof remove_sequencer_state()

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 01/22] sequencer: use static initializers for replay_opts

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

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

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

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

and avoid the overhead of building git-archive. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- 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

Re: Https password present in git output

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: Dependencies required for offline installation

e 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, Dennis

Re: [PATCH v2] Refactor recv_sideband()

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

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

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

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

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

  1   2   3   >