[PATCH 2/3] t/lib-git-svn: check same httpd module dirs as lib-httpd

Currently, lib-git-svn checks a proper subset of the paths that lib-httpd checks for apache modules. Make it check the same set so that apache is run by one when it is run by the other (provide ports have been set). Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Notes: Again

Re: RFC: Renaming git rebase --onto

Junio C Hamano venit, vidit, dixit 30.03.2015 23:12: Jonathon Mah m...@jonathonmah.com writes: During a few years of discussing git operations with colleagues, I’ve found the “git rebase --onto” operation particularly ambiguous. The reason is that I always describe a rebase operation as

Re: [PATCH] l10n: de.po: translate index as Index

phillip venit, vidit, dixit 01.06.2015 17:10: Hi, #: sequencer.c:661 #, c-format msgid git %s: failed to read the index -msgstr git %s: Fehler beim Lesen der Staging-Area +msgstr git %s: Fehler beim Lesen des Indexes Now we have to decide whether we flex Index like a foreign

Re: [PATCH] l10n: de.po: translate index as Index

Christian Stimming venit, vidit, dixit 01.06.2015 22:00: Am Montag, 1. Juni 2015, 12:34:31 schrieb Stefan Beller: On Mon, Jun 1, 2015 at 12:26 PM, Christian Stimming stimm...@tuhh.de wrote: index concept, my explanation routinely says This concept is called 'index' but it has nothing to do

Re: [PATCH] receive-pack: Create a HEAD ref for ref namespace

Johannes Löthberg venit, vidit, dixit 05.06.2015 13:53: Ping. -- Sincerely, Johannes Löthberg (Sent from my phone.) It appears your patch proposes to fix a problem. It's a good idea to expose the problem by writing a test so that one can check that the fix actually fixes the problem.

gitscm vs. git-scm

Hi there, I (mis-) remembered the git site address and noticed that gitscm.com returns empty while git-scm.com is our beloved home. I thought, though, that we have a couple domains with redirects but I may be misremembering that also. Or DNS is hicking up. Cheers, Michael -- To unsubscribe from

Re: gitscm vs. git-scm

Matthieu Moy venit, vidit, dixit 09.06.2015 15:08: Michael J Gruber g...@drmicha.warpmail.net writes: Hi there, I (mis-) remembered the git site address and noticed that gitscm.com returns empty while git-scm.com is our beloved home. I thought, though, that we have a couple domains

Re: Using clean/smudge filters with difftool

Florian Aspart venit, vidit, dixit 16.06.2015 16:11: Hi everyone, I created a clean filter to apply on some files before commiting them. The filter works correctly when I commit the file and is also applied when I usethe iff command line tool. However, when using difftool with meld, the

Re: Visualizing merge conflicts after the fact (using kdiff3)

Johannes Schindelin venit, vidit, dixit 16.06.2015 11:43: Hi Eric, On 2015-06-16 03:17, Eric Raible wrote: I'm running 1.9.5.msysgit.1, but this is a general git question... Upon returning from a vacation, I was looking at what people had been up to, and discovered on merge in which a

Re: Using clean/smudge filters with difftool

Junio C Hamano venit, vidit, dixit 19.06.2015 19:03: Michael J Gruber g...@drmicha.warpmail.net writes: Now, since external diff runs on smudged blobs, it appears as if we mixed cleaned and smudged blobs when feeding external diffs; whereas really, we mix worktree blobs and smudged repo

Re: Visualizing merge conflicts after the fact (using kdiff3)

Junio C Hamano venit, vidit, dixit 18.06.2015 17:57: Michael J Gruber g...@drmicha.warpmail.net writes: This type of request comes up often (for a reason). I'm wondering whether we could support it more systematically, either by exposing the steps above as a command, or by storing

[PATCH] mergetool-lib: fix default tool selection

IFS for difftool and mergetool, 2015-05-20) introduced a newline as IFS which breaks the parsing of the space separated list into items, resulting in a failed search for an available tool. Set IFS to a space locally for the tool search. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net

Re: Using clean/smudge filters with difftool

Junio C Hamano venit, vidit, dixit 19.06.2015 00:55: John Keeping j...@keeping.me.uk writes: I think the summary is that there are some scenarios where the external diff tool should see the smudged version and others where the clean version is more appropriate and Git should support both

Re: [PATCH 0/3] Raw gpg output support for verify-commit and verify-tag

Junio C Hamano venit, vidit, dixit 14.06.2015 23:23: brian m. carlson sand...@crustytoothpaste.net writes: Currently, verify-commit and verify-tag produce human-readable output. This is great for humans, and awful for machines. It also lacks a lot of the information that GnuPG's --status-fd

Re: [PATCH] git-new-workdir: add windows compatibility

Johannes Schindelin venit, vidit, dixit 26.05.2015 14:35: Hi Paul, On 2015-05-26 14:20, Paul Smith wrote: On Tue, 2015-05-26 at 11:53 +0200, Johannes Schindelin wrote: The biggest problem with `mklink` is that it is only supported on Windows Vista and later, while I really like to keep

Re: Staging commits with visual diff tools?

John Lee venit, vidit, dixit 27.05.2015 09:34: On Wed, 27 May 2015, Jeff King wrote: If you are interested in looking further, see how the %patch_mode hash is defined in git-add--interactive.perl. Specifically, note that add -p is just one case: diff against the index and apply with apply

[RFC/PATCH 2/2] messages: uniform error messages for index write

temporary in place and add TRANSLATORS note. It may happen that the index file is writable but not the temporary one. * Leave pack-write.c alone. It is low level without l10n. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- I am actually a bit torn on the temporary index

[PATCH 1/2] show-index: uniform error messages for index read

for the rerere messages: They appear on a higher level (index file access + parsing) and are worded similarly to other rerere messages. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/commit.c | 2 +- show-index.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git

Re: Config variables and scripting // was Re: [RFC/PATCH] log: add log.firstparent option

Jacob Keller venit, vidit, dixit 23.07.2015 08:55: On Wed, Jul 22, 2015 at 11:53 PM, Jeff King p...@peff.net wrote: man git already has such a list (which is generated from the annotations in command-list.txt). But I agree that it would probably be helpful to point people directly from git log

Re: Feature Request: Passing a number as an option to git tags for displaying latest tags

Junio C Hamano venit, vidit, dixit 22.07.2015 21:20: Junio C Hamano gits...@pobox.com writes: The former, sort by time, is interesting, but you need to define what to do with various corner cases. For example, some people may have one or more of the following desires: * My project did

Re: A few linked checkout niggles

Two more observations: $ git worktree add /tmp/gitwt Enter /tmp/gitwt (identifier gitwt) Switched to a new branch 'gitwt' Now I'm in /tmp/gitwt at branch gitwt. Right? No. I'm in the original wd at the original branch. So either we cd to the new location or quelch these messages or add a

Re: [PATCH 00/16] worktree: use git reset --hard to populate worktree

Junio C Hamano venit, vidit, dixit 13.07.2015 20:36: Eric Sunshine sunsh...@sunshineco.com writes: This is a follow-on series to [1], which migrated git checkout --to functionality to git worktree add. That series continued using git checkout for the initial population of the new worktree,

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

Michael Rappazzo venit, vidit, dixit 11.11.2015 03:11: > This patch series is built on (based on) 'next' because it relies on > worktree.c > > `ff-refs` will update local branches which can be fast-forwarded to their > upstream tracking branch. Any branch which has diverged from the upstream >

[RFD/WIP PATCH] rev-list: list all heads with --all

d the HEADs from all worktrees. This results in a non-worktree-specific ref list amd solves the pruning problem. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- This patch solves the pruning problem with worktrees, but I feel quite uneasy about substituting the ref solving at

--color-diff='.' considered useful

git tip of the day: git diff --color-words='.' git show --color-words='.' That will help you find that 1 character change that a failed default word split hides from your eyes. I guess everyone here will know already, but I found that super useful and much easier than trying to get a

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

Mike Rappazzo venit, vidit, dixit 17.11.2015 14:58: > (This message is off list) [cut the message part, though no big secrets there] Hi Mike, I don't think there's a point in discussing this off-list. Your intentions are clearer now, yes, or else I would have asked more. I still don't like the

Re: git filter-branch and merging of signed tags

Uwe Kleine-König venit, vidit, dixit 02.11.2015 09:04: > Hello, > > Consider I want to rewrite a commit that is a merge of a signed tag. In > my case that's 064ca93f7ab927c2752d86fc5727716e340d737c that currently > sits in linux-next: > > ~/gsrc/linux$ git version > git version 2.6.1

Re: git log --author=me

Duy Nguyen venit, vidit, dixit 02.11.2015 19:37: > On Mon, Nov 2, 2015 at 2:27 PM, Harry Jeffery wrote: >> Hi, >> >> I've written a patch that allows `me` to be used as shorthand for >> $(user.name) or $(user.email) in the `--author` and `--commiter` fields. >> >> The purpose

Re: Branch information (git branch/status) inconsistent when in detached HEAD state

Stijn De Ruyck venit, vidit, dixit 06.10.2015 15:03: > Hello, > > Consider a repository with a develop branch tracking origin/develop and where > HEAD = 545a36f = develop = origin/develop. > Tested with Git 2.4.3 and 1.8.3.4 on Linux. > > 1) git checkout develop > 2) git branch | head -1 (or

Re: [BUG] GIT_INDEX environment variable ignored?

McAuley, Ben venit, vidit, dixit 08.10.2015 06:48: > Hello, > > I was trying to use multiple indexes earlier, and ran into an issue which > I've summarised into a test case: > > $ git init > $ touch file1 && git add file1 && git commit -m "file1" > $ git branch release > $ touch file2 && git

Re: [PATCH] filter-branch: strip pgp signature in commit messages

James McCoy venit, vidit, dixit 08.10.2015 07:01: > df062010 (filter-branch: avoid passing commit message through sed) > introduced a regression when filtering gpg signed commits. The gpgsig > header is multi-line and contains an empty line. Although the signature > is indented, making the line

Re: [PATCH] filter-branch: strip pgp signature in commit messages

Michael J Gruber venit, vidit, dixit 08.10.2015 10:15: > James McCoy venit, vidit, dixit 08.10.2015 07:01: ... > [No, this does not alleviate my dislike for the commit signature > implementation, and I have not checked the patch - the test looks good > to me, though.] OK, now gru

Re: [PATCH] filter-branch: strip pgp signature in commit messages

Michael J Gruber venit, vidit, dixit 08.10.2015 10:43: > Michael J Gruber venit, vidit, dixit 08.10.2015 10:15: >> James McCoy venit, vidit, dixit 08.10.2015 07:01: > ... >> [No, this does not alleviate my dislike for the commit signature >> implementation, and I ha

Re: Hacking git for managing machine readable "source" files

Christian Gagneraud venit, vidit, dixit 12.10.2015 05:32: > Hi git hackers, > > I have been scratching my head since quite a few weeks to see if and how > I could hack git to manage non-software-source-code files. Theses files > might be text-based (XML, JSON, custom format, ...) but are not

Re: [PATCH v2] filter-branch: remove multi-line headers in msg filter

Junio C Hamano venit, vidit, dixit 09.10.2015 19:53: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> Set IFS to an empty string for the “read” call, thus disabling the word >>> splitting, which causes $header_line to be set to the non-empty value

Re: [BUG?] parallel make interdepencies

John Keeping venit, vidit, dixit 06.10.2015 15:33: > On Tue, Oct 06, 2015 at 03:13:05PM +0200, Johannes Schindelin wrote: >> Hi Michael, >> >> On 2015-10-06 10:12, Michael J Gruber wrote: >>> "make -j3" just errored out on me, a follow-up "make"

Re: [PATCH] completion: fix completion after 'git -C path'

SZEDER Gábor venit, vidit, dixit 05.10.2015 14:02: > The main completion function finds the name of the git command by > iterating through all the words on the command line in search for the > first non-option-looking word. As it is not aware of 'git -C's > mandatory path argument, if the '-C

[BUG?] parallel make interdepencies

"make -j3" just errored out on me, a follow-up "make" succeeded". This looks like an interdependency issue, but I don't know how to track it: GEN git-web--browse GEN git-add--interactive GEN git-difftool mv: der Aufruf von stat für „perl.mak“ ist nicht möglich: Datei oder Verzeichnis

Re: git rev-list --all --reflog does not include worktree references

Andreas Schwab venit, vidit, dixit 05.10.2015 21:08: > When running git rev-list --all --reflog in the main worktree it doesn't > include commits only referenced by the worktrees, neither HEAD nor its > reflog. HEAD is per worktree, so other worktrees' HEADs should not be included in "--all", I

[PATCH] t2026: rename worktree prune test

"git prune". Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Noted while looking into the "git prune" issue and trying to find a place for "git prune" tests with extra worktrees. t/{t2026-prune-linked-checkouts.sh => t2026-worktree-prune.sh}

Re: [PATCH v2] filter-branch: remove multi-line headers in msg filter

fore > emitting the original, intact commit message. > > Signed-off-by: James McCoy <vega.ja...@gmail.com> > --- Thanks for hanging in :) Reviewed-by: Michael J Gruber <g...@drmicha.warpmail.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: Draft of Git Rev News edition 5

Eric Sunshine venit, vidit, dixit 06.07.2015 01:12: On Sun, Jul 5, 2015 at 6:35 PM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Mon, Jul 6, 2015 at 12:01 AM, Eric Sunshine sunsh...@sunshineco.com wrote: Unfortunately, the non-ASCII characters in Duy's name got corrupted, and the

Re: git grep broken in Fedora 21 update?

Jacob Keller venit, vidit, dixit 04.09.2015 06:55: > On Thu, Sep 3, 2015 at 5:04 PM, Rustad, Mark D > wrote: >> I just found a case where grep and git grep yield different results. Inside >> the ixgbe directory of the Linux kernel I did: >> >> $ grep enter_lplu *.[ch]

Re: [PATCH] graph.c: visual difference on subsequent series

Junio C Hamano venit, vidit, dixit 03.09.2015 19:13: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> Is the design of your independent implementation the same except >>> that 'o' is used instead of 'x'? Independent implementation does >>> no

Re: Standardization of messages - dot after the sentence

sigo venit, vidit, dixit 05.09.2015 14:22: > I've found really "little bug" with dots in the git output. > > $ git push > Everything up-to-date > > git pull > Already up-to-date. > > Could all phrases contain dots? :) > In this case, also both messages mean the same but are phrased

Re: [PATCH] graph.c: visual difference on subsequent series

Junio C Hamano venit, vidit, dixit 27.07.2015 22:17: > Antoine Beaupré writes: > >> Any reason why this patch wasn't included / reviewed? >> ... >>> This patch is similar than the one provided by Milton Soares Filho in >>>

Re: Standardization of messages - dot after the sentence

Junio C Hamano venit, vidit, dixit 08.09.2015 20:16: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> sigo venit, vidit, dixit 05.09.2015 14:22: >>> I've found really "little bug" with dots in the git output. >>> >>> $ git push &g

Re: git clone svn: authors from authors file are ignored, authors-prog works, but crashes on branch points

Till Schäfer venit, vidit, dixit 26.08.2015 21:57: > Hi, > i am observing some weired "git svn clone" behavior during my try to migrate > the Scaffold Hunter [1] SVN repository [2] to Git: > > if i just use the command > > $ git svn clone svn://svn.code.sf.net/p/scaffoldhunter/code

[PATCH] git-svn: parse authors file more leniently

p/authors as the authors file directly. Instead, make git svn uses the perl regex /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/ for parsing the authors file so that the same (slightly more lenient) regex is used in both cases. Reported-by: Till Schäfer <till2.schae...@tu-

Re: Git's inconsistent command line options

Stefan Beller venit, vidit, dixit 01.09.2015 19:56: > On Tue, Sep 1, 2015 at 10:50 AM, Barry Warsaw wrote: >> On Sep 01, 2015, at 09:42 AM, Junio C Hamano wrote: >> >>> That way, you are forcing all the existing scripts to be updated to >>> say "git -c ..." for _all_ invocations

Re: Git's inconsistent command line options

David Aguilar venit, vidit, dixit 01.09.2015 11:28: > On Mon, Aug 31, 2015 at 10:25:58AM -0400, Barry Warsaw wrote: >> On Aug 31, 2015, at 05:10 PM, Duy Nguyen wrote: >> >>> I'm probably shot down for this. But could we go with a clean plate >>> and create a new command prefix (something like

Re: [PATCH] git-svn: parse authors file more leniently

Eric Wong venit, vidit, dixit 10.09.2015 20:08: > Michael J Gruber <g...@drmicha.warpmail.net> wrote: >> Instead, make git svn uses the perl regex >> >> /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/ >> >> for parsing the authors file so that the

Re: [PATCH 2/2] status: don't say 'HEAD detached at HEAD'

Matthieu Moy venit, vidit, dixit 27.09.2015 17:13: > After using "git checkout --detach", the reflog is left with an entry > like > > checkout: moving from ... to HEAD > > This message is parsed to generate the 'HEAD detached at' message in > 'git branch' and 'git status', which leads to the

Re: [BUG?] HEAD detached at HEAD

... in addition to my previous reply, looking at more context: >> --- a/wt-status.c >> +++ b/wt-status.c >> @@ -1319,6 +1319,13 @@ static int grab_1st_switch(unsigned char *osha1, >> unsigned char *nsha1, >> hashcpy(cb->nsha1, nsha1); >> for (end = target; *end && *end != '\n';

Re: [BUG?] HEAD detached at HEAD

Matthieu Moy venit, vidit, dixit 18.09.2015 21:09: > Stefan Beller writes: > >> On Fri, Sep 18, 2015 at 10:23 AM, Matthieu Moy >> wrote: >>> Jacob Keller writes: >>> On Fri, Sep 18, 2015 at 9:59 AM, Matthieu Moy

Re: Fwd: diff not finding difference

Johannes Schindelin venit, vidit, dixit 25.09.2015 12:11: > Hi Jack Adrian, > > On 2015-09-24 23:09, Jack Adrian Zappa wrote: >> This is a weird one: >> >> [file-1 begin] >> >> abcd efg hijklmnop >> >> [file-1 end] >> >> [file-2 begin] >> >> blah blah blah >>

Re: Formatting error in page http://git-scm.com/docs/user-manual

John Keeping venit, vidit, dixit 25.09.2015 14:59: > On Fri, Sep 25, 2015 at 03:38:02PM +0300, Valentin VALCIU wrote: >> There is a formatting error in the source code of page >> http://git-scm.com/docs/user-manual that makes almost half of it be >> rendered in a element displaying the page

[BUG?] worktree setup broken in subdirs with git alias

Hi there, sorry I can't dig deeper now, but the worktree code from next seems to get confused now as soon as you cd to a subdir of a worktree (other than the main worktree) and use an alias: git help ss `git ss' is aliased to `status -s -b' [mjg@skimbleshanks Biomath-WS15 (exam $)]✓ git status

Re: [BUG?] worktree setup broken in subdirs with git alias

Michael J Gruber venit, vidit, dixit 07.01.2016 10:40: > Duy Nguyen venit, vidit, dixit 07.01.2016 10:26: >> On Thu, Jan 7, 2016 at 2:15 PM, Michael J Gruber >> <g...@drmicha.warpmail.net> wrote: >>> Hi there, >>> >>> sorry I can't dig deeper now,

Re: Sparse checkout in worktree

Duy Nguyen venit, vidit, dixit 25.11.2015 20:38: > On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber > <g...@drmicha.warpmail.net> wrote: >> Hi there, >> >> I'm wondering how much it would take to enable worktree specific sparse >> checkouts. From a sup

Re: Sparse checkout in worktree

Duy Nguyen venit, vidit, dixit 25.11.2015 21:17: > On Wed, Nov 25, 2015 at 8:44 PM, Michael J Gruber > <g...@drmicha.warpmail.net> wrote: >> Duy Nguyen venit, vidit, dixit 25.11.2015 20:38: >>> On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber >>> <g.

Sparse checkout in worktree

Hi there, I'm wondering how much it would take to enable worktree specific sparse checkouts. From a superfluous look: - $GIT_DIR/info/sparse_checkout needs to be worktree specific - We don't have much tooling around sparse to speak of at all. The endgoal would be to have something like git

Re: [PATCHv2] builtin/clone: support submodule groups

Stefan Beller venit, vidit, dixit 30.11.2015 20:31: > + cc Duy, Michael, who discussed the sparse checkout recently > > On Wed, Nov 25, 2015 at 9:00 PM, Trevor Saunders > wrote: >> Seeing the recent sparse checkout discussion I realized it might be >> useful to have a

[PATCH] Documentation/diff: give --word-diff-regex=. example

It's just so useful. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/diff-options.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index d56ca90..306b7e3 100644 --- a/Documentatio

Re: Three dot notion used inconsitent?

Andreas Schwab venit, vidit, dixit 18.11.2015 18:49: > Lars Schneider writes: > >> git diff branchA...branchB >> --> gives me the diff between (the common ancestor of A and B) and B. That >> means I never see changes on branchA. >> >> git log branchA...branchB >> -->

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

com/peff/git/ > > But note that I will _not_ be pushing to kernel.org. Does peff/git include the integration branches, too? Also, that one should be uncontroversial (f[l]amous last words): From: Michael J Gruber <g...@drmicha.warpmail.net> Subject: [PAT

Re: [PATCH] cherry-pick: allow to pick to unborn branches

Junio C Hamano venit, vidit, dixit 06.06.2016 22:06: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> Currently, cherry-pick allows tp pick single commits to an empty HEAD >> but not multiple commits. >> >> Allow the multiple commit case, to

Re: [RFC/PATCH] verify-tag: add --check-name flag

Junio C Hamano venit, vidit, dixit 08.06.2016 20:43: > Santiago Torres writes: > >> Sorry I'm trying to follow this. Would it be best to then have >> >> verify-tag [--check-name=tagname] (tag-ref|tag-name|sha1)? >> >> and >> >> tag -v [--check-name] (tag-name) >> >> Or

Re: `man 1 git`: Invalid link to online documentation

Jeff King venit, vidit, dixit 07.06.2016 01:25: > On Mon, Jun 06, 2016 at 07:19:36PM -0400, Jeff King wrote: > >> 2. Make git-htmldocs a real site on GitHub. I think this should be as >> simple as pushing to the `gh-pages` branch of the repository, which >> would make it available as

Re: error: Can't cherry-pick into empty head

Fabrizio Cucci venit, vidit, dixit 28.05.2016 19:54: > Hello everyone, > > I'm trying to understand why I'm getting the error as per subject. > > The scenario is the following: I'm on the master branch (which > contains several commits) and I would like to create a new empty > branch (let's call

[BUG?] trailer command with multiple keys

The command printf "body\n\ntest: foo\ntest: froz\n" | git -c trailer.test.key=tested -c trailer.test.command="echo by \$ARG" interpret-trailers gives: body tested: foo tested: froz tested: by froz I expected the command to be run on each "test" key, resulting in the output: body: tested:

[PATCH] cherry-pick: allow to pick to unborn branches

Currently, cherry-pick allows tp pick single commits to an empty HEAD but not multiple commits. Allow the multiple commit case, too. Reported-by: Fabrizio Cucci <fabrizio.cu...@gmail.com> Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- sequencer.c | 11 ++-

[TIG PATCH] test: make diff/log work with git 2.9

git 2.9.0 switches the default for diff.renames to true. Set this to false in config so that the test suite runs unmodified for old and new git. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- test/tools/libgit.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test

[PATCH] gpg-interface: check gpg signature for correct header

When we create a signature, it may happen that gpg returns with "success" but not with an actual detached signature on stdout. Check for the correct header to catch these cases better. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- This catches at least my e

Re: [PATCH] gpg-interface: check gpg signature for correct header

Jeff King venit, vidit, dixit 14.06.2016 13:20: > On Tue, Jun 14, 2016 at 01:11:19PM +0200, Michael J Gruber wrote: > >> When we create a signature, it may happen that gpg returns with >> "success" but not with an actual detached signature on stdout. >> >&g

Re: [PATCH] gpg-interface: check gpg signature for correct header

Michael J Gruber venit, vidit, dixit 14.06.2016 13:34: > Jeff King venit, vidit, dixit 14.06.2016 13:20: >> On Tue, Jun 14, 2016 at 01:11:19PM +0200, Michael J Gruber wrote: >> >>> When we create a signature, it may happen that gpg returns with >>> "su

[PATCHv2] gpg-interface: check gpg signature for correct header

localised there. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- So, this is the real thing. Between you and me: parse_signature in fact is more lenient, but hey - it's exactly as lenient as we are otherwise, bar running gpg --verify. gpg-interface.c | 2 +- t/t7

[PATCHv3] gpg-interface: check gpg signature creation status

o the same for verify already. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- That must be the real real thing now... gpg-interface.c | 22 +++--- t/t7004-tag.sh | 10 +- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/gpg-interface.c b

Re: [PATCHv3] gpg-interface: check gpg signature creation status

Jeff King venit, vidit, dixit 15.06.2016 02:56: > On Tue, Jun 14, 2016 at 04:47:35PM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >>> I'm still undecided on whether it is a better approach than making >>> sure the stdout we got looks sane. In particular I'd worry that it

Re: I lost my commit signature

Jeff King venit, vidit, dixit 15.06.2016 06:34: > On Wed, Jun 15, 2016 at 12:27:15PM +0800, ZhenTian wrote: > >> I got two more lines from gpg -v during commit with -S: >> ``` >> gpg: writing to stdout >> gpg: RSA/SHA1 signature from: "2EF2AD6E Tian Zhen " >> ``` >> >>

[PATCH] verify-tag: allow to verify signed blob objects

erify tags and blobs. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- The first outcome of my long announced project to describe our signature formats in Documentation/technical (progress underway) In fact, that whole area is in need of refactoring: gpg related bits are al

Re: [PATCH] verify-tag: allow to verify signed blob objects

Junio C Hamano venit, vidit, dixit 15.06.2016 20:39: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> diff --git a/tag.c b/tag.c >> index d1dcd18..d5f090b 100644 >> --- a/tag.c >> +++ b/tag.c >> @@ -39,7 +39,7 @@ int gpg_verify

Re: [PATCHv3] gpg-interface: check gpg signature creation status

Jeff King venit, vidit, dixit 16.06.2016 11:25: > On Wed, Jun 15, 2016 at 09:17:54AM +0200, Michael J Gruber wrote: > >> As for the flexibility: >> We do code specifically for gpg, which happens to work for gpg2 also. >> The patch doesn't add any gpg ui requiremen

[PATCHv2] Documentation/technical: push certificate format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- This is the version describing the current state, not assuming any new verify command for blobs. Documentation/technical/signature-format.txt | 51 1 file changed, 51 insertions(+) diff

Re: [PATCH 0/7] gpg-interface cleanups

Junio C Hamano venit, vidit, dixit 16.06.2016 20:20: > Jeff King writes: > >> This started off with Michael's patch to sign_buffer, which is at the >> tip, and then me trying to address the possible deadlocks there and in >> verify_signed_buffer. While I was in the area, I took

Re: [PATCH 2/4] add smudge-to-file and clean-from-file filter configuration

Joey Hess venit, vidit, dixit 16.06.2016 22:32: > This adds new smudge-to-file and clean-from-file filter commands, > which are similar to smudge and clean but allow direct access to files on > disk. > > In smudge-to-file and clean-from-file, "%p" is expanded to the path to the > file that should

Re: How to find commits unique to a branch

Nikolaus Rath venit, vidit, dixit 21.06.2016 01:21: > On Jun 20 2016, Junio C Hamano wrote: >> Nikolaus Rath writes: >> >>> What's the best way to find all commits in a branch A that have not been >>> cherry-picked from (or to) another branch B? >>> >>> I

[PATCH 5/5] Documentation/technical: push certificate format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/technical/signature-format.txt | 56 1 file changed, 56 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index 7

[PATCH 1/5] Documentation/technical: describe signature formats

We use different types of signature formats in different places. Set up the infrastructure and overview to describe them systematically in our technical documentation. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/Makefile

[PATCH 2/5] Documentation/technical: signed tag format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/technical/signature-format.txt | 47 1 file changed, 47 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index f

[PATCH 4/5] Documentation/technical: signed merge tag format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/technical/signature-format.txt | 74 1 file changed, 74 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index 8

[PATCH 3/5] Documentation/technical: signed commit format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/technical/signature-format.txt | 48 1 file changed, 48 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index 8

[PATCH 0/5] Documentation/technical: describe signature formats

the trustworthiness of signatures, the same way we export information to receive hooks in the presence of push certificates. (Give information, don't decide.) Michael J Gruber (5): Documentation/technical: describe signature formats Documentation/technical: signed tag format Documentation/technical

Re: I lost my commit signature

Junio C Hamano venit, vidit, dixit 16.06.2016 19:06: > Jeff King writes: > >> But why does somebody run "commit -S" for a single commit, but not all >> the time? Is it because that commit is special? Or is that particular >> moment special? One implies that it's important for the

Re: [PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh

[warning: experimenting with forwarding to and replying from gmail...] 2016-02-08 14:50 GMT+01:00 Jeff King <p...@peff.net>: > On Sun, Feb 07, 2016 at 08:11:37PM +0100, Michael J Gruber wrote: > >> bcb11f1 (mingw: mark t9100's test cases with appropriate prereqs, 2016-01-27) &g

Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs

Junio C Hamano venit, vidit, dixit 09.02.2016 23:25: > Junio C Hamano writes: > >> Dickson Wong writes: >> >>> When invoking default (g)vimdiff three-way merge, the merged file is >>> loaded as the first buffer but moved to the bottom as the fourth

[PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh

it message anyways (exec.sh is never executed). Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- t/t9100-git-svn-basic.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 5464b5b..936913c 100755 -

Re: Merging branches with smudge filter

[Please bottom-reply on this list] Leonardo venit, vidit, dixit 08.02.2016 18:52: > Hi. I understand what you mean, but if that's the case, I don't get > how every file was merged successfully despite the encryption, except > two of them. I thought the smudge filter was supposed to be applied to >

Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs

Junio C Hamano venit, vidit, dixit 10.02.2016 18:45: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> Second call for help. Any comments on this from anybody other than >>> the author that I missed to support this change? >> >> OK, applied it

Re: [RFC] tag-ref and tag object binding

Santiago Torres venit, vidit, dixit 25.01.2016 22:22: > Hello everyone. > > I've done some further research on the security properties of git > metadata and I think I've identified something that might be worth > discussing. In this case, The issue is related to the refs that point to > git tag

<    1   2   3   4   5   6   7   8   >