Re: I suggest a new feature: One copy from files

On Sun, Apr 23, 2017 at 8:47 PM, Rm Beer wrote: > I have a several directories with binary files datas that is discard > by .gitignore. > > I recommend make a new .gitonecopy or .gitonelog or something that > take the directories with only 1 copy of last updated and not take >

Re: [PATCH v4 0/9] Introduce timestamp_t for timestamps

On Sun, Apr 23, 2017 at 8:29 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Changes since v3: >> >> - fixed the fix in archive-zip.c that tried to report a too large >> timestamp (and would have reported the uninitialized time_t

Re: [PATCH 00/53] object_id part 8

"brian m. carlson" writes: > This is the eighth series of patches to convert unsigned char [20] to > struct object_id. This series converts lookup_commit, lookup_blob, > lookup_tree, lookup_tag, and finally parse_object to struct object_id. > > A small number of

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

From: "Johannes Schindelin" Hi Hannes, On Sat, 22 Apr 2017, Johannes Sixt wrote: Am 21.04.2017 um 14:29 schrieb Christian Couder: > First bisect should ask you to test merge bases only if there are > "good" commits that are not ancestors of the "bad" commit.

[PATCH v3 5/5] archive-zip: support files bigger than 4GB

Write a zip64 extended information extra field for big files as part of their local headers and as part of their central directory headers. Also write a zip64 version of the data descriptor in that case. If we're streaming then we don't know the compressed size at the time we write the header.

Re: [PATCH 11/53] fast-import: convert to struct object_id

On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson wrote: > Convert the remaining parts of fast-import.c to use struct object_id. > Convert several instances of get_sha1_hex to parse_oid_hex to avoid > needing to specify constants. Convert other hardcoded values to

[PATCH v3 2/5] archive-zip: use strbuf for ZIP directory

Keep the ZIP central director, which is written after all archive entries, in a strbuf instead of a custom-managed buffer. It contains binary data, so we can't (and don't want to) use the full range of strbuf functions and we don't need the terminating NUL, but the result is shorter and simpler

Re: Submodule/contents conflict

On Mon, Apr 24, 2017 at 1:06 AM, Orgad Shaneh wrote: > Hi, > > I've noticed a strange behavior with submodule/content conflict. My > current Git version is 2.12.2, but the problem exists since I > remember. > > Branch A has a submodule. > In branch B which diverged from A, I

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); + if (offset > 0x) { + zip64_dir_extra_payload_size += 8; + zip_dir_extra_size += 2 + 2 +

[PATCH v3 3/5] archive-zip: write ZIP dir entry directly to strbuf

Write all fields of the ZIP directory record for an archive entry in the right order directly into the strbuf instead of taking a detour through a struct. Do that at end, when we have all necessary data like checksum and compressed size. The fields are documented just as well, the code becomes

Re: [PATCH v3 05/12] refs: move submodule slash stripping code to get_submodule_ref_store

On Fri, Apr 21, 2017 at 10:27 PM, Michael Haggerty wrote: > On 04/19/2017 01:01 PM, Nguyễn Thái Ngọc Duy wrote: >> This is a better place that will benefit all submodule callers instead >> of just resolve_gitlink_ref() >> >> Signed-off-by: Nguyễn Thái Ngọc Duy

Re: minor typos in documentation

On Sun, Apr 23, 2017 at 9:22 AM, René Genz wrote: > Hi Stefan, > > I submitted the patch to the mailing list. Thanks for following through. :) > Based on my experience I submitted another patch to improve the > documentation. Thanks for improving the documentation how

[PATCH v3 1/5] archive-zip: add tests for big ZIP archives

Test the creation of ZIP archives bigger than 4GB and containing files bigger than 4GB. They are marked as EXPENSIVE because they take quite a while and because the first one needs a bit more than 4GB of disk space to store the resulting archive. The big archive in the first test is made up of a

Re: [PATCH v2] completion: optionally disable checkout DWIM

On 04/21, Jeff King wrote: > > When we complete branch names for "git checkout", we also > complete remote branch names that could trigger the DWIM > behavior. Depending on your workflow and project, this can > be either convenient or annoying. > > For instance, my clone of gitster.git contains

[PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

The first patch adds (expensive) tests, the next two are cleanups which set the stage for the remaining two to actually implement zip64 support for offsets and file sizes. Half of the series had been laying around for months, half-finished and forgotten because I got distracted by the holiday

[PATCH v3 4/5] archive-zip: support archives bigger than 4GB

Add a zip64 extended information extra field to the central directory and emit the zip64 end of central directory records as well as locator if the offset of an entry within the archive exceeds 4GB. Signed-off-by: Rene Scharfe --- archive-zip.c | 32

Re: [PATCH 00/53] object_id part 8

On 04/23, brian m. carlson wrote: > This is the eighth series of patches to convert unsigned char [20] to > struct object_id. This series converts lookup_commit, lookup_blob, > lookup_tree, lookup_tag, and finally parse_object to struct object_id. > > A small number of functions have temporaries

Re: t0025 flaky on OSX

On 2017-04-24 18:45, Lars Schneider wrote: > Hi, > > "t0025.3 - crlf=true causes a CRLF file to be normalized" failed > sporadically on next and master recently: > https://travis-ci.org/git/git/jobs/225084459#L2382 > https://travis-ci.org/git/git/jobs/223830505#L2342 > > Are you aware of a

Re: [PATCH v7] read-cache: force_verify_index_checksum

Am 14.04.2017 um 22:32 schrieb g...@jeffhostetler.com: diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 33a51c9..677e15a 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -689,4 +689,17 @@ test_expect_success 'bogus head does not fallback to all heads' ' ! grep $blob out '

Re: [GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

On Mon, Apr 24, 2017 at 3:11 PM, Ramsay Jones wrote: > > > On 24/04/17 21:03, Stefan Beller wrote: > [snip] > >> + >> + argv_array_pushf(_array, "name=%s", sub->name); >> + argv_array_pushf(_array, "path=%s", displaypath); >> + argv_array_pushf(_array, "sm_path=%s",

Re: [PATCH 11/53] fast-import: convert to struct object_id

On Mon, Apr 24, 2017 at 10:20:27AM -0700, Stefan Beller wrote: > On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson > wrote: > > Signed-off-by: brian m. carlson > > --- > > > @@ -2823,12 +2821,10 @@ static void parse_new_commit(const

[PATCH 1/2] fast-export: deletion action first

The delete operations of the fast-export output should precede any addition belonging to the same commit, Addition and deletion with the same name entry could happen in case of file to directory and viceversa. The fast-export sorting was added in 060df62 (fast-export: Fix output order of D/F

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c

"Extra Opportunity"/2017/TL

Do You Commute To Work Daily With Your Car,Do You Love Driving ? Sunoco Oil Will Remunerate You With $400 Weekly To Place An AD On Your Vehicle. Respond For More information... Respectfully, Antonio Conte Sunoco Oil Inc®

Re: [PATCH v6 12/11] run-command: don't try to execute directories

Brandon Williams writes: > This is due to only checking 'access()' when locating an executable in > PATH, which doesn't distinguish between files and directories. Instead > use 'stat()' and check that the path is to a regular file. Now > run-command won't try to execute the

Re: [GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

On 24/04/17 23:17, Stefan Beller wrote: > On Mon, Apr 24, 2017 at 3:11 PM, Ramsay Jones > wrote: >> >> >> On 24/04/17 21:03, Stefan Beller wrote: >> [snip] >> >>> + >>> + argv_array_pushf(_array, "name=%s", sub->name); >>> + argv_array_pushf(_array, "path=%s",

Re: Submodule/contents conflict

From: "Stefan Beller" On Mon, Apr 24, 2017 at 1:06 AM, Orgad Shaneh wrote: Hi, I've noticed a strange behavior with submodule/content conflict. My current Git version is 2.12.2, but the problem exists since I remember. Branch A has a submodule. In

[PATCH v6 12/11] run-command: don't try to execute directories

In some situations run-command will incorrectly try (and fail) to execute a directory instead of an executable. For example: Lets suppose a user has PATH=~/bin (where 'bin' is a directory) and they happen to have another directory inside 'bin' named 'git-remote-blah'. Then git tries to execute

Re: [PATCH v6 12/11] run-command: don't try to execute directories

Brandon Williams wrote: > In some situations run-command will incorrectly try (and fail) to > execute a directory instead of an executable. For example: > > Lets suppose a user has PATH=~/bin (where 'bin' is a directory) and they > happen to have another directory inside 'bin' named

Re: [PATCH] Documentation/git-checkout: make doc. of checkout clearer

Christoph Michelbach writes: > I'm sorry, somehow my email client deleted half of your message when I saved > it > when replying. I only noticed this when wanting to delete your email and > noticed > that it was pretty long. Please separate your discussion from the

Re: [PATCH 13/53] notes-cache: convert to struct object_id

On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson wrote: > Convert as many instances of unsigned char [20] as possible, Update the s/Update/update/ or s/,/./ Side remark: In all patches up to now you put a space between the char and the [20] (or [40]), which is

Re: Submodule/contents conflict

On Mon, Apr 24, 2017 at 4:33 PM, Philip Oakley wrote: > This is almost the same as just reported by 'vvs' [1] > https://public-inbox.org/git/CAM1zWBtfgHT=pT0pidQo1HD=dfrxlg3gnauvs0vzkvyfg1b...@mail.gmail.com/, > originally on the 'git user' list >

Re: I suggest a new feature: One copy from files

On Mon, Apr 24, 2017 at 4:47 PM, Rm Beer wrote: > 2017-04-24 3:13 GMT-03:00 Jacob Keller : >> So, clearly you haven't defined the request very well. It *sounds* >> like what you want is the ability to say "git please store and >> copy/send this file to

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

Ævar Arnfjörð Bjarmason writes: > Is getting the results of these builds time-critical? If not perhaps > an acceptable solution would be to use a source repo that's > time-delayed, e.g. 24hrs behind on average from Junio's git.git, and > where commits are pushed in at some

Re: [GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

On 24/04/17 21:03, Stefan Beller wrote: [snip] > + > + argv_array_pushf(_array, "name=%s", sub->name); > + argv_array_pushf(_array, "path=%s", displaypath); > + argv_array_pushf(_array, "sm_path=%s", displaypath); > > You mention keeping 'sm_path' in the notes after the commit message. I would

Re: [BUG] test suite broken with GIT_TEST_SPLIT_INDEX

On 04/21, Christian Couder wrote: > On Thu, Apr 20, 2017 at 11:24 PM, Thomas Gummerer > wrote: > > On 04/20, Christian Couder wrote: > >> > >> Could you try with the following patch: > >> > >> http://public-inbox.org/git/20170330210354.20018-1-chrisc...@tuxfamily.org/ > > >

Re: [PATCH v6 00/11] forking and threading

On 04/19, Brandon Williams wrote: > Changes in v6: > * fix some windows compat issues > * better comment on the string_list_remove function (also marked extern) > > Brandon Williams (10): > t5550: use write_script to generate post-update hook > t0061: run_command executes scripts without a #!

[PATCH] submodule_init: die cleanly on submodules without url defined

When we init a submodule, we try to die when it has no URL defined: url = xstrdup(sub->url); if (!url) die(...); But that's clearly nonsense. xstrdup() will never return NULL, and if sub->url is NULL, we'll segfault. These two bits of code need to be flipped, so we check sub->url

Re: [PATCH 0/2] perf: show that wildmatch() regressed for pathological cases in v2.0

On Mon, Apr 24, 2017 at 11:34 PM, Brandon Williams wrote: > On 04/24, Ęvar Arnfjörš Bjarmason wrote: >> Russ Cox just published an article about how various glob() >> implementations suffer from pathological performance when fed certain >> pathological patterns like "a*a*a*a*b"

Re: [PATCH 28/53] Convert remaining callers of lookup_blob to object_id

On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson wrote: > All but a few callers of lookup_blob have been converted to struct > object_id. Introduce a temporary, which will be removed later, into > parse_object to ease the transition, and convert the remaining

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c

[PATCH 1/2] fast-export: deletion action first

The delete operations of the fast-export output should precede any addition belonging to the same commit, Addition and deletion with the same name entry could happen in case of file to directory and viceversa. The fast-export sorting was added in 060df62 (fast-export: Fix output order of D/F

[PATCH 1/2] fast-export: deletion action first

The delete operations of the fast-export output should precede any addition belonging to the same commit, Addition and deletion with the same name entry could happen in case of file to directory and viceversa. The fast-export sorting was added in 060df62 (fast-export: Fix output order of D/F

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c

Re: [PATCH v2] archive-zip: Add zip64 headers when file size is too large for 32 bits

Johannes Sixt: There is no "zip64 central directory". There is a "zip64 end of central directory record"; Not strange that I was confused and couldn't find it, then... :-) All right, I need to fix up my patch to make sure I add the zip64 extra record to both the central directory entry and

Re: [PATCH] tests: fix tests broken under GETTEXT_POISON=YesPlease

On Mon, Apr 24, 2017 at 3:15 AM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> The GETTEXT_POISON=YesPlease compile-time testing option added in my >> bb946bba76 ("i18n: add GETTEXT_POISON to simulate unfriendly >> translator", 2011-02-22) has

Congratulations Beneficiary.

Compliment of the season, how are you doing and your family. This is to bring to your notice that I have finally made arrangement with the issuing bank that will transfer your total fund sum of US$12.000,000.00 ( Twelve Million USD) from the head office BENIN REPUBLIC to your nominated bank

Re: [PATCH] test-lib: abort when can't remove trash directory

On Sun, Apr 23, 2017 at 09:02:41PM -0700, Junio C Hamano wrote: > >> That looks fine, assuming the answer to the "is the cwd important" > >> question is "no". > > > > And I do think the answer would be "yes", unfortunately. There are > > systems that do not even allow a file to be removed while

Re: [PATCH] test-lib: abort when can't remove trash directory

On Mon, Apr 24, 2017 at 11:39:26AM +0200, Torsten Bögershausen wrote: > [] > > > > > > - cd "$(dirname "$remove_trash")" && > > > - rm -rf "$(basename "$remove_trash")" || > > > - error "Tests passed but test cleanup failed; aborting" > > > + cd "$(dirname

Re: [PATCH] test-lib: abort when can't remove trash directory

[] - cd "$(dirname "$remove_trash")" && - rm -rf "$(basename "$remove_trash")" || - error "Tests passed but test cleanup failed; aborting" + cd "$(dirname "$TRASH_DIRECTORY")" && + rm -fr "$TRASH_DIRECTORY" ||

Submodule/contents conflict

Hi, I've noticed a strange behavior with submodule/content conflict. My current Git version is 2.12.2, but the problem exists since I remember. Branch A has a submodule. In branch B which diverged from A, I replaced the submodule with its contents. Now, every time I merge A into B, and A had

[PATCH v5 1/6] environment.c: fix potential segfault by get_git_common_dir()

setup_git_env() must be called before this function to initialize git_common_dir so that it returns a non NULL string. And it must return a non NULL string or segfault can happen because all callers expect so. It does not do so explicitly though and depends on get_git_dir() being called first

[PATCH v5 4/6] refs: introduce get_worktree_ref_store()

files-backend at this point is still aware of the per-repo/worktree separation in refs, so it can handle a linked worktree. Some refs operations are known not working when current files-backend is used in a linked worktree (e.g. reflog). Tests will be written when refs_* functions start to be

[PATCH v5 5/6] worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()

The manual parsing code is replaced with a call to refs_resolve_ref_unsafe(). The manual parsing code must die because only refs/files-backend.c should do that. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- branch.c

[PATCH v5 3/6] refs: add REFS_STORE_ALL_CAPS

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 6 +- refs/refs-internal.h | 4 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index 96eba92475..6e6f0ec5be 100644 --- a/refs.c +++ b/refs.c @@ -1526,11 +1526,7 @@ struct

[PATCH v5 6/6] refs: kill set_worktree_head_symref()

70999e9cec (branch -m: update all per-worktree HEADs - 2016-03-27) added this function in order to update HEADs of all relevant worktrees, when a branch is renamed. It, as a public ref api, kind of breaks abstraction when it uses internal functions of files backend. With the introduction of

[PATCH v5 0/6] Kill manual ref parsing code in worktree.c

v5 chanes are mostly cosmetic: diff --git a/refs.c b/refs.c index 5d31fb6bcf..7972720256 100644 --- a/refs.c +++ b/refs.c @@ -1530,11 +1530,7 @@ struct ref_store *get_main_ref_store(void) if (main_ref_store) return main_ref_store; - main_ref_store =

Re: Feature request: --format=json

On Mon, Apr 24, 2017 at 3:33 PM, shawn wilson wrote: > Late to the party, but I too would also like json format output (mainly so I > could pipe stuff to jq instead of looking at the man page for which %thing > I'm looking for). That said, it's not at the PR level of want for

[PATCH v5 2/6] refs.c: make submodule ref store hashmap generic

This removes the "submodule" from submodule_hash_entry and other function names. The goal is to reuse the same code and data structure for other ref store types. The first one is worktree ref stores. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Re: [PATCH v7] read-cache: force_verify_index_checksum

On 4/24/2017 1:26 PM, Johannes Sixt wrote: Am 14.04.2017 um 22:32 schrieb g...@jeffhostetler.com: diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 33a51c9..677e15a 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -689,4 +689,17 @@ test_expect_success 'bogus head does not fallback to

Re: [GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

> The First function module_foreach first parses the options present in s/First/first/ > The second function also takes care of the recursive flag, by creating > a saperate child_process structure and prepending "--super-prefix > displaypath", s/saperate/separate > Additional env variable

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

Am 24.04.2017 um 20:24 schrieb Peter Krefting: René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); +if (offset > 0x) { +zip64_dir_extra_payload_size += 8; +zip_dir_extra_size += 2 + 2 +

Re: [BUG] test suite broken with GETTEXT_POISON=YesPlease

On Mon, Apr 24, 2017 at 08:22:36PM +0700, Duy Nguyen wrote: > Off topic, is it possible to receive mail notifications from Travis > when a fault is found in either 'pu', 'next' or 'master'? I know how > to do it in Jenkins, but I'm not familiar with Travis and there's no > obvious button from the

Re: [PATCH v6 3/8] convert: Split start_multi_file_filter into two separate functions

On 4/24/2017 12:31 AM, Junio C Hamano wrote: Ben Peart writes: Subject: [PATCH v6 3/8] convert: Split start_multi_file_filter into two separate functions Two minor nits, because the capital after ":" looks ugly in shortlog output, and having () there makes it easier to

Re: [PATCH 0/2] perf: show that wildmatch() regressed for pathological cases in v2.0

On 04/24, Ævar Arnfjörð Bjarmason wrote: > Russ Cox just published an article about how various glob() > implementations suffer from pathological performance when fed certain > pathological patterns like "a*a*a*a*b" given a file like "aaa...": > https://research.swtch.com/glob > > I was

Re: [PATCH v6 1/8] pkt-line: add packet_read_line_gently()

On 4/24/2017 12:21 AM, Junio C Hamano wrote: Ben Peart writes: Add packet_read_line_gently() to enable reading a line without dying on EOF. Signed-off-by: Ben Peart --- pkt-line.c | 14 +- pkt-line.h | 10 ++ 2 files

URGENT ALERT WARNING NOTIFICATION

Dear Webmail User, Due to excess abandoned Webmail Account, Our Webmaster has decided to refresh the database and to delete inactive accounts to create space for fresh users. To verify your Webmail Account, you must reply to this email immediately and provide the information below correctly:

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

Am 24.04.2017 um 22:06 schrieb René Scharfe: Am 24.04.2017 um 20:24 schrieb Peter Krefting: René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); +if (offset > 0x) { +zip64_dir_extra_payload_size +=

[PATCH 1/2] perf: add function to setup a fresh test repo

Add a function to setup a fresh test repo via 'git init' to compliment the existing functions to copy over a normal & large repo. Some performance tests don't need any existing repository data at all to be significant, e.g. tests which stress glob matches against revisions or files, which I'm

[PATCH 2/2] perf: add test showing exponential growth in path globbing

Add a test showing that ls-files times grow exponentially in the face of some pathological globs, whereas refglobs via for-each-ref don't in practice suffer from the same issue. As noted in the test description this is a test to see whether Git suffers from the issue noted in an article Russ Cox

[PATCH 0/2] perf: show that wildmatch() regressed for pathological cases in v2.0

Russ Cox just published an article about how various glob() implementations suffer from pathological performance when fed certain pathological patterns like "a*a*a*a*b" given a file like "aaa...": https://research.swtch.com/glob I was curious to see if this impacted git. It turns out it does.

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

Am 24.04.2017 um 23:02 schrieb Johannes Sixt: Am 24.04.2017 um 22:06 schrieb René Scharfe: Am 24.04.2017 um 20:24 schrieb Peter Krefting: René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); +if (offset >

Re: [PATCH] rebase -i: add config to abbreviate command name

Hi Liam, On Sun, 23 Apr 2017, Liam Beguin wrote: > Add the 'rebase.abbrevCmd' boolean config option to allow > the user to abbreviate the default command name while editing > the 'git-rebase-todo' file. This patch does not handle the `git rebase --edit-todo` subcommand. Intentional? Ciao,

Re: [PATCH] cache-tree: reject entries with null sha1

On Mon, Apr 24, 2017 at 05:39:33PM +0700, Duy Nguyen wrote: > > When merged to pu, this fixes the existing test breakage in t7009 when > > GIT_TEST_SPLIT_INDEX is used (because the split index didn't rewrite the > > whole index, "git rm --cached" didn't always barf). > > Latest 'pu' has your

Re: [PATCH v4 0/9] Introduce timestamp_t for timestamps

On Sun, Apr 23, 2017 at 08:29:11PM -0700, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Changes since v3: > > > > - fixed the fix in archive-zip.c that tried to report a too large > > timestamp (and would have reported the uninitialized time_t instead)

Re: [PATCH v2] archive-zip: Add zip64 headers when file size is too large for 32 bits

Am 24.04.2017 um 10:04 schrieb Peter Krefting: Johannes Sixt: There is no "zip64 central directory". There is a "zip64 end of central directory record"; Not strange that I was confused and couldn't find it, then... :-) All right, I need to fix up my patch to make sure I add the zip64 extra

Re: [PATCH 1/5] add SWAP macro

On Sat, Jan 28, 2017 at 10:38:21PM +0100, René Scharfe wrote: > diff --git a/git-compat-util.h b/git-compat-util.h > index 87237b092b..66cd466eea 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -527,6 +527,16 @@ static inline int ends_with(const char *str, const char > *suffix) >

Re: [PATCH] cache-tree: reject entries with null sha1

On Sat, Apr 22, 2017 at 1:46 AM, Jeff King wrote: > We generally disallow null sha1s from entering the index, > due to 4337b5856 (do not write null sha1s to on-disk index, > 2012-07-28). However, we loosened that in 83bd7437c > (write_index: optionally allow broken null sha1s, >

Re: [PATCH] Documentation/git-checkout: make doc. of checkout clearer

On Sun, 2017-04-23 at 18:55 -0700, Junio C Hamano wrote: > Christoph Michelbach writes: > > From: Christoph Michelbach > > Date: Sat, 22 Apr 2017 18:49:57 +0200 > > Subject: [PATCH] Doc./git-checkout: correct doc. of checkout > > ... > > > > The

Re: [PATCH v4 8/9] Use uintmax_t for timestamps

Hi Junio, On Sun, 23 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Previously, we used `unsigned long` for timestamps. This was only a > > good choice on Linux, where we know implicitly that `unsigned long` is > > what is used for `time_t`. > >

Re: Feature request: --format=json

On Mon, Apr 24, 2017 at 5:28 AM, Duy Nguyen wrote: > On Mon, Apr 24, 2017 at 3:33 PM, shawn wilson wrote: >> Late to the party, but I too would also like json format output (mainly so I >> could pipe stuff to jq instead of looking at the man page for which

Re: [PATCH] rebase -i: add config to abbreviate command name

Hi, On Mon, 2017-04-24 at 12:26 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 23 Apr 2017, Liam Beguin wrote: > > > Add the 'rebase.abbrevCmd' boolean config option to allow > > the user to abbreviate the default command name while editing > > the 'git-rebase-todo' file. > > This

Re: [PATCH 1/6] worktree.c: add validate_worktree()

On Fri, Apr 21, 2017 at 9:16 AM, Junio C Hamano wrote: >> +int validate_worktree(const struct worktree *wt, int quiet) >> +{ >> + struct strbuf sb = STRBUF_INIT; >> + char *path; >> + int err, ret; >> + >> + if (is_main_worktree(wt)) { >> + /* >> +

Inquiries about the use of captured images etc.

to whom it may concern I will excuse you with a sudden message. I, Succeeded Entertainment Division, I am Kenta Suzuki. Git image and capture screen, I'd like to get a license but is it possible? Currently at our site, An article that briefly introduces Git, I am planning to make it. Because

Re: [PATCH 1/5] add SWAP macro

On Mon, Apr 24, 2017 at 07:29:28AM -0400, Jeff King wrote: > A related question is whether the caller should ever be asking to swap > something with itself. This particular case[1] comes from > prio_queue_reverse(). I suspect its "<=" could become a "<", but I > haven't thought it through

Re: [PATCH] rebase -i: add config to abbreviate command name

On Sun, Apr 23, 2017 at 11:23:47PM -0400, Liam Beguin wrote: > Add the 'rebase.abbrevCmd' boolean config option to allow > the user to abbreviate the default command name while editing > the 'git-rebase-todo' file. Just reading this, I was confused about what the patch actually did. Reading the

Re: [PATCH] Documentation/git-checkout: make doc. of checkout clearer

I'm sorry, somehow my email client deleted half of your message when I saved it when replying. I only noticed this when wanting to delete your email and noticed that it was pretty long. On Sun, 2017-04-23 at 18:55

Re: [PATCH v4 0/9] Introduce timestamp_t for timestamps

Hi Jacob, On Sun, 23 Apr 2017, Jacob Keller wrote: > On Sun, Apr 23, 2017 at 8:29 PM, Junio C Hamano wrote: > > Johannes Schindelin writes: > > > >> Changes since v3: > >> > >> - fixed the fix in archive-zip.c that tried to report a too large > >>

Re: [PATCH 1/5] add SWAP macro

On Mon, Apr 24, 2017 at 6:49 PM, Jeff King wrote: > diff --git a/prio-queue.c b/prio-queue.c > index 17252d231..fc3860fdc 100644 > --- a/prio-queue.c > +++ b/prio-queue.c > @@ -21,7 +21,7 @@ void prio_queue_reverse(struct prio_queue *queue) > > if (queue->compare != NULL) >

Re: [BUG] test suite broken with GETTEXT_POISON=YesPlease

On Fri, Apr 21, 2017 at 9:54 PM, Lars Schneider wrote: > >> Am 20.04.2017 um 23:58 schrieb Ævar Arnfjörð Bjarmason : >> >> As a refresh of everyone's memory (because mine needed it). This is a >> feature I added back in 2011 when the i18n support was

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

Hi Christian, On Sat, 22 Apr 2017, Christian Couder wrote: > On Sat, Apr 22, 2017 at 1:48 PM, Johannes Schindelin > wrote: > >> > >> First bisect should ask you to test merge bases only if there are > >> "good" commits that are not ancestors of the "bad" commit. > >

[PATCH v5 0/8] Introduce timestamp_t for timestamps

Git v2.9.2 was released in a hurry to accomodate for platforms like Windows, where the `unsigned long` data type is 32-bit even for 64-bit setups. The quick fix was to simply disable all the testing with "absurd" future dates. However, we can do much better than that, as we already make use of

Re: [PATCH v4 7/9] Abort if the system time cannot handle one of our timestamps

Hi Junio, On Sun, 23 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/date.c b/date.c > > index 92ab31aa441..75f6335cd09 100644 > > --- a/date.c > > +++ b/date.c > > @@ -46,7 +46,10 @@ static time_t gm_time_t(timestamp_t time, int tz)

Re: [PATCH v4 0/9] Introduce timestamp_t for timestamps

Hi Junio, On Sun, 23 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Changes since v3: > > > > - fixed the fix in archive-zip.c that tried to report a too large > > timestamp (and would have reported the uninitialized time_t instead) > > > > -

[PATCH v5 4/8] Specify explicitly where we parse timestamps

Currently, Git's source code represents all timestamps as `unsigned long`. In preparation for using a more appropriate data type, let's introduce a symbol `parse_timestamp` (currently being defined to `strtoul`) where appropriate, so that we can later easily switch to, say, use `strtoull()`

[PATCH v5 5/8] Introduce a new "printf format" for timestamps

Currently, Git's source code treats all timestamps as if they were unsigned longs. Therefore, it is okay to write "%lu" when printing them. There is a substantial problem with that, though: at least on Windows, time_t is *larger* than unsigned long, and hence we will want to switch away from the

[PATCH v5 6/8] Introduce a new data type for timestamps

Git's source code assumes that unsigned long is at least as precise as time_t. Which is incorrect, and causes a lot of problems, in particular where unsigned long is only 32-bit (notably on Windows, even in 64-bit versions). So let's just use a more appropriate data type instead. In preparation

[PATCH v5 3/8] t0006 & t5000: skip "far in the future" test when time_t is too limited

Git's source code refers to timestamps as unsigned long, which is ill-defined, as there is no guarantee about the number of bits that data type has. In preparation of switching to another data type that is large enough to hold "far in the future" dates, we need to prepare the t0006-date.sh script

[PATCH v5 1/8] ref-filter: avoid using `unsigned long` for catch-all data type

In its `atom_value` struct, the ref-filter source code wants to store different values in a field called `ul` (for `unsigned long`), e.g. timestamps. However, as we are about to switch the data type of timestamps away from `unsigned long` (because it may be 32-bit even when `time_t` is 64-bit),

[PATCH v5 2/8] t0006 & t5000: prepare for 64-bit timestamps

Git's source code refers to timestamps as unsigned longs. On 32-bit platforms, as well as on Windows, unsigned long is not large enough to capture dates that are "absurdly far in the future". It is perfectly valid by the C standard, of course, for the `long` data type to refer to 32-bit integers.

  1   2   >