Re: specifying revision - how to enforce matching a tag/branch-name or revision only

on one repository. However `git rev-parse` > also supports to parse the `git-describe` format which resulted in checkout a > commit starting with "cc10". Can't you prepend "refs/heads/" to BRANCH_NAME to disambiguate? -- Kyle

push docs: inaccurate description of omitted destination?

It seems to me that push's manpage contains a couple of inaccurate (or at least confusingly incomplete) statements about omitting the destination part of the refspec. First, the refspec section of the manpage has this to say: If `git push []` without any `` argument is set to update some

[PATCH] t3000 (ls-files -o): widen description to reflect current tests

Remove the mention of symlinks from the test description because several tests that are not related to symlinks have been added since this file was introduced long ago. Signed-off-by: Kyle Meyer --- t/t3000-ls-files-others.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t

[PATCH v3 3/3] add: error appropriately on repository with no commits

ing add_to_index() to error when given a git directory where HEAD can't be resolved. To avoid the embedded repository warning and hint, call check_embedded_repo() only after add_file_to_index() succeeds because, in general, its output doesn't make sense if adding to the index fails.

[PATCH v3 1/3] submodule: refuse to add repository with no commits

commit will make 'git add' fail when given a repository that doesn't have a commit checked out. Signed-off-by: Kyle Meyer --- git-submodule.sh | 7 +++ t/t7400-submodule-basic.sh | 11 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/git-submodu

[PATCH v3 0/3] dir: treat a repository without commits as a repository

use, technically, this series also concerns repositories that have commit objects but are on an unborn branch. * Change the "git submodule add" error message to match the wording of the new error message added in add_to_index(). * Consistently use "expect" rat

[PATCH v3 2/3] dir: do not traverse repositories with no commits

d shows, calling 'git add' on a repository with no commit checked out will now raise an error. While this is the desired behavior, note that the output isn't yet appropriate. The next commit will improve this output. Signed-off-by: Kyle Meyer --- dir.c

Re: [PATCH v2 4/4] dir: do not traverse repositories with no commits

Junio C Hamano writes: > Kyle Meyer writes: >> As the required update to t3700-add shows, being looser with the check >> means that we're stricter when adding empty repositories to the index: >> >> % git add repo >> warning: adding embedded git re

Re: [PATCH v2 2/4] t3000: move non-submodule repo test to separate file

Junio C Hamano writes: > Kyle Meyer writes: > >> a2d5156c2b (resolve_gitlink_ref: ignore non-repository paths, >> 2016-01-22) added a test to t3000-ls-files-others.sh to check that >> 'ls-files -o' does not die() when given a subdirectory that looks like

[PATCH v2 3/4] t3009: test that ls-files -o traverses bogus repo

_ happen in the non-bogus scenarios that will be added next. Rename the original subdirectory to highlight the difference with the new one. Signed-off-by: Kyle Meyer --- t/t3009-ls-files-others-nonsubmodule.sh | 21 ++--- 1 file changed, 18 insertions(+), 3 deletions(

[PATCH v2 2/4] t3000: move non-submodule repo test to separate file

test to a separate file in preparation for testing scenarios with non-submodule repositories that are not bogus. Signed-off-by: Kyle Meyer --- t/t3000-ls-files-others.sh | 7 --- t/t3009-ls-files-others-nonsubmodule.sh | 21 + 2 files changed, 21 insert

[PATCH v2 4/4] dir: do not traverse repositories with no commits

s. And if the caller really wants the previous behavior, they can get it by adding a trailing slash. Signed-off-by: Kyle Meyer --- dir.c | 6 -- t/t3009-ls-files-others-nonsubmodule.sh | 22 +- t/t3700-add.sh |

[PATCH v2 1/4] submodule: refuse to add repository with no commits

iles in the sub-repository are added to the current repository. Detect if the path is a repository with no commits and abort to avoid getting into this state. Note that this check must come before the 'git add --dry-run' check because an upcoming commit will make 'git add'

[PATCH v2 0/4] dir: Treat a repository without commits as a repository

> Kyle Meyer writes: > > [...] > >> diff --git a/git-submodule.sh b/git-submodule.sh >> index 514ede2596..6c74656027 100755 >> --- a/git-submodule.sh >> +++ b/git-submodule.sh >> @@ -234,10 +234,18 @@ cmd_add() >> if test -z "$force&quo

Re: [PATCH 1/4] submodule: refuse to add repository with no commits

Kyle Meyer writes: [...] > diff --git a/git-submodule.sh b/git-submodule.sh > index 514ede2596..6c74656027 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -234,10 +234,18 @@ cmd_add() > if test -z "$force" && > ! git a

[PATCH 3/4] t3009: test that ls-files -o traverses bogus repo

_ happen in the non-bogus scenarios that will be added next. Rename the original subdirectory to highlight the difference with the new one. Signed-off-by: Kyle Meyer --- t/t3009-ls-files-others-nonsubmodule.sh | 21 ++--- 1 file changed, 18 insertions(+), 3 deletions(

[PATCH 1/4] submodule: refuse to add repository with no commits

n this situation, but it allows us to use the same 'git add --dry-run' condition as the ignored path case. Signed-off-by: Kyle Meyer --- git-submodule.sh | 12 ++-- t/t7400-submodule-basic.sh | 11 ++- 2 files changed, 20 insertions(+), 3 deletions(-)

[PATCH 0/4] dir: Treat a repository without commits as a repository

ntracked files of the no-commit/ repository to the index of the current repository. [*]: https://github.com/datalad/datalad/issues/3139#issuecomment-460542647 Kyle Meyer (4): submodule: refuse to add repository with no commits t3000: move non-submodule repo test to separate file t

[PATCH 2/4] t3000: move non-submodule repo test to separate file

test to a separate file in preparation for testing scenarios with non-submodule repositories that are not bogus. Signed-off-by: Kyle Meyer --- t/t3000-ls-files-others.sh | 7 --- t/t3009-ls-files-others-nonsubmodule.sh | 21 + 2 files changed, 21 insert

[PATCH 4/4] dir: do not traverse repositories with no commits

s. And if the caller really wants the previous behavior, they can get it by adding a trailing slash. Signed-off-by: Kyle Meyer --- dir.c | 6 -- t/t3009-ls-files-others-nonsubmodule.sh | 22 +- t/t3700-add.sh |

[PATCH] rebase docs: fix "gitlink" typo

Change it to "linkgit" so that the reference is properly rendered. Signed-off-by: Kyle Meyer --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 5629ba4c5d..6363d674b7 10

[PATCH] init docs: correct a punctuation typo

Signed-off-by: Kyle Meyer --- Documentation/git-init.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 057076ca38..32880aafb0 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -128,7

[PATCH] rebase docs: drop stray word in merge command description

Delete a misplaced word introduced by caafecfcf1 (rebase --rebase-merges: adjust man page for octopus support, 2018-03-09). Signed-off-by: Kyle Meyer --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation

Re: Git Evolve

hought about how this might work >> in Git. > > I've wanted a "git absorb" for a while, but have done no actual work on > it, I just found out about it. It may be worth looking into git-autofixup [0] (author cc'd). I learned about it when Magit used it in its magit-commit-absorb command, but I haven't used it yet myself. [0] https://github.com/torbiak/git-autofixup -- Kyle

Re: [PATCH] Improvement to only call Git Credential Helper once

Thank you for the review, commenting inline. On Fri, Sep 28, 2018 at 3:29 PM Junio C Hamano wrote: > Kyle Hubert writes: > > > Subject: Re: [PATCH] Improvement to only call Git Credential Helper once > > Nobody will send in a patch to worsen things, so phrases like >

[PATCH] Improvement to only call Git Credential Helper once

When calling the Git Credential Helper that is set in the git config, the get command can return a credential. Git immediately turns around and calls the store command, even though that credential was just retrieved by the Helper. This creates two side effects. First of all, if the Helper requires

Re: [PATCH] Improvement to only call Git Credential Helper once

Sorry, this patch is damaged. I'm moving to `git send-email` now. -Kyle On Fri, Sep 28, 2018 at 11:10 AM Kyle Hubert wrote: > > When calling the Git Credential Helper that is set in the git config, > the get command can return a credential. Git immediately turns around > an

[PATCH] Improvement to only call Git Credential Helper once

When calling the Git Credential Helper that is set in the git config, the get command can return a credential. Git immediately turns around and calls the store command, even though that credential was just retrieved by the Helper. This creates two side effects. First of all, if the Helper requires

[PATCH v3] range-diff: update stale summary of --no-dual-color

d-off-by: Kyle Meyer --- builtin/range-diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/range-diff.c b/builtin/range-diff.c index f52d45d9d6..0aa9bed41f 100644 --- a/builtin/range-diff.c +++ b/builtin/range-diff.c @@ -25,7 +25,7 @@ int cmd_range_diff(int argc,

Re: [PATCH] range-diff: update stale summary of --no-dual-color

Junio C Hamano writes: > Johannes Schindelin writes: [...] >>> - N_("color both diff and diff-between-diffs")), >>> + N_("restrict coloring to outer diff markers")), >> >> How about "use simple diff colors" instead? That's certainly better than the

[PATCH v2] range-diff: update stale summary of --no-dual-color

275267937b (range-diff: make dual-color the default mode, 2018-08-13) replaced --dual-color with --no-dual-color but left the option's summary untouched. Rewrite the summary to describe --no-dual-color rather than dual-color. Helped-by: Jonathan Nieder Signed-off-by: Kyle Meyer --- bu

Re: [PATCH] range-diff: update stale summary of --no-dual-color

Jonathan Nieder writes: - N_("color both diff and diff-between-diffs")), + N_("restrict coloring to outer diff markers")), [...] > Aha: I think you're missing a few words (e.g. "color only according to > outer diff markers"). Though based on

Re: [PATCH] range-diff: update stale summary of --no-dual-color

the original diffs' coloring, and adds outer -/+ diff markers [...] Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color). -- Kyle

[PATCH] range-diff: update stale summary of --no-dual-color

275267937b (range-diff: make dual-color the default mode, 2018-08-13) replaced --dual-color with --no-dual-color but left the option's summary untouched. Rewrite the summary to describe --no-dual-color rather than dual-color. Signed-off-by: Kyle Meyer --- builtin/range-diff.c | 2 +- 1

Re: git-bug: Distributed bug tracker embedded in git

6vr.fsf-monnier+gmane.comp.version-control@gnu.org/ -- Kyle

Dearly Beloved In Christ.

Hi Dear, Sorry to invade your privacy, I am Mrs. Daniella Kyle the wife of Mr Angelo Kyle,my husband worked with Central Bank Of Philippines for ten years before he died in the year 2012. When my late husband was alive he deposited sum amount of Money with a Bank in UK, Presently,this money is

[PATCH] gitworkflows: fix grammar in 'Merge upwards' rule

Signed-off-by: Kyle Meyer --- Documentation/gitworkflows.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 926e044d0..ca11c7bda 100644 --- a/Documentation/gitworkflows.txt +++ b/Documentation

Re: [PATCH] git{,-blame}.el: remove old bitrotting Emacs code

Ævar Arnfjörð Bjarmason writes: [...] > These days these modes have very few if users, and users of git aren't s/if// or s/if/if any/ ? -- Kyle

Re: [PATCH] urlmatch: use hex2chr() in append_normalized_escapes()

mplies with the applicable standards. And in that sense it is not a simplification at all. But that's all really just nit picking since hex2chr is a simple inlined function that's relatively easy to find (and understand). Therefore I don't have any objections to this change. Acke

Re: [PATCH v2 6/7] reflog-walk: stop using fake parents

y makes sense. And with this change, I believe that the display of a rename event will be the same for HEAD's log and the renamed branch's log, despite the underlying entries having a different representation. -- Kyle

Re: [PATCH v2 1/7] t1414: document some reflog-walk oddities

Jeff King writes: > +test_expect_failure 'walking multiple reflogs shows all' ' > + # We expect to see all entries for all reflogs, but interleaved by > + # date, with order no the command line breaking ties. We s/order no/order on/ -- Kyle

Re: name-rev: anchor pattern without --exclude?

names like "master~2", from your example, though, > "--points-at" won't do what you need. Thanks for the suggestion. Unfortunately, I do want to consider names like "master~2". I was just hoping that I had overlooked another way to achieve the git name-rev --refs="refs/heads/*" --exclude="*/refs/heads/*" example I gave in my initial post. -- Kyle

Re: name-rev: anchor pattern without --exclude?

Junio C Hamano writes: > Kyle Meyer writes: > >> [*] A bit more information on why I'm trying to do this: In Magit, we >> have a work-in-progress feature that takes "snapshots" of changes >> before they are committed. These snapshots are

name-rev: anchor pattern without --exclude?

more information on why I'm trying to do this: In Magit, we have a work-in-progress feature that takes "snapshots" of changes before they are committed. These snapshots are stored as "refs/wip/{wtree,index}/". We want to use name-rev to map a commit to a name in "refs/heads/", ignoring these snapshot refs. -- Kyle

Re: Truncating HEAD reflog on branch move

Kyle Meyer writes: > Eh, sorry about that. I haven't dug very deeply, but it seems like the > entry is still in .git/logs/HEAD, while "git reflog" is only showing > they latest entry. s/entry is still/missing entries are still/

Re: Truncating HEAD reflog on branch move

h, sorry about that. I haven't dug very deeply, but it seems like the entry is still in .git/logs/HEAD, while "git reflog" is only showing they latest entry. (Maybe because we stop consuming the entries when we hit a null sha1 in the old id field?) -- Kyle

[PATCH] [BUG] test_expect_failure mailinfo -b fatals

27;s a simple matter to flip them to test_expect_success instead. --Kyle P.S. Oh yes, the real patch subject is below (love those >8). -- 8< -- Subject: [PATCH] t5100: add some more mailinfo tests Add some more simple mailinfo tests including a few that produce: fatal: `pos + len' is too

[PATCH] config.txt: add an entry for log.showSignature

The configuration variable log.showSignature is mentioned in git-log's manpage. Document it in git-config's manpage as well. Signed-off-by: Kyle Meyer --- Documentation/config.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config

[PATCH] doc/revisions: remove brackets from rev^-n shorthand

Given that other instances of "{...}" in the revision documentation represent literal characters of revision specifications, describing the rev^-n shorthand as "^-{}" incorrectly suggests that something like "master^-{1}" is an acceptable form. Signed-off-by:

[PATCH] t1400: use consistent style for test_expect_success calls

Structure calls as test_expect_success 'description' ' body ' Use double quotes for the description if it requires parameter expansion or contains a single quote. Signed-off-by: Kyle Meyer --- This patch follows up on a recent t1400 series: https://

[PATCH] doc/config: grammar fixes for core.{editor,commentChar}

Signed-off-by: Kyle Meyer --- Documentation/config.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 0d8df5a9f..1df196545 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -737,13 +737,13

Re: [PATCH 0/5] t1400: modernize style

Junio C Hamano writes: > Jeff King writes: > >> On Mon, Mar 20, 2017 at 08:56:11PM -0400, Kyle Meyer wrote: [...] >>> I also considered >>> >>> * making the quoting/spacing/breaks around the test descriptions and >>> bodies more con

Re: [PATCH 2/5] t1400: set core.logAllRefUpdates in "logged by touch" tests

Jeff King writes: > On Mon, Mar 20, 2017 at 08:56:13PM -0400, Kyle Meyer wrote: [...] >> I'm confused about the setup for the "logged by touch" tests. >> d0ab05849 (tests: remove some direct access to .git/logs, 2015-07-27) >> changed the setup to delete

Re: [PATCH 0/5] t1400: modernize style

Jeff King writes: > On Mon, Mar 20, 2017 at 08:56:11PM -0400, Kyle Meyer wrote: [...] >> * moving the here-documents for log creation into the following >> tests, but I don't think it's worth it because it makes already >> long lines even longe

[PATCH 3/5] t1400: use test_path_is_* helpers

Signed-off-by: Kyle Meyer --- t/t1400-update-ref.sh | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index be8b113b1..c5c8e95fc 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update

[PATCH 4/5] t1400: remove a set of unused output files

This test case redirects stdout and stderr to output files, but, unlike the other cases of redirection in the t1400 tests, these files are not examined downstream. Remove the redirection so that the output is visible when running the tests verbosely. Signed-off-by: Kyle Meyer --- t/t1400

[PATCH 2/5] t1400: set core.logAllRefUpdates in "logged by touch" tests

tests to disable core.logAllRefUpdates explicitly so that the behavior does not depend on the default value. While we're here, update the "logged by config" tests to use test_config() rather than setting core.logAllRefUpdates to "true" outside of the tests. Signed-off

[PATCH 0/5] t1400: modernize style

These patches follow up on Peff's suggestion to modernize the style in t1400-update-ref.sh. 20170217082253.kxjezkxfqkfxj...@sigill.intra.peff.net The first two commits aren't concerned with "modernizing" the tests, but instead address issues that I noticed while looking more closely at t1400.

[PATCH 5/5] t1400: use test_when_finished for cleanup

Move cleanup lines that occur after test blocks into test_when_finished calls within the test bodies. Don't move cleanup lines that seem to be related to mutiple tests rather than a single test. Signed-off-by: Kyle Meyer --- t/t1400-update-ref.sh

[PATCH 1/5] t1400: rename test descriptions to be unique

A few tests share their description with another test. Extend the descriptions to indicate how the tests differ. Signed-off-by: Kyle Meyer --- t/t1400-update-ref.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index

Re: [PATCH v2 1/4] delete_ref: accept a reflog message argument

Duy Nguyen writes: > You'll probably want to update the comment block above if msg can be > NULL. We have _very_ good documentation in this file, let's keep it > uptodate. Looking at how other functions in refs.h document their "msg" or "logmsg" parameter, none seem to mention it explicitly. up

Re: [PATCH v2 0/4] delete_ref: support reflog messages

erge looks right to me, thanks. Thanks also for touching up the tab/space issue in t3200-branch.sh. -- Kyle

[PATCH v2 0/4] delete_ref: support reflog messages

e "delete_refs" was written instead of "delete_ref". Kyle Meyer (4): delete_ref: accept a reflog message argument update-ref: pass reflog message to delete_ref() rename_ref: replace empty message in HEAD's log branch: record creation of renamed branch in H

[PATCH v2 3/4] rename_ref: replace empty message in HEAD's log

xtend HEAD's log to also include the second part of the rename, the creation of the new branch. Helped-by: Jeff King Signed-off-by: Kyle Meyer --- refs/files-backend.c | 2 +- t/t3200-branch.sh| 5 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/refs/files-backend.c b/

[PATCH v2 1/4] delete_ref: accept a reflog message argument

set. In contrast, the update for HEAD has REF_LOG_ONLY set by split_head_update(), resulting in the deletion being logged. Signed-off-by: Kyle Meyer --- builtin/am.c | 4 ++-- builtin/branch.c | 2 +- builtin/notes.c| 4 ++-- builtin/remote.c | 4 ++-- builtin/replac

[PATCH v2 4/4] branch: record creation of renamed branch in HEAD's log

d for deletions, so it may not be worth the effort. Based-on-patch-by: Jeff King Signed-off-by: Kyle Meyer --- branch.c | 5 +++-- branch.h | 3 ++- builtin/branch.c | 5 +++-- refs.h | 3 ++- refs/files-backend.c | 4 ++-- t/t3200-branch.sh| 5 +++-

[PATCH v2 2/4] update-ref: pass reflog message to delete_ref()

Now that delete_ref() accepts a reflog message, pass the user-provided message to delete_ref() rather than silently dropping it. Signed-off-by: Kyle Meyer --- builtin/update-ref.c | 2 +- t/t1400-update-ref.sh | 18 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff

Re: [PATCH 3/3] rename_ref: replace empty deletion message in HEAD's log

more, we probably _do_ want two entries. Because the > operations are not atomic, it's possible that we may end up in a > half-way state after the first entry is written. And when debugging such > a case, I'd much rather see the first half of the operation logged than > nothing at all. OK, I'll have a go at replacing patch 3 with this approach. -- Kyle

Re: [PATCH 3/3] rename_ref: replace empty deletion message in HEAD's log

tatement is inaccurate: currently, a rename will not be recorded in HEAD's log. "git branch -m" will show a renaming event in the new branch's log, but the only trace of the event in HEAD's log is the deletion entry with an empty message. -- Kyle

Re: [PATCH 2/3] update-ref: pass reflog message argument to delete_refs

ize the whole thing would be welcome, too). Right. I'd be happy to follow up with a patch updating the style in t1400-update-ref.sh. > For reference, the two things I notice are: > > - we prefer test_path_is_missing to "! test -f" these days. > > - we don't redirect the output of grep (it's handled already in > non-verbose mode, and in verbose mode we try to be...verbose). Would moving cleanup like "rm -f .git/$m" within the test's body using test_when_finished also be preferred? -- Kyle

Re: [PATCH 1/3] delete_refs(): accept a reflog message argument

han the other two. So I think it makes sense for > delete to try matching update, even though trying to make all four > the same may proabably be pointless. I put "msg" after "flags" because that's where it occurs in ref_transaction_delete(), but matching update_ref() makes sense. -- Kyle

[PATCH 1/3] delete_refs(): accept a reflog message argument

ke a message argument and pass it along to ref_transaction_delete(). Modify all callers to pass NULL for the new message argument; no change in behavior is intended. Signed-off-by: Kyle Meyer --- builtin/am.c | 4 ++-- builtin/branch.c | 2 +- builtin/notes.c| 4 ++

[PATCH 2/3] update-ref: pass reflog message argument to delete_refs

g a checked out branch. Signed-off-by: Kyle Meyer --- I'm not sure if the test here (or in the next patch) is worth including. builtin/update-ref.c | 2 +- t/t1400-update-ref.sh | 9 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/builtin/update-ref.c b/builti

[PATCH 3/3] rename_ref: replace empty deletion message in HEAD's log

overs the renaming event with a message of "Branch: renamed ...". Signed-off-by: Kyle Meyer --- refs/files-backend.c | 8 +++- t/t3200-branch.sh| 4 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index ffa75d816..b

[PATCH 0/3] delete_ref(): support reflog messages

[Sorry for the slow response.] Jeff King writes: > On Mon, Jan 16, 2017 at 06:17:29PM -0500, Kyle Meyer wrote: [...] >>$ cat .git/logs/refs/heads/new-master >>00000... 68730... Kyle Meyer 1484607020 -0500 commit >> (initial): Add file.txt >>6

Re: init --separate-git-dir does not set core.worktree

Duy Nguyen writes: > On Thu, Feb 2, 2017 at 7:37 PM, Kyle Meyer wrote: [...] >> * COMMIT_EDITMSG in .git/modules//: set working tree to the >>output of "git rev-parse --show-toplevel" >> >> * COMMIT_EDITMSG in .git/worktrees//: set working tre

Re: init --separate-git-dir does not set core.worktree

Duy Nguyen writes: > On Thu, Feb 2, 2017 at 10:55 AM, Kyle Meyer wrote: >> >> As of 6311cfaf9 (init: do not set unnecessary core.worktree, >> 2016-09-25), "git init --separate-git-dir" no longer sets core.worktree >> (test below). Based on the commit messa

init --separate-git-dir does not set core.worktree

Hello, As of 6311cfaf9 (init: do not set unnecessary core.worktree, 2016-09-25), "git init --separate-git-dir" no longer sets core.worktree (test below). Based on the commit message and the corresponding thread [1], I don't think this change in behavior was intentional, but I wasn't able to under

HEAD's reflog entry for a renamed branch

git branch -m master new-master resulted in the following reflogs: $ cat .git/logs/refs/heads/new-master 0... 68730... Kyle Meyer 1484607020 -0500 commit (initial): Add file.txt 68730... 68730... Kyle Meyer 1484607020 -0500 Branch: renamed refs/heads/master to refs/hea

Re: [PATCH] branch_get_push: do not segfault when HEAD is detached

Jeff King writes: > On Fri, Jan 06, 2017 at 08:09:32PM -0500, Kyle Meyer wrote: > >> > $ git grep -c HEAD^{} junio/pu -- t/ >> > junio/pu:t/t3200-branch.sh:3 >> > >> > Maybe use HEAD^0 just for consistency? >> >> Yes, thanks for pointin

[PATCH v2] branch_get_push: do not segfault when HEAD is detached

Move the detached HEAD check from branch_get_push_1() to branch_get_push() to avoid setting branch->push_tracking_ref when branch is NULL. Signed-off-by: Kyle Meyer --- remote.c | 6 +++--- t/t1514-rev-parse-push.sh | 6 ++ 2 files changed, 9 insertions(+), 3 deleti

Re: [PATCH] branch_get_push: do not segfault when HEAD is detached

t/t9105-git-svn-commit-diff.sh:1 > junio/pu:t/t9107-git-svn-migrate.sh:1 > > $ git grep -c HEAD^{} junio/pu -- t/ > junio/pu:t/t3200-branch.sh:3 > > Maybe use HEAD^0 just for consistency? Yes, thanks for pointing that out. -- Kyle

[PATCH] branch_get_push: do not segfault when HEAD is detached

Move the detached HEAD check from branch_get_push_1() to branch_get_push() to avoid setting branch->push_tracking_ref when branch is NULL. Signed-off-by: Kyle Meyer --- remote.c | 6 +++--- t/t1514-rev-parse-push.sh | 6 ++ 2 files changed, 9 insertions(+), 3 deleti

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Dec 21, 2016, at 18:21, Kyle J. McKay wrote: On Dec 21, 2016, at 07:55, Jeff King wrote: On Tue, Dec 20, 2016 at 09:54:15PM -0800, Kyle J. McKay wrote: I wasn't aware anybody actually built with NDEBUG at all. You'd have to explicitly ask for it via CFLAGS, so I assume m

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Dec 21, 2016, at 07:55, Jeff King wrote: On Tue, Dec 20, 2016 at 09:54:15PM -0800, Kyle J. McKay wrote: I wasn't aware anybody actually built with NDEBUG at all. You'd have to explicitly ask for it via CFLAGS, so I assume most people don't. Not a good assumption. You kn

Re: [PATCH] mailinfo.c: move side-effects outside of assert

at _are_ potentially expensive, so that makes sense. So there's no way to get a non-release build of nedmalloc inside Git then without hacking the Makefile? What if you need those assertions enabled? Maybe NDEBUG shouldn't be defined by default for any files. --Kyle [1] https://www.youtube.com/watch?v=KEP1acj29-Y

[PATCH v3] mailinfo.c: move side-effects outside of assert

On Dec 19, 2016, at 15:26, Junio C Hamano wrote: > "Kyle J. McKay" writes: > >>> OK. So we do not expect it to fail, but we still do want the side >>> effect of that function (i.e. accmulation into the field). >>> >>> Somebody care to send

[PATCH v2] mailinfo.c: move side-effects outside of assert

esult of the function call instead so that the code still works properly in a release build and passes the tests. Since the only time that mi->inbody_header_accum is appended to is in check_inbody_header, and appending onto a blank mi->inbody_header_accum always happens when is_inbody_heade

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Dec 19, 2016, at 12:03, Jeff King wrote: On Sat, Dec 17, 2016 at 11:54:18AM -0800, Kyle J. McKay wrote: Since 6b4b013f18 (mailinfo: handle in-body header continuations, 2016-09-20, v2.11.0) mailinfo.c has contained new code with an assert of the form: assert(call_a_function

[PATCH] mailinfo.c: move side-effects outside of assert

. Signed-off-by: Kyle J. McKay --- Notes: Please include this PATCH in 2.11.x maint mailinfo.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mailinfo.c b/mailinfo.c index 2fb3877e..47442fb5 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -708,9 +708,12 @@ static int

Git 2.11.0 on OS X El Capitan 10.11.6

compatible with OS X El Capitan 10.11.6? Any other solutions you might recommend? Thank you for your time and hard work!! Cheers, Kyle

Re: Git v2.11.0 breaks max depth nested alternates

Most all of your comments could be dumped into the patch description as-is to pimp it out some. I have no objection to that, even adding an "Additional-analysis-by:" (or similar) credit line too. :) --Kyle

Git v2.11.0 breaks max depth nested alternates

a push with Git v2.11.0 to the same repository fails because of this problem that the below patch does indeed correct the issue and allow the push to succeed. Cheers, Kyle -- 8< -- Subject: [PATCH] receive-pack: increase max alternates depth during quarantine Ever since 722ff7f876 (receive-p

[ANNOUNCE] git-log-compact v1.0

script should work with any version of Git released in the last several years. --Kyle [1] https://git.github.io/rev_news/2016/10/19/edition-20/

Re: [PATCH 10/10] get_short_sha1: list ambiguous objects on error

mit Merge branch 'rc/maint-reflog-msg-for- forced c512b0344196931a tag(v0.99.9a) GIT 0.99.9a So perhaps it's a little bit more interesting than it first appears. :) --Kyle

Re: [PATCH 10/10] get_short_sha1: list ambiguous objects on error

would continue to be ambiguous at length 7. In fact it almost makes a prefix length of 9 good enough, there's just the one at length 9 that disambiguates into more than one commit (45f014c52). --Kyle

Re: Changing the default for "core.abbrev"?

ations) 0 (with 3 or more disambiguations) Running the stats on $github/gitster/git produces some ambiguous length 9 prefixes (one of which contains a commit disambiguation). --Kyle

Re: [PATCH 10/10] get_short_sha1: list ambiguous objects on error

11d1 tree b2e1632 commit 2007-11-14 - Merge branch 'bs/maint-commit-options' b2e1759 blob b2e18954 blob b2e1895c blob Any option name will do, --disambiguate-verbose, --disambiguate- extended, --disambiguate-long, --disambiguate-log, --disambiguate- help, --disambiguate-show-me-something-useful-to-humans-not-scripts ... --Kyle

Re: [PATCH/RFC] git log --oneline alternative with dates, times and initials

On Sep 29, 2016, at 01:33, Jeff King wrote: On Wed, Sep 28, 2016 at 10:34:51PM -0700, Kyle J. McKay wrote: git log-times --graph --date-order --decorate --no-merges -n 5 v2.5.3 === 2015-09-17 === * ee6ad5f4 12:16 jch (tag: v2.5.3) Git 2.5.3 === 2015-09-09 === * b9d66899 14:22 js am

[PATCH/RFC] git log --oneline alternative with dates, times and initials

README and the `git-log-times -h` output that can be used to alter the dates, times and/or initials displayed. The patch below adds a contrib/git-log-times directory containing the executable (git-log-times) and the README. --Kyle P.S. git am complains about 26 lines with whitespace errors. They are

  1   2   3   4   >