Re: [RFC] clang-format: outline the git project's coding style

Ramsay Jones writes: > As a start, how about something like this: > > -- >8 -- > $ git diff > diff --git a/Makefile b/Makefile > index 461c845d3..7555def45 100644 > --- a/Makefile > +++ b/Makefile > @@ -2440,6 +2440,18 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE >

Re: [PATCH 0/5] make interpret-trailers useful for parsing

On Thu, Aug 10, 2017 at 11:42 AM, Junio C Hamano wrote: > Jeff King writes: > >>> > The above example made me wonder if we also want a format specifier >>> > to do the above without piping, but it turns out that we already >>> > have "log --format=%(trailers)",

Re: [RFC] clang-format: outline the git project's coding style

On 13/08/17 05:41, Jeff King wrote: > On Fri, Aug 11, 2017 at 09:39:11PM -0700, Junio C Hamano wrote: > >>> Yeah, I just dug in the archive. The script I ran way back when was >>> actually clang-format-diff. >> >> I am confident with the competence of people around here that we can >> come up

Re: [PATCH 5/9] Convert various things to size_t

On Sat, Aug 12, 2017 at 03:27:21PM +0200, Martin Ågren wrote: > On 12 August 2017 at 10:47, Martin Koegler wrote: > > From: Martin Koegler > > > > --- > > bisect.c| 2 +- > > blame.c | 2 +- > >

Re: [PATCH 1/9] Convert pack-objects to size_t

On Sat, Aug 12, 2017 at 02:47:25PM +0100, Ramsay Jones wrote: > On 32-bit Linux, off_t is 64-bit and size_t is 32-bit. --- t.c --- #include #include int main() { printf("%d %d\n", sizeof(size_t), sizeof(off_t)); } $ gcc -m32 -o t t.c $ ./t.c 4 4 So is that really true? Regards,

Re: [PATCH 1/9] Convert pack-objects to size_t

On Sat, Aug 12, 2017 at 11:59:15AM +0200, Torsten Bögershausen wrote: > Thanks for working on this - unfortunatly the patch does not apply on > git.git/master. > > Which baseline did you use ? next - 98096fd7a85b93626db8757f944f2d8ffdf7e96a It accumulated to 19 patches. Regards, Martin

Re: [PATCH 3/9] Convert unpack-objects to size_t

On Sat, Aug 12, 2017 at 04:07:50PM +0200, Martin Ågren wrote: > On 12 August 2017 at 10:47, Martin Koegler wrote: > "size" is handed over to a "git_zstream" and goes through zlib.c, > eventually ending up in zlib, which is outside Git's control, and which > seems to work

Re: [RFC] clang-format: outline the git project's coding style

On 13/08/17 18:33, Junio C Hamano wrote: > Ramsay Jones writes: >> Hmm, on reflection, it may be a bit too crude! :-D > > As you already saw in the output from this, I think this is a good > illustration that shows why we want an incremental tool that works > on

Re: [RFC] clang-format: outline the git project's coding style

On 13/08/17 17:14, Ramsay Jones wrote: > > > On 13/08/17 05:41, Jeff King wrote: >> On Fri, Aug 11, 2017 at 09:39:11PM -0700, Junio C Hamano wrote: >> Yeah, I just dug in the archive. The script I ran way back when was actually clang-format-diff. >>> >>> I am confident with the

Re: git-describe --contains

Thanks Andreas and Nicholas, I'll check it out.

[PATCH 7/7] Plumb in namespaced ref store

--- refs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c index 9a3dcfb..e80244f 100644 --- a/refs.c +++ b/refs.c @@ -647,7 +647,6 @@ int refs_delete_ref(struct ref_store *refs, const char *msg, struct strbuf err = STRBUF_INIT; if

Re: [PATCH 1/9] Convert pack-objects to size_t

Ramsay Jones writes: > It should be, see commit b97e911643 ("Support for large files > on 32bit systems.", 17-02-2007), where you can see that the > _FILE_OFFSET_BITS macro is set to 64. This asks et.al., > to use the "Large File System" API and a 64-bit off_t.

[PATCH 1/7] Expose expand_namespace API

Namespaces will not only be settable with GIT_NAMESPACE, so this previously internal helper needs to be made available to other code. --- cache.h | 1 + environment.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 71fe092..e01b8a2 100644 ---

[PATCH 5/7] Treat namespaced HEAD and refs/bisect as per-worktree

--- refs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/refs.c b/refs.c index 2e8bace..9a3dcfb 100644 --- a/refs.c +++ b/refs.c @@ -536,6 +536,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log) static int is_per_worktree_ref(const char *refname) { +

[PATCH 6/7] Add namespaced ref backend

--- Makefile | 1 + refs/namespaced-backend.c | 619 ++ refs/refs-internal.h | 1 + 3 files changed, 621 insertions(+) create mode 100644 refs/namespaced-backend.c diff --git a/Makefile b/Makefile index 461c845..0c417c3

[PATCH 3/7] Add helper for skipping namespace prefixes

Normally your own namespace is known and you only need to skip that prefix, but when you need to classify the type of a ref it helps to be able to consider what type of ref it would be if it were outside of a namespace. --- git-compat-util.h | 19 +++ 1 file changed, 19

[PATCH 4/7] Autocreate reflogs for namespaced refs

Since refs are classified based on their prefix but namespaces have their own prefix, it's necessary to skip that prefix to classify their remaining prefix. --- refs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/refs.c b/refs.c index ba22f4a..2e8bace 100644 --- a/refs.c +++ b/refs.c @@

[RFC PATCH 0/7] Implement ref namespaces as a ref storage backend

Forewarning: I don't consider this work complete and am unlikely to find time to finish it any time soon. I've mostly sent this because it may include valuable feedback on how well the ref storage backends works from trying to use it to change how git namespaces work. Introduction I

[PATCH 2/7] Add git_configset_add_standard

This exposes implementation details of repo_read_config so a configset can be populated with a repository's standard config, without needing to create a full repository. This allows config lookup to use the same codepath whether the repository is ready or not, which allows it to be used during

Re: [PATCH 1/9] Convert pack-objects to size_t

On 13/08/17 19:30, Martin Koegler wrote: > On Sat, Aug 12, 2017 at 02:47:25PM +0100, Ramsay Jones wrote: >> On 32-bit Linux, off_t is 64-bit and size_t is 32-bit. > > --- t.c --- > #include > #include > > int main() > { > printf("%d %d\n", sizeof(size_t), sizeof(off_t)); > } > >

RE: TREAT URGENT !!

Hello. I am Dr. Mallon Liam, an Engineer with ExxonMobil in United Kingdom http://www.exxonmobil.co.uk). I got your contact address from an associate working with the British Export Promotion Council. Before I continue, let me stress that I am NOT contacting you for financial assistance. I am

Re: gitk -m ?

Not sure what you are wanting to achieve, but please make sure neither `gitk PATHSPEC` nor `gitk --all PATHSPEC` are presenting you enough information. > On 3 Aug 2017, at 19:37, Burkhardt, Glenn B UTAS > wrote: > > I've been looking in 'gitk' for an option that

[PATCH] stash: prevent warning about null bytes in input

The no_changes function calls the untracked_files function through command substitution. untracked_files will return null bytes because it runs ls-files with the '-z' option. Bash since version 4.4 warns about these null bytes. As they are not required for the test that is being done, remove null

Fast Loans

Do you need a loan to pay up bill or to start a business? Email Us

Re: Bug when stashing previously-ignored file plus associated .gitignore change

On Fri, Aug 11, 2017 at 04:55:38PM +0100, Sam Partington wrote: > Hi there, > > I'm running git 2.7.4 on Ubuntu 16.04. I've found a couple of > problems when "un-ignoring" files in tandem with git stash. > > Here's how to reproduce: > > Say you have a project using git, with a .gitignore file

[PATCH/RFC 2/2] File commited with CRLF should roundtrip diff and apply

From: Torsten Bögershausen When a file had been commited with CRLF and core.autocrlf is true, the following does not roundtrip, `git apply` fails: printf "Added line\r\n" >>file && git diff >patch && git checkout -- . && git apply patch Before applying the patch, the file from

[PATCH/RFC 1/2] convert: Add SAFE_CRLF_KEEP_CRLF

From: Torsten Bögershausen When convert_to_git() is called, the caller may want to keep CRLF to be kept as CRLF (and not converted into LF). This will be used in the next commit, when apply works with files that have CRLF and patches are applied onto these files. Add the new

[PATCH] doc: clarify "config --bool" behaviour with empty values

`git config --bool xxx.yyy` returns `true` for `[xxx]yyy` but `false` for `[xxx]yyy=` or `[xxx]yyy=""`. This is tested in t1300-repo-config.sh since 09bc098c2. Signed-off-by: Andreas Heiduk --- Documentation/config.txt | 3 ++- Documentation/git.txt| 3 ++- 2 files