[PATCH] http-push: workaround for format overflow warning in gcc >= 9

2019-05-09 Thread Carlo Marcelo Arenas Belón
In function 'finish_request', inlined from 'process_response' at http-push.c:248:2: http-push.c:587:4: warning: '%s' directive argument is null [-Wformat-overflow=] 587 |fprintf(stderr, "Unable to get pack file %s\n%s", |^ 588 |

Re: en/fast-export-encoding, was Re: What's cooking in git.git (May 2019, #01; Thu, 9)

2019-05-09 Thread Johannes Sixt
Am 10.05.19 um 02:14 schrieb Elijah Newren: > Hi Johannes, > > On Thu, May 9, 2019 at 1:46 PM Johannes Schindelin > wrote: >> >> Hi Junio & Elijah, >> >> On Thu, 9 May 2019, Junio C Hamano wrote: >> >>> * en/fast-export-encoding (2019-05-07) 5 commits >>> - fast-export: do automatic reencoding o

Re: Proposal: Remembering message IDs sent with git send-email

2019-05-09 Thread Drew DeVault
On 2019-05-09 11:51 AM, Emily Shaffer wrote: > I'm still not sure I see the value of the extra header proposed here. > I'd appreciate an explanation of how you think it would be used, Drew. I'm not just thinking about your run of the mill mail reader, but also mail readers which are aware of git a

Re: [PATCH v2] status: add an empty line when there is no hint

2019-05-09 Thread 林自均
Hi Junio, 林自均 於 2019年5月3日 週五 下午12:15寫道: > > Hi Brian, > > brian m. carlson 於 2019年5月3日 週五 上午7:15寫道: > > > > On Thu, May 02, 2019 at 08:35:23AM +0800, 林自均 wrote: > > > Thank you for the support! I'll be very happy if my patch can get into > > > the code base. Is there any improvement I can make f

[PATCH] doc/gitattributes: add Octave

2019-05-09 Thread Boxuan Li
`matlab` pattern is also suitable for source code in the GNU Octave language. Signed-off-by: Boxuan Li --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 4fb20cd0e9..1b283

Re: en/fast-export-encoding, was Re: What's cooking in git.git (May 2019, #01; Thu, 9)

2019-05-09 Thread Elijah Newren
Hi Johannes, On Thu, May 9, 2019 at 1:46 PM Johannes Schindelin wrote: > > Hi Junio & Elijah, > > On Thu, 9 May 2019, Junio C Hamano wrote: > > > * en/fast-export-encoding (2019-05-07) 5 commits > > - fast-export: do automatic reencoding of commit messages only if requested > > - fast-export: d

Re: [PATCH v3 3/3] send-email: do defaults -> config -> getopt in that order

2019-05-09 Thread brian m. carlson
On Thu, May 09, 2019 at 01:48:30PM +0200, Ævar Arnfjörð Bjarmason wrote: > @@ -363,6 +371,11 @@ sub read_config { > } > } > > +$identity = Git::config(@repo, "sendemail.identity"); > +read_config("sendemail.$identity") if defined $identity; > +read_config("sendemail"); > +read_config("send

Re: How to exchange rerere/redo resolutions?

2019-05-09 Thread Ævar Arnfjörð Bjarmason
On Fri, May 10 2019, Philip Oakley wrote: > Is there a mechanism for exchanging the rerere resolutions, so that > future fixups, e.g. future clashes on pu rather than master, can be > sent with patch series? > > My current use case that there is a large patch [1] for updating long > to size_t fo

How to exchange rerere/redo resolutions?

2019-05-09 Thread Philip Oakley
Hi, Is there a mechanism for exchanging the rerere resolutions, so that future fixups, e.g. future clashes on pu rather than master, can be sent with patch series? My current use case that there is a large patch [1] for updating long to size_t for use on Windows, which notes that it will hav

Re: [PATCH 0/4] gc docs: modernize and fix the documentation

2019-05-09 Thread Ævar Arnfjörð Bjarmason
On Tue, May 07 2019, Jeff King wrote: > On Mon, May 06, 2019 at 11:44:06AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> Maybe there's some case I haven't thought of that makes this stupid, but >> I wonder if something like a "gc quarantine" might be a fix fo both of >> the the issues you noted abo

Re: [PATCH 12/17] Documentation: describe split commit-graphs

2019-05-09 Thread Ævar Arnfjörð Bjarmason
On Thu, May 09 2019, Derrick Stolee wrote: > On 5/9/2019 11:48 AM, Ævar Arnfjörð Bjarmason wrote: >> >> On Thu, May 09 2019, Derrick Stolee wrote: >> [snip] >>> >>> I still don't think this is a problem, with the idea below. >>> > 4. It would be helpful to add a new optional chunk that cont

[PATCH 14/14] verify-commit: simplify parameters to run_gpg_verify()

2019-05-09 Thread Jeff King
The buf/len parameters of run_gpg_verify() have never been used since the function was added in d07b00b7f3 (verify-commit: scriptable commit signature verification, 2014-06-23). Instead, check_commit_signature() accesses the commit struct directly. Worse, we read the whole object just to check its

[PATCH 07/14] mktree: drop unused length parameter

2019-05-09 Thread Jeff King
The mktree_line() function does not actually look at the "len" parameter it is passed, and assumes the buffer it receives is NUL-terminated. Since the caller always passes a strbuf, this will be true. Let's drop the useless parameter. Signed-off-by: Jeff King --- builtin/mktree.c | 4 ++-- 1 fil

[PATCH 08/14] name-rev: drop unused parameters from is_better_name()

2019-05-09 Thread Jeff King
When this function was extracted in 0041bf6544 (name-rev: refactor logic to see if a new candidate is a better name, 2017-03-29), it ended up getting more arguments than it needs. It's possible we may later use these values to evaluate the name, but since it's a static function with a single calle

[PATCH 12/14] rev-list: drop unused void pointer from finish_commit()

2019-05-09 Thread Jeff King
Our finish_commit() function used to be passed directly to the revision machinery as a callback. But after 989937221a (rev-list: fix --verify-objects --quiet becoming --objects, 2012-02-28), it is used only as a helper in show_commit(). It doesn't use its void "data" parameter, and we no longer ha

[PATCH 13/14] show-branch: drop unused parameter from show_independent()

2019-05-09 Thread Jeff King
This ref_name parameter was never used since the inception of show_independent() in 1f8af483df (show-branch: --list and --independent, 2005-09-09). Let's drop it. Signed-off-by: Jeff King --- builtin/show-branch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/show

[PATCH 10/14] receive-pack: drop unused "commands" from prepare_shallow_update()

2019-05-09 Thread Jeff King
We pass in the list of proposed ref updates to prepare_shallow_update(), but that function doesn't actually need it (and never has since its inception in 0a1bc12b6e4). Only its caller, update_shallow_info(), needs to look at the command list. Let's drop the unused parameter to reduce confusion. S

[PATCH 11/14] remove_all_fetch_refspecs(): drop unused "remote" parameter

2019-05-09 Thread Jeff King
This function already takes a "key" parameter which uniquely identifies the config key that we need to remove. There's no need for it to look at the "remote" parameter at all. Let's drop it in the name of simplicity. Signed-off-by: Jeff King --- builtin/remote.c | 4 ++-- 1 file changed, 2 inser

[PATCH 04/14] clone: drop dest parameter from copy_alternates()

2019-05-09 Thread Jeff King
Ever since the inception of this function in e6baf4a1ae (clone: clone from a repository with relative alternates, 2011-08-22), the "dest" parameter has been unused. Instead, we use add_to_alternates_file(), which relies on git_pathdup() to find the right file. That in turn works because we will hav

[PATCH 05/14] read-cache: drop unused parameter from threaded load

2019-05-09 Thread Jeff King
The load_cache_entries_threaded() function takes a src_offset parameter that it doesn't use. This has been there since its inception in 77ff1127a4 (read-cache: load cache entries on worker threads, 2018-10-10). Digging on the mailing list, that parameter was part of an earlier iteration of the ser

[PATCH 06/14] wt-status: drop unused status parameter

2019-05-09 Thread Jeff King
The v2_fix_up_changed() function doesn't actually need to see the wt_status struct. It's possible that could change in the future, but this is a static-local function with one caller. It would be easy to read-add it back then. Let's drop the unused parameter. Signed-off-by: Jeff King --- wt-stat

[PATCH 09/14] pack-objects: drop unused rev_info parameters

2019-05-09 Thread Jeff King
When collecting the list of objects to pack in get_object_list(), we pass our rev_info struct around to some functions that don't need it. This is due to 03a9683d22 (Simplify is_kept_pack(), 2009-02-28), where the kept-pack handling was moved out of the revision machinery. Let's drop these unused

[PATCH 03/14] builtin: consistently pass cmd_* prefix to parse_options

2019-05-09 Thread Jeff King
If a builtin uses RUN_SETUP to request that git.c enter the repository directory, we'll get passed in a "prefix" variable with the path to the original directory. It's important to pass this to parse_options(), since we may use it to fix up relative OPT_FILENAME() options. Some builtins don't both

[PATCH 01/14] cmd_{read,write}_tree: rename "unused" variable that is used

2019-05-09 Thread Jeff King
The "prefix" variable passed by git.c into the builtin cmd_read_tree() and cmd_write_tree() functions is named "unused_prefix". But we do in fact pass it to parse_options(), which may use the prefix to adjust any filename options. Let's get rid of this confusing name. However, we can't just call i

[PATCH 02/14] submodule: drop unused prefix parameter from some functions

2019-05-09 Thread Jeff King
We stopped using the "prefix" parameter of relocate_single_git_dir_into_superproject() and its callers in 202275b96b (submodule.c: get_super_prefix_or_empty, 2017-03-14), where we switched to using the environment global directly. Signed-off-by: Jeff King --- builtin/rm.c| 6 +++

[PATCH 0/14] "final" batch of unused parameter cleanups

2019-05-09 Thread Jeff King
This is a continuation of my efforts to get us compiling with -Wunused-parameter. This round finishes most of the cleanups and fixes I intend to do (though I have a handful of cleanup cases that I'm still poking at to make sure they're not in fact bugs). After that, I have some patches to annotate

nd/merge-quit, was Re: What's cooking in git.git (May 2019, #01; Thu, 9)

2019-05-09 Thread Johannes Schindelin
Hi Junio & Duy, On Thu, 9 May 2019, Junio C Hamano wrote: > * nd/merge-quit (2019-05-07) 2 commits > - merge: add --quit > - merge: remove drop_save() in favor of remove_merge_branch_state() > > "git merge" learned "--quit" option that cleans up the in-progress > merge while leaving the worki

en/fast-export-encoding, was Re: What's cooking in git.git (May 2019, #01; Thu, 9)

2019-05-09 Thread Johannes Schindelin
Hi Junio & Elijah, On Thu, 9 May 2019, Junio C Hamano wrote: > * en/fast-export-encoding (2019-05-07) 5 commits > - fast-export: do automatic reencoding of commit messages only if requested > - fast-export: differentiate between explicitly utf-8 and implicitly utf-8 > - fast-export: avoid stri

Re: Proposal: Remembering message IDs sent with git send-email

2019-05-09 Thread Eric Wong
Drew DeVault wrote: > --in-reply-to=ask doesn't exist, that's what I'm looking to add. This > convenient storage mechanism is exactly what I'm talking about. Sorry > for the confusion. Using Net::NNTP to query NNTP servers using ->xover([recent-ish range]) to scan for Message-IDs and Subjects mat

config file not being copied from templates folder

2019-05-09 Thread Jack Zylkin
The “git init” documentation for the “Template Directory” states that: “Files and directories in the template directory whose name do not start with a dot will be copied to the $GIT_DIR after it is created.” However, I put a file called “config” in this directory, and it was not copied to the .

Re: Proposal: Remembering message IDs sent with git send-email

2019-05-09 Thread Emily Shaffer
On Thu, May 09, 2019 at 12:50:25PM -0400, Drew DeVault wrote: > On 2019-05-08 5:19 PM, Emily Shaffer wrote: > > What I think might be useful (and what I was hoping you were going to > > talk about when I saw the subject line) would be if the Message-Id is > > conveniently stored during `git send-e

Re: Fwd: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows

2019-05-09 Thread Johannes Schindelin
Hi Junio, On Thu, 9 May 2019, Junio C Hamano wrote: > Git Gadget writes: > > > Forwarding this mail to the Git mailing list, as the original did not > > make it there (for reasons unknown). > > It seems that the forwarding mechansim (if this weren't manual---I > cannot tell) mangles whitespaces?

Re: [PATCH v2 2/4] archive-tar: mark RECORDSIZE/BLOCKSIZE as unsigned

2019-05-09 Thread Jeff King
On Thu, May 09, 2019 at 04:06:22PM +0200, Johannes Schindelin wrote: > > I don't this this has anything to do with gcc. The point is that we > > already have this line: > > > > write_or_die(fd, buf, BLOCKSIZE); > > > > which does not cast and nobody has complained, > > I mistook this part of yo

Re: [PATCH v3 3/3] send-email: do defaults -> config -> getopt in that order

2019-05-09 Thread Eric Sunshine
On Thu, May 9, 2019 at 7:48 AM Ævar Arnfjörð Bjarmason wrote: > Change the git-send-email command-line argument parsing and config > reading code to parse those two in the right order. I.e. first we set > our hardcoded defaults, then we read our config, and finally we read > the command-line, with

Re: Proposal: object negotiation for partial clones

2019-05-09 Thread Jonathan Tan
> > On 2019/05/07, at 11:34, Jonathan Tan wrote: > > > > To get an enumeration of available objects, don't you need to use only > > "blob:none"? Combining filters (once that's implemented) will get all > > objects only up to a certain depth. > > > > Combining "tree:" and "blob:none" would allow us

Re: [PATCH v4 00/11] Commit-graph write refactor (was: Create commit-graph file format v2)

2019-05-09 Thread Josh Steadmon
On 2019.05.09 07:22, Derrick Stolee via GitGitGadget wrote: > This series replaces ds/commit-graph-file-v2, and I'm using the same > gitgitgadget PR to continue the version numbers and hopefully make that > clear. This is a slight modification on patches 1-11 from the incremental > file format RFC

Re: [PATCH 2/2] builtin/verify-tag: do not omit gpg on --format

2019-05-09 Thread Santiago Torres Arias
> Now this one's VERBOSE handling is a bit interesting. Previously we'd > set VERBOSE even if we were going to show a format. And then later we > just set the OMIT_STATUS bit, leaving VERBOSE in place: > > > - flags |= GPG_VERIFY_OMIT_STATUS; > > That _usually_ didn't matter because wi

Re: [PATCH 1/2] builtin/tag: do not omit -v gpg out for --format

2019-05-09 Thread Santiago Torres Arias
> So we're going to stop setting OMIT_STATUS ever, which makes sense. > > It took me a minute to figure out here that the behavior for VERBOSE is > not changed, because we _overwrite_ flags, rather than just setting a > single bit. But that's definitely the right thing to do when there's a > forma

Re: [PATCH 12/17] Documentation: describe split commit-graphs

2019-05-09 Thread Derrick Stolee
On 5/9/2019 11:48 AM, Ævar Arnfjörð Bjarmason wrote: > > On Thu, May 09 2019, Derrick Stolee wrote: > [snip] >> >> I still don't think this is a problem, with the idea below. >> 4. It would be helpful to add a new optional chunk that contains the trailing hash for the lower level of

[no subject]

2019-05-09 Thread Rose Kamara
Dear Sir/Madam, My name is Miss Rose Kamara, I came across your email on facebook. This is a confidential mail, I have been diagnosed with Esophageal cancer, It has defied all forms of medical treatment, and Right now, I have only few months to live and I want you to use this Money Nine Million Fiv

Re: Proposal: Remembering message IDs sent with git send-email

2019-05-09 Thread Drew DeVault
On 2019-05-08 5:19 PM, Emily Shaffer wrote: > What I think might be useful (and what I was hoping you were going to > talk about when I saw the subject line) would be if the Message-Id is > conveniently stored during `git send-email` on v1 and somehow saved in a > useful place in order to apply to

Re: [PATCH 12/17] Documentation: describe split commit-graphs

2019-05-09 Thread Ævar Arnfjörð Bjarmason
On Thu, May 09 2019, Derrick Stolee wrote: Not a very detailed reply since I've gotta run soon, but figured I'd send something (also given our timezone difference). > On 5/8/2019 4:11 PM, Ævar Arnfjörð Bjarmason wrote: >> >> On Wed, May 08 2019, Derrick Stolee wrote: >> >>> I'll ignore the impr

Re: [PATCH v2 1/1] rebase: deprecate --preserve-merges

2019-05-09 Thread Johannes Schindelin
Hi Ævar, On Thu, 2 May 2019, Ævar Arnfjörð Bjarmason wrote: > On Mon, Mar 11 2019, Johannes Schindelin via GitGitGadget wrote: > > > From: Johannes Schindelin > > > > @@ -1212,6 +1212,10 @@ int cmd_rebase(int argc, const char **argv, const > > char *prefix) > > usage_with_options(bu

[PATCH v4 10/11] commit-graph: extract copy_oids_to_commits()

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method is too complex, so we are extracting methods one by one. Extract copy_oids_to_commits(), which fills the commits list with the distinct commits from the oids list. During this loop, it also counts the number of "extra" edges from octopus merge

[PATCH v4 06/11] commit-graph: extract fill_oids_from_packs()

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method is too complex, so we are extracting methods one by one. This extracts fill_oids_from_packs() that reads the given pack-file list and fills the oid list in the context. Signed-off-by: Derrick Stolee --- commit-graph.c | 83 +

[PATCH v4 05/11] commit-graph: create write_commit_graph_context

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method is too large and complex. To simplify it, we should extract several small methods. However, we will risk repeating a lot of declarations related to progress incidators and object id or commit lists. Create a new write_commit_graph_context stru

[PATCH v4 08/11] commit-graph: extract fill_oids_from_all_packs()

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method is too complex, so we are extracting methods one by one. Extract fill_oids_from_all_packs() that reads all pack-files for commits and fills the oid list in the context. Signed-off-by: Derrick Stolee --- commit-graph.c | 26 +++--

[PATCH v4 07/11] commit-graph: extract fill_oids_from_commit_hex()

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method is too complex, so we are extracting methods one by one. Extract fill_oids_from_commit_hex() that reads the given commit id list and fille the oid list in the context. Signed-off-by: Derrick Stolee --- commit-graph.c | 72 ++

[PATCH v4 11/11] commit-graph: extract write_commit_graph_file()

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method is too complex, so we are extracting methods one by one. Extract write_commit_graph_file() that takes all of the information in the context struct and writes the data to a commit-graph file. Signed-off-by: Derrick Stolee --- commit-graph.c

[PATCH v4 09/11] commit-graph: extract count_distinct_commits()

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method is too complex, so we are extracting methods one by one. Extract count_distinct_commits(), which sorts the oids list, then iterates through to find duplicates. Signed-off-by: Derrick Stolee --- commit-graph.c | 35 ++

[PATCH v4 04/11] commit-graph: remove Future Work section

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The commit-graph feature began with a long list of planned benefits, most of which are now complete. The future work section has only a few items left. As for making more algorithms aware of generation numbers, some are only waiting for generation number v2 to ensure the per

[PATCH v4 03/11] commit-graph: collapse parameters into flags

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() and write_commit_graph_reachable() methods currently take two boolean parameters: 'append' and 'report_progress'. We will soon expand the possible options to send to these methods, so instead of complicating the parameter list, first simplify it. Col

[PATCH v4 01/11] commit-graph: fix the_repository reference

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The parse_commit_buffer() method takes a repository pointer, so it should not refer to the_repository anymore. Signed-off-by: Derrick Stolee --- commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit.c b/commit.c index a5333c7ac6..e4d1233226 10

[PATCH v4 02/11] commit-graph: return with errors during write

2019-05-09 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method uses die() to report failure and exit when confronted with an unexpected condition. This use of die() in a library function is incorrect and is now replaced by error() statements and an int return type. Now that we use 'goto cleanup' to jump t

[PATCH v4 00/11] Commit-graph write refactor (was: Create commit-graph file format v2)

2019-05-09 Thread Derrick Stolee via GitGitGadget
This series replaces ds/commit-graph-file-v2, and I'm using the same gitgitgadget PR to continue the version numbers and hopefully make that clear. This is a slight modification on patches 1-11 from the incremental file format RFC [0]. The commit-graph feature is growing, thanks to all of the cont

Re: [PATCH 17/17] fetch: add fetch.writeCommitGraph config setting

2019-05-09 Thread Derrick Stolee
On 5/9/2019 4:07 AM, Ævar Arnfjörð Bjarmason wrote: > > So rather than have this patch I'd like to as noted in 00/17 get the > refactoring bits of the commit-graph in first. Refactor-only series coming soon. > Then some version of my WIP patch in > https://public-inbox.org/git/87lfzprkfc@evl

Re: [PATCH v2 2/4] archive-tar: mark RECORDSIZE/BLOCKSIZE as unsigned

2019-05-09 Thread Johannes Schindelin
Hi Peff, On Wed, 8 May 2019, Jeff King wrote: > On Wed, May 08, 2019 at 01:45:25PM +0200, Johannes Schindelin wrote: > > > Hi René, > > > > On Thu, 2 May 2019, René Scharfe wrote: > > > > > Am 27.04.19 um 01:27 schrieb Johannes Schindelin via GitGitGadget: > > > > From: Johannes Schindelin > > >

Re: What's cooking in git.git (May 2019, #01; Thu, 9)

2019-05-09 Thread Duy Nguyen
On Thu, May 9, 2019 at 12:23 AM Junio C Hamano wrote: > > * nd/merge-quit (2019-05-07) 2 commits > - merge: add --quit > - merge: remove drop_save() in favor of remove_merge_branch_state() > > "git merge" learned "--quit" option that cleans up the in-progress > merge while leaving the working

Re: [PATCH 12/17] Documentation: describe split commit-graphs

2019-05-09 Thread Derrick Stolee
On 5/8/2019 4:11 PM, Ævar Arnfjörð Bjarmason wrote: > > On Wed, May 08 2019, Derrick Stolee wrote: > >> I'll ignore the improbability of this turn of events (two writes happening >> during the span of trying to read two files) and focus on the fact that >> we can prevent issues here using the 4th

Re: What's cooking in git.git (May 2019, #01; Thu, 9)

2019-05-09 Thread Phillip Wood
On 08/05/2019 18:23, Junio C Hamano wrote: * pw/rebase-abort-clean-rewritten (2019-05-08) 1 commit - rebase --abort: cleanup refs/rewritten (this branch uses pw/rebase-i-internal.) "git rebase --abort" used to leave refs/rewritten/ when concluding "git rebase -r", which has been correcte

Re: [PATCH] check-non-portable-shell: support Perl versions older than 5.10

2019-05-09 Thread Ævar Arnfjörð Bjarmason
On Thu, May 09 2019, Eric Sunshine wrote: > For thoroughness when checking for one-shot environment variable > assignments at shell function call sites, check-non-portable-shell > stitches together incomplete lines (those ending with backslash). This > allows it to correctly flag such undesirabl

Re: [PATCH 12/17] Documentation: describe split commit-graphs

2019-05-09 Thread Derrick Stolee
On 5/9/2019 12:49 AM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> With commit-graph- all these unlink() race conditions go away, >> partial reads due to concurrent graph writing becomes a non-issue (we'd >> just leave the old files, "gc" deals with them later..), no need to >> ca

From Michelle

2019-05-09 Thread Michelle
Dobrý den, jak to děláte, potřebuji vaši odpověď, prosím Michelle dík

Re: [PATCH 01/19] revision.h: avoid bit fields in struct rev_info

2019-05-09 Thread Derrick Stolee
On 5/9/2019 5:56 AM, Duy Nguyen wrote: > On Wed, May 8, 2019 at 10:52 PM Derrick Stolee wrote: >> >> The biggest issue with my suggestion is that it requires changing the >> consumers of the options, as they would no longer live directly on the >> rev_info struct. That would be a big change, even

Git Test Coverage Report (May 9)

2019-05-09 Thread Derrick Stolee
Here is today's test coverage report. You can view it in HTML [1] or in plain-text [2]. Thanks, -Stolee [1] https://derrickstolee.github.io/git-test-coverage/reports/2019-05-09.htm [2] https://derrickstolee.github.io/git-test-coverage/reports/2019-05-09.txt --- pu ec7b02a06325d60f87d37617f

[PATCH v3 2/3] send-email: rename the @bcclist variable for consistency

2019-05-09 Thread Ævar Arnfjörð Bjarmason
The "to" and "cc" variables are named @initial_{to,cc}, let's rename this one to match them. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-send-email.perl | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 0d87ed2b5d..4

[PATCH v3 1/3] send-email: move the read_config() function above getopts

2019-05-09 Thread Ævar Arnfjörð Bjarmason
This is in preparation for a later change where we'll read the config first before parsing command-line options. As the move detection will show no lines (except one line of comment) is changed here, just moved around. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-send-email.perl | 97 +

[PATCH v3 3/3] send-email: do defaults -> config -> getopt in that order

2019-05-09 Thread Ævar Arnfjörð Bjarmason
Change the git-send-email command-line argument parsing and config reading code to parse those two in the right order. I.e. first we set our hardcoded defaults, then we read our config, and finally we read the command-line, with later sets overriding earlier sets. This fixes a bug introduced in e6

[PATCH v3 0/3] send-email: fix cli->config parsing crazyness

2019-05-09 Thread Ævar Arnfjörð Bjarmason
This is a proposed replacement for Junio's version of the sendemail.transferencoding bugfix. As explained in 3/3 I think the root cause is that we're needlessly doing the config->cli parsing in the wrong order, so let's just fix that. It fixes the bug at hand, and makes the coge less fragile for f

[PATCH] check-non-portable-shell: support Perl versions older than 5.10

2019-05-09 Thread Eric Sunshine
For thoroughness when checking for one-shot environment variable assignments at shell function call sites, check-non-portable-shell stitches together incomplete lines (those ending with backslash). This allows it to correctly flag such undesirable usage even when the variable assignment and functio

[PATCH v2 0/2] nd/merge-quit update

2019-05-09 Thread Nguyễn Thái Ngọc Duy
A couple typos in the commit message. No code change. Nguyễn Thái Ngọc Duy (2): merge: remove drop_save() in favor of remove_merge_branch_state() merge: add --quit Documentation/git-merge.txt | 4 branch.c| 11 --- branch.h| 6 ++ bu

[PATCH v2 2/2] merge: add --quit

2019-05-09 Thread Nguyễn Thái Ngọc Duy
This allows to cancel the current merge without resetting worktree/index, which is what --abort is for. Like other --quit(s), this is often used when you forgot that you're in the middle of a merge and already switched away, doing different things. By the time you've realized, you can't even contin

[PATCH v2 1/2] merge: remove drop_save() in favor of remove_merge_branch_state()

2019-05-09 Thread Nguyễn Thái Ngọc Duy
Both remove_branch_state() and drop_save() delete almost the same set of files about the current merge state. The only difference is MERGE_RR but it should also be cleaned up after a successful merge, which is what drop_save() is for. Make a new function that deletes all merge-related state files

Re: [PATCH 01/19] revision.h: avoid bit fields in struct rev_info

2019-05-09 Thread Duy Nguyen
On Wed, May 8, 2019 at 10:52 PM Derrick Stolee wrote: > > On 5/8/2019 10:41 AM, Duy Nguyen wrote: > > On Wed, May 8, 2019 at 9:07 PM Derrick Stolee wrote: > >> > >> On 5/8/2019 7:12 AM, Nguyễn Thái Ngọc Duy wrote: > >>> Bitfield addresses cannot be passed around in a pointer. This makes it > >>>

Re: Git build on antique PowerMac

2019-05-09 Thread Eric Sunshine
On Wed, May 8, 2019 at 6:28 PM Ævar Arnfjörð Bjarmason wrote: > On Sun, May 05 2019, Eric Sunshine wrote: > > On Sun, May 5, 2019 at 3:43 PM Jeffrey Walton wrote: > >> readline() on unopened filehandle test_must_fail > > > > Given [1], I can see (I guess) why it's complaining about modifica

Re: [PATCH] Improving HP-UX support

2019-05-09 Thread Osipov, Michael
Hey there, Am 2019-05-09 um 09:32 schrieb Ævar Arnfjörð Bjarmason: On Wed, May 08 2019, Osipov, Michael wrote: Hi folks, Hi see Documentation/SubmittingPatches for how to submit patches inline instead of as attachments. Do you want me to resend the configure.ac change as per wiki article?

Re: [PATCH 17/17] fetch: add fetch.writeCommitGraph config setting

2019-05-09 Thread Ævar Arnfjörð Bjarmason
On Wed, May 08 2019, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > Signed-off-by: Derrick Stolee > --- > builtin/fetch.c | 17 + > 1 file changed, 17 insertions(+) > > diff --git a/builtin/fetch.c b/builtin/fetch.c > index b620fd54b4..cf0944bad5 100644 > --

Re: [PATCH 2/2] builtin/verify-tag: do not omit gpg on --format

2019-05-09 Thread Jeff King
On Sat, Apr 27, 2019 at 04:21:23PM -0400, santi...@nyu.edu wrote: > From: Santiago Torres > > The current implementation of git-verify-tag omits the gpg output when > the --format flag is passed. This may not be useful to users that want > to see the gpg output *and* --format the output of git v

Re: [PATCH 1/2] builtin/tag: do not omit -v gpg out for --format

2019-05-09 Thread Jeff King
On Sat, Apr 27, 2019 at 04:21:22PM -0400, santi...@nyu.edu wrote: > From: Santiago Torres > > The current implementation of git tag -v omits the gpg output when the > --format flag is passed. This may not be useful to users that want to > see the gpg output *and* --format the output of the git t

Re: [PATCH] Improving HP-UX support

2019-05-09 Thread Ævar Arnfjörð Bjarmason
On Wed, May 08 2019, Osipov, Michael wrote: > Hi folks, Hi see Documentation/SubmittingPatches for how to submit patches inline instead of as attachments. For the sha1dc change it seems trivially correct, but we import that upstream project as-is, could you please submit a pull request at http

Re: [PATCH 0/1] difftool: --no-index is incompatible with --dir-diff

2019-05-09 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > ... it does not even make sense to combine those two options. The > --dir-diff option exists to enable diff'ing subdirectories of a worktree > while pretending that untracked and ignored files in them do not even exist. Hmph. So there is no poin