Re: Re: [Bug report] 'git status' always says Your branch is up-to-date with 'origin/master'

2014-01-06 Thread Bryan Turner
On 6 January 2014 01:24, Thomas Ackermann th.ac...@arcor.de wrote: Hi Jiang, this happens with all of my repo clones (I am using V1.8.5.2 on Windows and on Linux). Steps to reproduce: mkdir repo_a cd repo_a git init . echo 1foo git add foo git commit -m 1 cd .. git clone repo_a

Pack bitmaps on Git for Windows

2014-04-22 Thread Bryan Turner
is not actually present. This does not appear to be an issue with normal git, per the documentation for git config at http://www.git-scm.com/docs/git-config. Bryan Turner -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: Returning error message from custom smart http server

2014-05-19 Thread Bryan Turner
on how they _intended_ this all to be used, but it works for us. A full example looks something like this: 0036# service=git-receive-packERR This is a test\n Hope this helps, Bryan Turner It does look that way. Does the following patch work for you? -- 8 -- Subject: [PATCH] http

2.2.0-rc behavior changes (1/2)

2014-11-10 Thread Bryan Turner
Sahlberg sahlb...@google.com 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

2.2.0-rc behavior changes (2/2)

2014-11-10 Thread Bryan Turner
d3038d22f91aad9620bd8e6fc43fc67c16219738 Author: Jeff King p...@peff.net 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 the line unsubscribe git in the body of a message to majord...@vger.kernel.org

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 p...@peff.net wrote: On Mon, Nov 10, 2014 at 07:47:32PM +1100, Bryan Turner wrote: First change: git update-ref -d /refs/heads/nonexistent some-valid-sha1 now produces an error about ref locking that it didn't produce before Git 2.1.x and prior

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

2014-11-10 Thread Bryan Turner
On Mon, Nov 10, 2014 at 8:31 PM, Jeff King p...@peff.net wrote: On Mon, Nov 10, 2014 at 07:51:00PM +1100, Bryan Turner wrote: Second change: git gc --auto now fails if there are loose empty blobs. We have a test which just touched empty files in objects/17 to trigger the gc --auto

Re: [PATCH] More typofixes.

2013-07-29 Thread Bryan Turner
That's a pretty impressive list of corrections. Reviewed-by: Bryan Turner btur...@atlassian.com -- 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: Flatten history

2013-07-29 Thread Bryan Turner
merge --squash will just apply the changes without creating a commit. You can then make any final changes you want to and write your commit message for the feature. Hope this helps, Bryan Turner -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH] The images from picon and gravatar are always used over http://, and browsers give mixed contents warning when gitweb is served over https://.

2013-01-28 Thread Bryan Turner
This won't work correctly as-is. The secure URL for Gravatar is https://secure.gravatar.com[1], not https://www.gravatar.com;. [1] See the Secure Requests section on: https://en.gravatar.com/site/implement/images/ On 29 January 2013 14:03, Junio C Hamano gits...@pobox.com wrote: Thanks; will

Re: [PATCH] The images from picon and gravatar are always used over http://, and browsers give mixed contents warning when gitweb is served over https://.

2013-01-28 Thread Bryan Turner
://secure...; to get the avatars to load correctly. That's been ~8 months ago now, though, so maybe it's no longer the case. It seems like it would be much more convenient if they just changed the scheme. Bryan On 29 January 2013 15:12, Jonathan Nieder jrnie...@gmail.com wrote: Hi Bryan, Bryan

Question: git clone --no-checkout behavior

2012-07-12 Thread Bryan Turner
not surprised every file shows deleted; I'm surprised that the deletion starts out already staged. A git reset unstages all of the deletions and I'm good to go. I'm just wondering why they're all staged in the first place; it seems counter-intuitive. Can anyone shed some light on this? Bryan Turner

Re: Moving commits from one branch to another (improving my git fu!)

2013-10-22 Thread Bryan Turner
dev and apply those new commits. Hope this helps, Bryan Turner On 22 October 2013 16:38, Mandeep Sandhu mandeepsandhu@gmail.com wrote: Hi All, I'm in a bit of a pickle! :) So I've come to ask for help from the guru's here. My story is not unique but somehow the various suggested

Re: GIT Hooks and security

2013-10-25 Thread Bryan Turner
on the list for why that's the case. Hope this helps, Bryan Turner On 26 October 2013 09:25, Olivier Revollat revol...@gmail.com wrote: But when someone do a clone he don't have .git/hooks directory downloaded to his local computer ? I thought so ... 2013/10/26 Junio C Hamano gits...@pobox.com

Re: Error message: unable to open object pack directory: .git/objects/pack: Too many open files

2013-11-12 Thread Bryan Turner
On 13 November 2013 13:48, Duy Nguyen pclo...@gmail.com wrote: On Tue, Nov 12, 2013 at 9:38 PM, Лежанкин Иван abys...@gmail.com wrote: I use linux. I can't publish repo - it's proprietary, it weights ~300M unpacked, and it uses references ~3Gb. Error message doesn't contain remote: prefix.

Symbolic refs break ref advertisement on 1.8.4.3+

2013-11-16 Thread Bryan Turner
once you have 15-20 symbolic refs (more or less depending on path lengths), you blow the 996 byte limit in format_packet (pkt-line.c) and all further clone/fetch operations fail. I've verified this same issue exists in all 1.8.5 RCs. Best regards, Bryan Turner -- To unsubscribe from this list: send

git diff-tree commit detail bug in 2.0.2 and 2.0.3

2014-07-28 Thread Bryan Turner
|%h|%P|%p|%aN|%aE|%at%n%B%n 9214ac7 commit 9214ac79728424a971244c34432c6d948754198d 9214ac79728424a971244c34432c6d948754198d|9214ac7|c5e16f37164f1b7411685def64d7390775437f07|c5e16f3|Bryan Turner|btur...@atlassian.com|1406539558 Second commit bturner@ubuntu:/tmp/test.git$ /opt/git/2.0.3/bin/git diff

Re: git diff-tree commit detail bug in 2.0.2 and 2.0.3

2014-07-28 Thread Bryan Turner
745224e04a03e4544c58d5d38d3c54f67100f8eb Author: David Turner dtur...@twopensource.com Date: Wed Jun 18 01:54:42 2014 -0400 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

Re: git diff-tree commit detail bug in 2.0.2 and 2.0.3

2014-07-28 Thread Bryan Turner
string. Please give them some quick sanity check. Thanks. Thanks both of you; I appreciate your efforts! I've run my suite of tests against the tips of master and maint and all 681 pass for each. Looks good to me. Best regards, Bryan Turner -- To unsubscribe from this list: send the line

Re: git status / git diff -C not detecting file copy

2014-11-29 Thread Bryan Turner
in the repository. Note that this can be slower, which is the reason why it's not the default. The documentation for git diff describes the -C (--find-copies) and --find-copies-harder flags and their limitations. Hope this helps, Bryan Turner On Sun, Nov 30, 2014 at 11:35 AM, Pol Online i...@pol

Re: git status / git diff -C not detecting file copy

2014-11-29 Thread Bryan Turner
this helps, Bryan Turner On Sun, Nov 30, 2014 at 12:30 PM, Pol Online i...@pol-online.net wrote: Hi Bryan, OK that explains the behavior of git diff, but what about git status? The doc implies it should be able to detect copies in the index / staging area since it has a C state. - Pol

http-protocol question

2014-12-01 Thread Bryan Turner
. Is there actually logic somewhere in Git that does that MAY walk backwards step? Or is that something another implementation of Git may do but the standard Git does not? Thanks, Bryan Turner -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org

Re: http-protocol question

2014-12-01 Thread Bryan Turner
On Tue, Dec 2, 2014 at 2:34 PM, Jonathan Nieder jrnie...@gmail.com wrote: Hi Bryan, Bryan Turner wrote: Is there actually logic somewhere in Git that does that MAY walk backwards step? Yes. See upload-pack.c::check_non_tip and http://thread.gmane.org/gmane.comp.version-control.git/178814

Re: http-protocol question

2014-12-01 Thread Bryan Turner
On Tue, Dec 2, 2014 at 3:28 PM, Bryan Turner btur...@atlassian.com wrote: On Tue, Dec 2, 2014 at 2:34 PM, Jonathan Nieder jrnie...@gmail.com wrote: Hi Bryan, Bryan Turner wrote: Is there actually logic somewhere in Git that does that MAY walk backwards step? Yes. See upload-pack.c

Re: http-protocol question

2014-12-01 Thread Bryan Turner
On Tue, Dec 2, 2014 at 3:45 PM, Jonathan Nieder jrnie...@gmail.com wrote: Hi, Bryan Turner wrote: The reason I ask is that there is a race condition that exists where the ref advertisement lists refs/heads/foo at abc1234, and then foo is deleted before the actual upload-pack request comes

Re: http-protocol question

2014-12-01 Thread Bryan Turner
On Tue, Dec 2, 2014 at 4:33 PM, Jeff King p...@peff.net wrote: On Tue, Dec 02, 2014 at 04:04:11PM +1100, Bryan Turner wrote: Can you say more about the context? For example, was this actually happening, or is this for the sake of understanding the protocol better? I ask because it's

Re: git status / git diff -C not detecting file copy

2014-12-02 Thread Bryan Turner
On Tue, Dec 2, 2014 at 5:55 PM, Jeff King p...@peff.net wrote: So from these timings, I'd conclude that: 1. It's probably fine to turn on copies for git status. 2. It's probably even OK to use -C -C for some projects. Even though 22s looks scary there, that's only 11ms for git.git

Re: folder naming bug?

2015-02-02 Thread Bryan Turner
Are you, by any chance, on MacOS? HFS+ by default is case-insensitive-but-case-preserving, and Git on MacOS by default runs with core.ignorecase = true as a result. If you set that to false does it change the behavior? Hope this helps, Bryan Turner On Tue, Feb 3, 2015 at 12:56 PM, Kevin Coleman

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Bryan Turner
On Thu, Jan 15, 2015 at 4:24 AM, Junio C Hamano gits...@pobox.com wrote: Andreas Krey a.k...@gmx.de writes: On Wed, 14 Jan 2015 07:49:36 +, Jeff King wrote: ... You don't need the -f here. Just git repack -ad should be enough (and the -f probably makes it _way_ slower). Indeed, factor

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Bryan Turner
On Thu, Jan 15, 2015 at 5:38 PM, Andreas Krey a.k...@gmx.de wrote: On Thu, 15 Jan 2015 12:23:00 +, Bryan Turner wrote: ... Guess in the dark: ls -l .git/objects/pack Do you see any .keep files? Lots of. :-( I'm one of the Stash developers and just noticed this thread

Re: Big repo not shrinking on repack or gc?

2015-01-15 Thread Bryan Turner
On Thu, Jan 15, 2015 at 6:43 PM, Andreas Krey a.k...@gmx.de wrote: On Thu, 15 Jan 2015 18:05:46 +, Bryan Turner wrote: ... They do. So it seems it was forked once upon a time, but... /opt/apps/atlassian/stash-data/shared/data/repositories $ grep '' */objects/info/alternates 158

Re: bug report : 2.3.5 ssh repo not found

2015-04-25 Thread Bryan Turner
On Sat, Apr 25, 2015 at 3:57 PM, Chris chrisb.d...@gmail.com wrote: Hello, Using git version 2.3.5 with kernel 3.19.3-3-ARCH #1 SMP PREEMPT x86_64 I see the following error message when pulling or cloning a repo over ssh: git clone ssh://user@mydomain:/home/user/path/to/project.git

Re: [ANNOUNCE] Git v2.4.0-rc2

2015-04-15 Thread Bryan Turner
On Wed, Apr 15, 2015 at 7:48 AM, Junio C Hamano gits...@pobox.com wrote: A release candidate Git v2.4.0-rc2 is now available for testing at the usual places. The difference since -rc1 is mostly l10n and a handful of documentation clean-ups. The tarballs are found at:

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

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

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

2016-04-13 Thread Bryan Turner
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 <Ken.O'conn...@cognex.com> wrote: > Good afternoon

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

2016-06-30 Thread Bryan Turner
are, as 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 <stef...@sdaoden.eu> wrote: > Hello, for your possible

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

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

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.

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

2016-11-07 Thread Bryan Turner
s 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 <p...@peff.net> 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, >> > } >

Re: Races on ref .lock files?

2016-12-16 Thread Bryan Turner
at 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 <gits...@pobox.com>

Re: Flurries of 'git reflog expire'

2017-07-11 Thread Bryan Turner
On Mon, Jul 10, 2017 at 9:45 PM, Andreas Krey <a.k...@gmx.de> 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 >

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

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

Re: Binary files

2017-07-20 Thread Bryan Turner
t work for your use case? Best regards, Bryan Turner

Re: upgarding GIT

2017-08-17 Thread Bryan Turner
figure the general Git list isn't interested in this issue.) Best regards, 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

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 /

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

2017-05-06 Thread Bryan Turner
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 inputs and outputs [2]:

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

2017-08-30 Thread Bryan Turner
st based on reading the overview and knowing our code I think the described approaches should work fine. Best regards, Bryan Turner

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

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

2017-10-01 Thread Bryan Turner
em, though. 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: [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

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 <bmw...@google.com> wrote: > On 08/30, Bryan Turner wrote: >> On Fri, Aug 25, 2017 at 10:29 AM, Jeff King <p...@peff.net> wrote: >> > On Thu, Aug 24, 2017 at 03:53:21PM -0700, Brandon Williams wrote: >> >

Re: Git Hooks

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

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 >

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

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

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

2017-10-20 Thread Bryan Turner
ry (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: [ANNOUNCE] Git v2.16.0-rc0

2018-01-02 Thread Bryan Turner
tic 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 <jrnie...@gmail.com> 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. >>

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 <rcdailey.li...@gmail.com> wrote: > On Fri, Jan 5, 2018 at 2:26 PM, Paul Smith <p...@mad-scientist.net> wrote: >> On Fri, 2018-01-05 at 12:12 -0800, Bryan Turner wrote: >>> On Fri, Jan 5, 2018 at 11:59 AM, Robert Da

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

2018-01-05 Thread Bryan Turner
uot; and 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