Re: --abbrev-commit gives longer hash than necessary

2016-06-30 Thread Bryan Turner
your repository grows over time. The default isn't just about what's likely to be unique now; it's about what's likely to stay unique for a period of time. Hope this helps! Bryan Turner On Thu, Jun 30, 2016 at 12:38 PM, Steffen Nurpmeso wrote: > Hello, for your possible inte

Re: Races on ref .lock files?

2016-12-16 Thread Bryan Turner
ng such that auto GC will always be disabled for all repositories and managed explicitly within Bitbucket Server instead, so a future upgrade should automatically prevent these messages from appearing on clients. Best regards, Bryan Turner On Fri, Dec 16, 2016 at 9:20 AM, Junio C Hamano wrot

Re: [PATCH 07/18] link_alt_odb_entry: handle normalize_path errors

2016-11-07 Thread Bryan Turner
use relative paths in alternates is something still actively developed and enhanced. Is it intentional that this breaks the ability to use relative alternates? If this is to be the "new normal", is there any other option when using environment variables besides using absolute paths? Best regards, Bryan Turner [1]: https://github.com/git/git/commit/087b6d584062f5b704356286d6445bcc84d686fb -- Also newly tagged in 2.11.0-rc0

Re: [PATCH 07/18] link_alt_odb_entry: handle normalize_path errors

2016-11-07 Thread Bryan Turner
On Mon, Nov 7, 2016 at 4:30 PM, Jeff King wrote: > On Mon, Nov 07, 2016 at 03:42:35PM -0800, Bryan Turner wrote: > >> > @@ -335,7 +340,9 @@ static void link_alt_odb_entries(const char *alt, int >> > len, int sep, >> > } >> > >&g

Re: [PATCH 07/18] link_alt_odb_entry: handle normalize_path errors

2016-11-08 Thread Bryan Turner
> >> Is there anything I can do to help? I'm happy to test out changes. > > The patch at the end of his mail obviously passes the newly-added tests > for me, but please confirm that it fixes your test suite. > > I gather your suite is about noticing behavior changes between different > versions. Fo

Re: v2.9.3 and v2.10.0: `name-ref' HEAD gives wrong branch name

2016-09-20 Thread Bryan Turner
On Tue, Sep 20, 2016 at 9:23 AM, Steffen Nurpmeso wrote: > Hello again, > > yah, sorry, i'm back again.. > I try to find a way to find the name of the current branch in an > automated way, because i need to ensure that a commit happens on > it and no other branch. Now the problem arises that the

Re: Git for Windows crashes on Windows 10

2016-02-02 Thread Bryan Turner
On Tue, Feb 2, 2016 at 10:28 PM, 孙乾程 wrote: > I'm not a native English speaker. I'm sorry if I didn't explain the problem > clearly. > I'm using Windows 10 Enterprise Insider Preview (I'll use Win10 instead > below). Until yesterday, I'm using Win10 build 11102, and Git for Windows > works well

Re: Git clone sends first an empty authorization header

2016-03-04 Thread Bryan Turner
On Fri, Mar 4, 2016 at 9:51 PM, Guilherme wrote: > Hi, > > When doing basic authentication using git clone by passing the > username and password in the url git clone will first send a GET > request without the authorization header set. > > Am i seeing this right? I believe this is an intentional

Re: credentials are being erased from credential manager via git credential-wincred erase command

2016-04-13 Thread Bryan Turner
to look at your Stash instance to determine why authentication is failing. If you do open a support request, please mention me in your description so that our support engineers can attach me to the issue! Best regards, Bryan Turner On Wed, Apr 13, 2016 at 12:49 PM, O'Connell, Ken wrote: > Good a

Re: Git clone fails with fatal: the remote end hung up unexpectedly

2018-12-10 Thread Bryan Turner
On Mon, Dec 10, 2018 at 4:55 PM Owen Ofiesh wrote: > > We are seeing an issue where git clone in Linux Ubuntu 14.04.5 LTS fails with > the following error using the HTTP protocol. > > The error on the client is: >fatal: the remote end hung up unexpectedly >fatal: early EOF >fatal: ind

Re: Git blame performance on files with a lot of history

2018-12-14 Thread Bryan Turner
On Fri, Dec 14, 2018 at 10:29 AM Clement Moyroud wrote: > > Hello, > > My group at work is migrating a CVS repo to Git. The biggest issue we > face so far is the performance of git blame, especially compared to > CVS on the same file. One file especially causes us trouble: it's a > 30k lines file

Re: Fw: git describe issue

2019-04-03 Thread Bryan Turner
On Tue, Apr 2, 2019 at 11:47 PM Amiel Elboim wrote: > Hi! > > I've found strange behavior with 'git describe' command, look like for me as > bug. > > In the case I create 2 tags on same commit and I run 'git describe --tags' I > expect to get the latest tag, but always I get the first tag I crea

Re: Fw: git describe issue

2019-04-03 Thread Bryan Turner
On Wed, Apr 3, 2019 at 1:00 AM Amiel Elboim wrote: > > Very helpful! annotated tag is good solution for us. > > However fix of this issue is important, because it's confusing when you want > to track on your version using git tags. Lightweight tags have no metadata to allow for ordering, so I'm

git push --atomic and HTTP(S) vs SSH

2019-04-08 Thread Bryan Turner
ng to the server at all. I've verified this with Git 2.4.0 as a client (which appears to be where "git push --atomic" was first introduced), and with Git 2.20.1 as a client, to ensure there wasn't a regression somewhere, and the behavior is identical for both versions. (I've a

Re: [PATCH 0/5] Multiple hook support

2019-04-24 Thread Bryan Turner
ases, it would likely be quite some time before that could happen; the minimum supported Git version would need this series to have landed in or before it. That's a big part of why Bitbucket Server doesn't use core.hooksPath; it's too new. (Bitbucket Server 6.0 raised the minimum Git version on the server to 2.11.0, so it's the first major series that could use core.hooksPath; Bitbucket Server 5.x supported back to Git 2.2.0, which doesn't have it.) Best regards, Bryan Turner

Re: add 'ls-remote' option to limit output records

2019-04-26 Thread Bryan Turner
On Fri, Apr 26, 2019 at 11:57 AM David Carson wrote: > > Given that 'ls-remote' can be sorted, it would be useful to be able to ask > for a subset of the total number of result records. > > For example, if I want to retrieve only the tag with the highest version, I > would do so by adding this n

Re: Running 'git worktree add' in 'pre-commit' hook

2019-05-14 Thread Bryan Turner
On Tue, May 14, 2019 at 7:53 AM Cosmin Polifronie wrote: > > Hello! I am trying to run 'git worktree add HEAD' in the > 'pre-commit' hook, more specifically in a Python script that is being > called from the hook. When doing so, I am greeted with the following > error: > > On Windows 10: > Prepar

Re: [ANNOUNCE] Git v2.22.0-rc1

2019-05-20 Thread Bryan Turner
sentially applied the default behavior--until the default configuration was changed in 1.8.4 from "never" to "auto". By using "--no-color", even though we didn't "need" to, we were protected against that change in the default. Best regards, Bryan Turner

HEAD and namespaces

2019-05-20 Thread Bryan Turner
When using GIT_NAMESPACE, it appears the "symref" added to the capabilities advertisement doesn't get the namespace stripped. The namespace is stripped for the advertised refs, including "HEAD", but not on the "symref". Lafiel:test bturner$ GIT_NAMESPACE=foo GIT_TRACE_PACKET=1 git ls-remote origin

"Losing" MERGE_HEAD

2019-05-30 Thread Bryan Turner
o about this. It's clear it's a long-standing behavior. One approach might be to introduce a warning when changing branches deletes MERGE_*. A different one might be to fail to change branches without something like --force. I'm not sure either is _better_ than the current behavior, but

Re: Tracking parent branches in Git

2019-07-01 Thread Bryan Turner
intrinsic metadata of their own (unlike, say, annotated tags or commits), I suspect implementing something like this may be more complicated than it might initially appear, especially if said metadata needs to be communicated to remote repositories (which implies it might require changes to the wire prot

Re: Tracking parent branches in Git

2019-07-02 Thread Bryan Turner
27;s tracking "release/5.16" in my local repository. I could certainly be misunderstanding the request, but I think it's asking for something less ephemeral--and more shareable--than remote-tracking, and it seems logical to want to be able to retain ancestry while still using remote-tracking setup such that local branches still track the remote version of themselves, rather than some other (albeit related) branch. Best regards, Bryan Turner

Re: [Bug] Unexpected behavior on case insensitive filesystems

2019-07-02 Thread Bryan Turner
On Tue, Jul 2, 2019 at 10:23 AM Alex Brachet-Mialot wrote: > > Branches behave weirdly for case insensitive filesystems, and I'm > guessing other things as well. For example say I am on a branch other > than master, checking out 'Master' will _work_, I will of course be on > the right branch but g

Re: Unexpected or wrong ff, no-ff and ff-only behaviour

2019-07-09 Thread Bryan Turner
eds but the code on each "side" isn't entirely compatible, resulting in broken compilation and/or tests and/or runtime). Best regards, Bryan Turner [1] https://public-inbox.org/git/CAP4gbxqjHzqHhPuNK8UOwPMa46g2=vcnsk1avgjxn8s+ou-...@mail.gmail.com/

Re: Problem with git diff

2019-07-09 Thread Bryan Turner
On Tue, Jul 9, 2019 at 4:13 PM Elijah Newren wrote: > > Hi John, > > On Tue, Jul 9, 2019 at 3:57 PM McRoberts, John wrote: > > > > I am responsible for generating a list of all files changed between two > > successive releases of software. I was using 'git diff' but have run into a > > problem. >

Re: [RFC/PATCH] CodingGuidelines: spell out post-C89 rules

2019-07-16 Thread Bryan Turner
On Tue, Jul 16, 2019 at 10:21 AM Junio C Hamano wrote: > > Even though we have been sticking to C89, there are a few handy > features we borrow from more recent C language in our codebase after > trying them in weather balloons and saw that nobody screamed. > > Spell them out. > > While at it, ext

Re: [git-for-windows] Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Bryan Turner
.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1 > > Please test! I've run the full test suite for Bitbucket Server against 2.23.0-rc0 on Linux, macOS and Windows. No test failures to report. Thanks again for these early release candidates! They're a great opportunity to test new releases in advance. Best regards, Bryan Turner

Re: cannot clone --single-commit instead of --single-branch

2019-08-01 Thread Bryan Turner
On Thu, Aug 1, 2019 at 1:52 PM Alexander Mills wrote: > > Looking for help with this problem: > > https://stackoverflow.com/questions/57316783/git-clone-single-branch-does-not-work-for-sha-commit-ids > > Essentially looking for: > > git clone --single-commit There's no such option, which will be

Re: Git for Windows v2.20.0-rc0, was Re: [ANNOUNCE] Git v2.20.0-rc0

2018-11-20 Thread Bryan Turner
omated, so the deprecation warning was not visible.) For what it's worth, I think having -l mean --list is a _good change_, and one that will likely be more natural for both new and existing users. It's the rapid changeover that hurts. Best regards, Bryan Turner [1] https://git-scm.com/docs/git-branch/2.18.0 [2] https://git-scm.com/docs/git-branch/2.19.0

Re: Git for Windows v2.20.0-rc0, was Re: [ANNOUNCE] Git v2.20.0-rc0

2018-11-21 Thread Bryan Turner
On Wed, Nov 21, 2018 at 6:20 AM Jeff King wrote: > > On Tue, Nov 20, 2018 at 03:17:07PM -0800, Bryan Turner wrote: > > > I've run 2.20.0-rc0 through the test matrix for Bitbucket Server on > > both Linux and Windows, and the only failures were related to this > >

Forcing GC to always fail

2018-11-27 Thread Bryan Turner
Something of an odd question, but is there something I can do in the configuration for a repository that forces any "git gc" run in that repository to always fail without doing anything? (Ideally I'd like to make "git reflog expire" _also_ fail.) Background: For Bitbucket Server, we have a fairly

Re: Forcing GC to always fail

2018-11-27 Thread Bryan Turner
On Tue, Nov 27, 2018 at 3:47 PM Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Nov 27 2018, Bryan Turner wrote: > > > > > Is there anything I can set, perhaps some invalid configuration > > option/value, that will make "git gc" (most important) and "git

Re: Forcing GC to always fail

2018-11-27 Thread Bryan Turner
On Tue, Nov 27, 2018 at 5:55 PM Elijah Newren wrote: > > On Tue, Nov 27, 2018 at 4:16 PM Ævar Arnfjörð Bjarmason > wrote: > > > > On Wed, Nov 28 2018, Bryan Turner wrote: > > > > > On Tue, Nov 27, 2018 at 3:47 PM Ævar Arnfjörð Bjarmason > > > wr

Re: Forcing GC to always fail

2018-11-28 Thread Bryan Turner
On Wed, Nov 28, 2018 at 5:19 PM Junio C Hamano wrote: > > > Another issue with the canned steps for "git gc" is that it means it > > can't be used to do specific types of cleanup on a different schedule > > from others. For example, we use "git pack-refs" directly to > > frequently pack the refs i

Re: Parsing a git HTTP protocol response

2018-11-30 Thread Bryan Turner
On Fri, Nov 30, 2018 at 5:05 PM Farhan Khan wrote: > > Hi all, > > I am writing an implementation of the git HTTP pack protocol in C. It > just does a request to clone a repository. It works pretty well for > small repositories, but seems to fail on larger repositories and I do > not understand wh

Re: Parsing a git HTTP protocol response

2018-11-30 Thread Bryan Turner
On Fri, Nov 30, 2018 at 6:58 PM Bryan Turner wrote: > > Here's a (very ugly) patch I threw together on top of your code: ...snip Gmail butchered my patch, so here it is as an attachment. Bryan short-size-reads.patch Description: Binary data

Re: Retrieving a file in git that was deleted and committed

2018-12-06 Thread Bryan Turner
On Thu, Dec 6, 2018 at 10:49 PM biswaranjan panda wrote: > > I have the following scenario: > > On a branch A, I deleted a file foo.txt and committed the change. Then > I did a bunch of other changes. > Now I want to undelete foo.txt. > > One way is to checkout a separate branch B where the file i

Re: Retrieving a file in git that was deleted and committed

2018-12-06 Thread Bryan Turner
On Thu, Dec 6, 2018 at 11:26 PM Jeff King wrote: > > On Thu, Dec 06, 2018 at 11:07:00PM -0800, biswaranjan panda wrote: > > > Thanks! Strangely git log --follow does work. > > I suspect it would work even without --follow. When you limit a log > traversal with a pathspec, like: > > git log foo >

Re: [Possible GIT Bug]

2018-09-09 Thread Bryan Turner
On Sun, Sep 9, 2018 at 6:31 AM Dylan Young wrote: > > Works: > > git show -C --find-copies-harder 055f6c89fa4506037d1621761f13430f469b8029 > > git show -C --find-copies-harder > 055f6c89fa4506037d1621761f13430f469b8029 --name-status Here, because you didn't provide _any_ paths, Git is allowed to

Re: Fwd: Git credentials not working

2018-10-03 Thread Bryan Turner
On Wed, Oct 3, 2018 at 12:34 PM Dimitri Kopriwa wrote: > > I have replaced the way I fill the git credentials store, I have verify > ~/.git-credentials and information are there, the ~/.gitconfig look fine > too. > > I still have 401 error when reading from that file. > > This is the paste log : h

Re: git question from a newbie

2018-06-05 Thread Bryan Turner
On Tue, Jun 5, 2018 at 2:33 PM Heinz, Steve wrote: > > Hi. > > I am new to Git and have read quite a few articles on it. > I am planning on setting up a remote repository on a windows 2012 R2 server > and will access it via HTTPS. > I am setting up a local repository on my desk top (others in my

Re: Unexpected ignorecase=false behavior on Windows

2018-06-22 Thread Bryan Turner
On Fri, Jun 22, 2018 at 1:45 PM Marc Strapetz wrote: > > On 22.06.2018 19:36, Johannes Sixt wrote: > > Am 22.06.2018 um 14:04 schrieb Marc Strapetz: > >> On Windows, when creating following repository: > >> > >> $ git init > >> $ echo "1" > file.txt > >> $ git add . > >> $ git commit -m "initial i

Re: Unexpected ignorecase=false behavior on Windows

2018-06-25 Thread Bryan Turner
On Mon, Jun 25, 2018 at 9:34 AM Junio C Hamano wrote: > > Bryan Turner writes: > > > Git on Windows is not designed to run with anything other than > > core.ignoreCase=true, and attempting to do so will cause unexpected > > behavior. > > Even though I fully ag

2.21: Change in ref advertisement handling?

2019-02-15 Thread Bryan Turner
'm not looking for anything to change here, let me hasten to add; I'm just interested in some clarification. Why did our invalid ref advertisement response work in older Git versions? Why has it stopped working in 2.21? Best regards, Bryan Turner

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Bryan Turner
On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day wrote: > > never noticed this before ... when i do a regular "git commit" and > enter my "vi" edit session and change my mind, i can bail with ":q!", > regardless of what i've set up as a commit message, and i'll see: > > Aborting commit due to

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Bryan Turner
On Tue, Mar 12, 2019 at 11:01 AM Robert P. J. Day wrote: > > On Tue, 12 Mar 2019, Bryan Turner wrote: > > > On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day > > wrote: > > > > > > never noticed this before ... when i do a regular "git commit"

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Bryan Turner
On Tue, Mar 12, 2019 at 11:14 AM Robert P. J. Day wrote: > > On Tue, 12 Mar 2019, Bryan Turner wrote: > > > On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day > > wrote: > > > > > > never noticed this before ... when i do a regular "git commit"

Re: Strange annotated tag issue

2019-03-21 Thread Bryan Turner
On Thu, Mar 21, 2019 at 9:59 AM Robert Dailey wrote: > > I have a particular tag in my repo that shows 2 annotated > descriptions, which is very confusing. > > The command I ran: > > ``` > git show --format=fuller 4.2.0.1900 > ``` > > And the output: > > ``` > tag 4.2.0/1900 > Tagger: John Doe

Re: Strange annotated tag issue

2019-03-25 Thread Bryan Turner
On Mon, Mar 25, 2019 at 7:49 AM Jeff King wrote: > > On Mon, Mar 25, 2019 at 08:50:14AM -0500, Robert Dailey wrote: > > > On Thu, Mar 21, 2019 at 2:29 PM Jeff King wrote: > > > Tags can point to any object, including another tag. It looks like > > > somebody made an annotated tag of an annotated

Puzzling Git backtrace

2019-03-27 Thread Bryan Turner
I'm trying to assist a Bitbucket Server customer who is seeing some "git-upload-pack" processes "hang" on their server. While investigating, we had them connect gdb to their processes (which are 2.10.0 built from source using a simple unzip-and-run-make approach) and get the backtraces for them. T

Re: Puzzling Git backtrace

2019-03-27 Thread Bryan Turner
On Wed, Mar 27, 2019 at 6:50 PM Jeff King wrote: > > On Wed, Mar 27, 2019 at 05:49:27PM -0700, Bryan Turner wrote: > > > I'm trying to assist a Bitbucket Server customer who is seeing some > > "git-upload-pack" processes "hang" on their server. > &

Re: "Changes not staged for commit" after cloning a repo on macOS

2018-08-15 Thread Bryan Turner
On Wed, Aug 15, 2018 at 1:50 PM Hadi Safari wrote: > > Hi everyone! > > I encountered a strange situation on OS X recently. I cloned a > repository (https://github.com/kevinxucs/Sublime-Gitignore.git), went to > folder, and saw "Changes not staged for commit" message for four > specific files. It

Re: Request for testing v2.19.0-rc0 *with builtin stash/rebase*

2018-08-24 Thread Bryan Turner
time, they make a big difference in my day to day work. And that's not to mention all the Bitbucket Server and Bitbucket Data Center users who will enjoy a snappier experience as these changes make their way out into the wild. Best regards, Bryan Turner

Re: Get "Your branch is ahead of 'origin/master'" message when explicitly passing origin url at push command

2018-08-26 Thread Bryan Turner
the issue Everything here is working as intended. If you want to push to a _remote_, you either need to: - Name the remote ("git push origin"), or - Leave it off, so Git will assume origin ("git push") Pushing to a URL that matches a remote's URL is _not_ pushing to a remote. It's pushing to an explicit URL. Hope this helps, Bryan Turner > > >

Re: $> git branch splat response considered harmful

2019-08-08 Thread Bryan Turner
On Thu, Aug 8, 2019 at 2:08 PM wrote: > > fwiw, > > jimc@frodo:~/prj-1/capnproto.git$ git branch -l > * master > > I find the splat in the response unhelpful > when wrapped in shell for loop, the splat expands into everything in > current directory > > jimc@frodo:~/prj-1/capnproto.git$ for b in `g

Fully peel tags via for-each-ref?

2019-08-19 Thread Bryan Turner
he tagged tag's SHA. Is there any way, with "git for-each-ref", to output the "fully" peeled SHA of a tag's ultimate target, regardless of how many layers must be traversed? Best regards, Bryan Turner

Re: Fully peel tags via for-each-ref?

2019-08-20 Thread Bryan Turner
On Mon, Aug 19, 2019 at 10:50 PM Junio C Hamano wrote: > > Bryan Turner writes: > > > Is there any way, with "git for-each-ref", to output the "fully" > > peeled SHA of a tag's ultimate target, regardless of how many layers > > must be tr

Re: [BUG] You can't have single quote in your username

2019-08-22 Thread Bryan Turner
cented "e", wouldn't it be better to set your name using é, rather than a trailing apostrophe? "git commit" would likely preserve that without issue. Best regards, Bryan Turner

Re: [Question] clone performance

2019-08-24 Thread Bryan Turner
On Fri, Aug 23, 2019 at 6:59 PM wrote: > > Hi All, > > I'm trying to answer a question for a customer on clone performance. They > are doing at least 2-3 clones a day, of repositories with about 2500 files > and 10Gb of content. This is stressing the file system. Can you go into a bit more detail

Re: git slow unless piped to cat

2019-08-27 Thread Bryan Turner
On Tue, Aug 27, 2019 at 2:32 PM Uwe Kleine-König wrote: > > On Tue, Aug 27, 2019 at 02:59:30PM -0400, Jeff King wrote: > > On Tue, Aug 27, 2019 at 12:04:27PM +0200, Uwe Kleine-König wrote: > > > > to see the loose ones. If there are a lot, try: > > > > git pack-refs --prune --all > > > > (or jus

Re: diff.renames not working?

2019-09-13 Thread Bryan Turner
indicated you have "diff.renames=copies", wouldn't you need -C? -M only detects renames, not copies. (I haven't looked too deeply into the rest, but this detail caught my eye.) Best regards, Bryan Turner > 3. The `diff.renames` config doesn't seem to be working here, when it s

Re: getting fatal error trying to open git gui

2018-03-16 Thread Bryan Turner
On Fri, Mar 16, 2018 at 2:01 PM, Briggs, John wrote: > No, it was a fresh install. Plus file search reveals only one copy of the > file. > > I also noticed that I cannot use the file properties to run as administrator. > I must right-click on Git GUI and select "More >> Run as administrator" in

Re: [ANNOUNCE] Git v2.17.0-rc1

2018-03-23 Thread Bryan Turner
On Fri, Mar 23, 2018 at 10:47 AM, Johannes Schindelin wrote: > Hi team, > > On Wed, 21 Mar 2018, Junio C Hamano wrote: > >> A release candidate Git v2.17.0-rc1 is now available for testing >> at the usual places. It is comprised of 493 non-merge commits >> since v2.16.0, contributed by 62 people,

Re: Self-inflicted "abort" in a newbie attempt at read-only exploration of a cloned repository?

2018-04-05 Thread Bryan Turner
On Thu, Apr 5, 2018 at 12:42 PM, Thierry Moreau wrote: > Dear GIT enthusiasts! > > This ends up with a "git checkout" command aborting. A bit frustrating at > the early stage of GIT learning curve. > > My first goal is to clone repositories locally in order to explore the > various linux kernel ve

Re: Self-inflicted "abort" in a newbie attempt at read-only exploration of a cloned repository?

2018-04-05 Thread Bryan Turner
On Thu, Apr 5, 2018 at 4:18 PM, Bryan Turner wrote: > On Thu, Apr 5, 2018 at 12:42 PM, Thierry Moreau > wrote: >> Dear GIT enthusiasts! >> >> This ends up with a "git checkout" command aborting. A bit frustrating at >> the early stage of GIT learnin

Re: Git Hooks

2017-12-15 Thread Bryan Turner
> proposed change would introduce unseen issues. > > > Thanks, > Satya Hope this helps! Bryan Turner

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-02 Thread Bryan Turner
sh" (or something other than "auto") to avoid the automatic detection. I'd love to say I have a brilliant idea for how to work around this, oh and here's a patch, but I don't. One option might be trying to actually review the output, and another might be to run "ssh -V", but both of those have their own flaws (and the extra process forks aren't "free"). [1] https://www.openssh.com/txt/release-6.8 [2] https://launchpad.net/ubuntu/+source/openssh Best regards, Bryan Turner

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-02 Thread Bryan Turner
On Tue, Jan 2, 2018 at 9:07 PM, Jonathan Nieder wrote: > Hi Bryan, > > Bryan Turner wrote: > >> Our test environment is still on Ubuntu 12.04 LTS (it's a long story, >> but one I doubt is unique to us), which means it's using OpenSSH 5.9. >> ssh -G was ad

Re: Can't squash merge with merge.ff set to false

2018-01-05 Thread Bryan Turner
d that commit is fast-forward from the target, a new commit is not created and instead the target branch is fast-forwarded. With "--no-ff", it's questionable what "--squash" should do in that case. Fast-forward anyway? Rewrite the commit simply to get new committer details and SHA-1? Hope this helps! Bryan Turner

Re: Can't squash merge with merge.ff set to false

2018-01-05 Thread Bryan Turner
On Fri, Jan 5, 2018 at 12:35 PM, Robert Dailey wrote: > On Fri, Jan 5, 2018 at 2:26 PM, Paul Smith wrote: >> On Fri, 2018-01-05 at 12:12 -0800, Bryan Turner wrote: >>> On Fri, Jan 5, 2018 at 11:59 AM, Robert Dailey >>> wrote: >>> >>> As for why t

Re: Git checkout issue - deleting file without apparent reason

2017-05-02 Thread Bryan Turner
On Tue, May 2, 2017 at 6:33 PM, Paul van Wichen wrote: > Hi, > > We are having a strange issue that we haven't been able to pin down. > Scenario: master branch and feature branch both have a specific file. > 1. Master checked out. > 2. git status show no changes / clean staging area. > 3. Checkout

Re: Git smart http: parsing commit messages in git-receive-pack

2017-05-06 Thread Bryan Turner
r log, to review them. If they don't meet your requirements, just reject the push and Git will delete the objects automatically Hope this helps! Bryan Turner > > Thanks in advance, > Ákos Tajti > [1]: https://git-scm.com/docs/githooks includes documentation for pre-receive inpu

Re: Bug Report - Pull remote branch does not retrieve new tags

2018-04-19 Thread Bryan Turner
Andrew, On Thu, Apr 19, 2018 at 6:55 AM, Andrew Ducker wrote: > > What happens: > When I create a new tag on the remote (changing nothing else) > "git pull origin master" produces the following: > From git.internal.company.com:team/testrepo >* branchmaster -> FETCH_HEAD >

Re: Fetching tags overwrites existing tags

2018-04-27 Thread Bryan Turner
On Fri, Apr 27, 2018 at 12:08 PM, Wink Saville wrote: > > The other change was rather than using > ""+refs/tags/*:refs/remote-tags/$name/*" > I've changed it to "+refs/tags/*:refs/remote/tags/$name/*" which seems > cleaner. > Again, if remote-tags is preferred I'll change it back. >From lookin

Re: [Best Practices Request] clean/smudge configuration

2018-05-09 Thread Bryan Turner
On Wed, May 9, 2018 at 3:09 PM Randall S. Becker wrote: > The question: what is the best practice for versioning the parts of > clean/smudge filters that are in .git/config given that only some users in > my environment will be cloning the repository in question and that I really > can't put the

Re: Git case-sensitivity bug

2018-05-10 Thread Bryan Turner
ms and on NTFS on Windows. Hope this helps! Bryan Turner

Re: [BUG] Failed to sign commit

2017-06-07 Thread Bryan Turner
> $ GIT_TRACE=1 git commit --allow-empty -v -m "lol" > 11:37:24.594795 git.c:369 trace: built-in: git 'commit' > '--allow-empty' '-v' '-m' 'lol' > 11:37:24.605842 run-command.c:369 trace: run_command: 'gpg' > '--status-fd=2' '-bsau' '8AEC0DB537A9FC7E' > error: gpg failed to sign

Re: Flurries of 'git reflog expire'

2017-07-06 Thread Bryan Turner
I'm one of the Bitbucket Server developers. My apologies; I just noticed this thread or I would have jumped in sooner! On Thu, Jul 6, 2017 at 6:31 AM, Andreas Krey wrote: > On Wed, 05 Jul 2017 04:20:27 +, Jeff King wrote: >> On Tue, Jul 04, 2017 at 09:57:58AM +0200, Andreas Krey wrote: > ...

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

2017-07-06 Thread Bryan Turner
On Thu, Jul 6, 2017 at 10:23 AM, Kyle Meyer wrote: > Junio C Hamano writes: >> Kyle Meyer writes: > >> What is the answer desired by your application when two or more >> branches point at the same commit you are interested in? Pick one at >> random? An error saying it cannot decide where to pl

Re: Flurries of 'git reflog expire'

2017-07-11 Thread Bryan Turner
On Mon, Jul 10, 2017 at 9:45 PM, Andreas Krey wrote: > On Thu, 06 Jul 2017 10:01:05 +0000, Bryan Turner wrote: > >> I also want to add that Bitbucket Server 5.x includes totally >> rewritten GC handling. 5.0.x automatically disables auto GC in all >> repositories a

Re: git 2.16, Jenkins git client plugin, and ""

2018-01-24 Thread Bryan Turner
On Wed, Jan 24, 2018 at 3:55 PM, Mark Waite wrote: > It appears that git 2.16.0 and 2.16.1 have introduced a change which > surprises the Jenkins git client plugin. > > Git 2.16.0 and 2.16.1 on Linux both report "fatal: ssh variant > 'simple' does not support setting port" when used in the context

Re: Location limits on development, staging and production environments

2018-01-29 Thread Bryan Turner
On Mon, Jan 29, 2018 at 11:08 AM, H wrote: > I am a newcomer to git looking to set up a web development environment where > individual computers are used for development, the development.git, > staging.git and production.git repositories are stored on an external server > reachable by password-

2 conflicts referencing the same path?

2018-02-01 Thread Bryan Turner
ormal" (albeit rare) case? Or could it represent some sort of issue in Git's 3-way merge algorithm (in its behavior or perhaps in how the merge conflicts are logged)? Any insights appreciated! Bryan Turner

Re: repository history?

2018-02-06 Thread Bryan Turner
On Tue, Feb 6, 2018 at 1:41 AM, Zsolt SZALAI wrote: > Hi, > > I wonder if there is a feature with which the history of the > repository can be listed? > i am interested in especially the usecases of pull and push, i.e. to > query when the a branch was refreshed with remote changes and which > comm

Re: Please test Git for Windows' latest snapshot

2018-02-16 Thread Bryan Turner
On Fri, Feb 16, 2018 at 3:30 PM, Johannes Schindelin wrote: > Hi team, > > I am unwilling to release Git for Windows v2.16.2 on a Friday night, but I > have something almost as good. There is a snapshot available here: > > > https://urldefense.proofpoint.com/v2/url?u=https-3A__wingit.blob

Re: [RFC] - url-safe base64 commit-id's

2017-02-27 Thread Bryan Turner
On Mon, Feb 27, 2017 at 6:27 PM, G. Sylvie Davies wrote: > Is there any appetite for base64'd commit-id's, using the url-safe > variant (e.g. RFC 4648 [1] with padding removed)? > > And so this: > 712bad335dfa9c410a83f9873614a19726acb3a8 > > Becomes this: > cSutM136nEEKg_mHNhShlyass6g > > > Under

Re: Binary files

2017-07-20 Thread Bryan Turner
is: why not implementing some feature, that would > somehow handle this problem? Like Git LFS or git annex? Features have been implemented to better handle large files; they're just not necessarily part of core Git. Have you checked whether one of those solutions might work for your use case? Best regards, Bryan Turner

Re: upgarding GIT

2017-08-17 Thread Bryan Turner
al Git list isn't interested in this issue.) Best regards, Bryan Turner

Re: [RFC 0/7] transitioning to protocol v2

2017-08-30 Thread Bryan Turner
itly, to be certain, but just based on reading the overview and knowing our code I think the described approaches should work fine. Best regards, Bryan Turner

Re: [RFC 7/7] upload-pack: ack version 2

2017-09-01 Thread Bryan Turner
On Thu, Aug 24, 2017 at 3:53 PM, Brandon Williams wrote: > + > + version = getenv("GIT_PROTOCOL"); > + if (!strcmp(version, "2")) > + upload_pack_v2(); > + I think the "if" check here needs some type of NULL check for "version" before calling "strcmp". Without that, if t

Re: [RFC 0/7] transitioning to protocol v2

2017-09-01 Thread Bryan Turner
On Wed, Aug 30, 2017 at 2:12 PM, Brandon Williams wrote: > On 08/30, Bryan Turner wrote: >> On Fri, Aug 25, 2017 at 10:29 AM, Jeff King wrote: >> > On Thu, Aug 24, 2017 at 03:53:21PM -0700, Brandon Williams wrote: >> > >> >> The biggest question I'm

Re: git merge algorithm question

2017-09-05 Thread Bryan Turner
On Tue, Sep 5, 2017 at 5:53 PM, Daniel Biran wrote: > >>> I'm trying to better understand one of the merge algorithms as I had some >>> triumphs and tribulations with using a set of commands during a merge. >>> tldr: can a git merge -s recursive -X patience; // result in a fast-forward >>> merg

Re: what is git's position on "classic" mac -only end of lines?

2017-10-01 Thread Bryan Turner
ugh. In general, `git blame` and `git diff`, for example, don't seem honor them. Perhaps someone else knows of some useful knows of which I'm not aware. Best regards, Bryan Turner

Re: Git for Windows v2.15.0-rc prerelease, was Re: [ANNOUNCE] Git v2.15.0-rc2

2017-10-20 Thread Bryan Turner
as a canary (pending the final 2.15.0 release). I've done the same for 2.15.0-rc2 on Linux as well. Best regards, Bryan Turner

Re: [PATCH 0/6] Create Git/Packet.pm

2017-10-26 Thread Bryan Turner
On Thu, Oct 26, 2017 at 2:07 AM, Jacob Keller wrote: > On Wed, Oct 25, 2017 at 10:38 PM, Junio C Hamano wrote: >> Johannes Schindelin writes: >> >>> Note that the correct blib path starts with `C:\BuildAgent\_work` and >>> the line >>> >>> use lib (split(/:/, $ENV{GITPERLLIB})); >>> >>> sp

Re: [PATCH 0/6] Create Git/Packet.pm

2017-10-26 Thread Bryan Turner
On Thu, Oct 26, 2017 at 2:07 AM, Jacob Keller wrote: > On Wed, Oct 25, 2017 at 10:38 PM, Junio C Hamano wrote: >> Johannes Schindelin writes: >> >>> Note that the correct blib path starts with `C:\BuildAgent\_work` and >>> the line >>> >>> use lib (split(/:/, $ENV{GITPERLLIB})); >>> >>> sp

Re: why can *some* git commands not be run from within .git directory?

2017-11-14 Thread Bryan Turner
On Tue, Nov 14, 2017 at 1:18 AM, Robert P. J. Day wrote: > > just noticed something i was unaware of -- some git commands can't > be run if i'm in the .git directory, while others can. for example, > if i "cd .git", commands like this work just fine: > > $ git show > $ git branch > $ git l

2.2.0-rc behavior changes (1/2)

2014-11-10 Thread Bryan Turner
57ac1 Author: Ronnie Sahlberg Date: Wed Apr 30 09:22:45 2014 -0700 refs.c: make delete_ref use a transaction Best regards, Bryan Turner -- 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

2.2.0-rc behavior changes (2/2)

2014-11-10 Thread Bryan Turner
bisect good d3038d22f91aad9620bd8e6fc43fc67c16219738 is the first bad commit commit d3038d22f91aad9620bd8e6fc43fc67c16219738 Author: Jeff King Date: Wed Oct 15 18:41:35 2014 -0400 prune: keep objects reachable from recent objects Best regards, Bryan Turner -- To unsubscribe from this list: send th

Re: 2.2.0-rc behavior changes (1/2)

2014-11-10 Thread Bryan Turner
On Mon, Nov 10, 2014 at 8:22 PM, Jeff King wrote: > On Mon, Nov 10, 2014 at 07:47:32PM +1100, Bryan Turner wrote: > >> First change: git update-ref -d /refs/heads/nonexistent >> now produces an error about ref locking that it >> didn't produce before >> &

  1   2   >