[PATCH 12/22] environment.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- environment.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.c b/environment.c index 2a6de2330b..d129c4adc5 100644 --- a/environment.c +++ b/environment.c @@ -147,7 +147,7 @@ static char *expand_namespace(const char *raw

[PATCH 22/22] transport-helper.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t5801-remote-helpers.sh | 8 ++-- transport-helper.c| 89 --- 2 files changed, 49 insertions(+), 48 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 362b1581e0..e3bc53b0c7

[PATCH 20/22] sha1-file.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- sha1-file.c | 110 ++-- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/sha1-file.c b/sha1-file.c index 555e780f4b..ab055181ec 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -71,17 +71,17 @@ sta

[PATCH 19/22] sequencer.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- sequencer.c | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/sequencer.c b/sequencer.c index cca968043e..1802b49626 100644 --- a/sequencer.c +++ b/sequencer.c @@ -714,7 +714,7 @@ static const char *read_author

[PATCH 06/22] builtin/replace.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/replace.c | 90 +++ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 6da2411e14..c203534fd3 100644 --- a/builtin/replace.c +++ b/builtin/replace.c

[PATCH 18/22] replace-object.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- replace-object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/replace-object.c b/replace-object.c index 801b5c1678..ddc1546b8c 100644 --- a/replace-object.c +++ b/replace-object.c @@ -17,7 +17,7 @@ static int register_replace_re

[PATCH 16/22] refs.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c| 40 +-- t/t1400-update-ref.sh | 20 +++--- t/t1404-update-ref-errors.sh | 4 +-- t/t3210-pack-refs.sh | 2 +- t/t3310-notes-merge-manual-reso

[PATCH 15/22] pkt-line.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- pkt-line.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkt-line.c b/pkt-line.c index a593c08aad..04d10bbd03 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -101,7 +101,7 @@ int packet_flush_gently(int fd) {

Re: [PATCH v3 09/20] commit-graph: verify corrupt OID fanout and lookup

On Thu, May 24, 2018 at 6:25 PM, Derrick Stolee wrote: > + if (i && oidcmp(&prev_oid, &cur_oid) >= 0) > + graph_report("commit-graph has incorrect OID order: > %s then %s", > +oid_to_hex(&prev_oid), > +

Re: [PATCH v4] json_writer: new routines to create data in JSON format

On Mon, Mar 26, 2018 at 4:31 PM, wrote: > +static inline void assert_in_array(const struct json_writer *jw) > +{ > + if (!jw->open_stack.len) > + die("json-writer: array: missing jw_array_begin()"); When you reroll, please consider marking all these string for translation wit

Re: [PATCH] branch: issue "-l" deprecation warning after pager starts

On Fri, May 25, 2018 at 4:40 AM, Jeff King wrote: > -- >8 -- > Subject: [PATCH] branch: customize "-l" warning in list mode > > People mistakenly use "git branch -l", thinking that it > triggers list mode. It doesn't, but the lack of non-option > arguments in that command does (and the "-l" become

Re: [PATCH/RFC/BUG] unpack-trees.c: do not use "the_index"

On Fri, Jun 1, 2018 at 8:51 PM, Stefan Beller wrote: > On Fri, Jun 1, 2018 at 11:34 AM, Elijah Newren wrote: > >>> +/* Do not use the_index here, you probably want o->src_index */ >>> +#define the_index the_index_should_not_be_used here >> >> Good call. > > Is the space instead of the underscore

Re: [PATCH/RFC/BUG] unpack-trees.c: do not use "the_index"

On Fri, Jun 1, 2018 at 8:34 PM, Elijah Newren wrote: > Hi, > > On Fri, Jun 1, 2018 at 9:11 AM, Nguyễn Thái Ngọc Duy > wrote: >> unpack-trees code works on multiple indexes specified in >> unpack_trees_options. Although they normally all refer to the_index at >> the call site, that is the caller'

Re: [PATCH v4] json_writer: new routines to create data in JSON format

On Sat, Jun 02, 2018 at 06:41:06AM +0200, Duy Nguyen wrote: > On Mon, Mar 26, 2018 at 4:31 PM, wrote: > > +static inline void assert_in_array(const struct json_writer *jw) > > +{ > > + if (!jw->open_stack.len) > > + die("json-writer: array: missing jw_array_begin()"); > > Wh

Re: [PATCH] upload-pack: reject shallow requests that would return nothing

On Mon, May 28, 2018 at 8:48 PM, Duy Nguyen wrote: > On Mon, May 28, 2018 at 7:55 AM, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> To avoid this, if rev-list returns nothing, we abort the clone/fetch. >>> The user could adjust their request (e.g. --shallow-since further back >>>

Re: [PATCH 02/22] archive-zip.c: mark more strings for translation

On Sat, Jun 2, 2018 at 6:32 AM, Nguyễn Thái Ngọc Duy wrote: > if (pathlen > 0x) { > - return error("path too long (%d chars, SHA1: %s): %s", > + return error(_("path too long (%d chars, SHA1: %s): %s"), > (int)pathlen, oid_to_

Re: [PATCH v3] fast-export: fix regression skipping some merge-commits

On Fri, Jun 1, 2018 at 9:41 PM, Isaac Chou wrote: > Hello, I need help on this topic again. I need to inform our customers what > release this issue will be addressed in. I checked the 2.17.1 binary release > recently and found that the fix is not included. Can someone help me with > that in

Re: [RFC] git gc "--prune=now" semantics considered harmful

On Sun, May 27, 2018 at 08:31:14AM +0900, Junio C Hamano wrote: > > So I actually would much prefer that foir git gc, "--prune=now" means > > > > (a) "now" > > > > (b) now at the _start_ of the "git gc" operation, not the time at > > the _end_ of the operation when we've already spent a min

Re: does a new repo actually *need* default template content?

On Mon, May 28, 2018 at 07:56:12PM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Mon, May 28 2018, Robert P. J. Day wrote: > > > (apologies for more pedantic nitpickery, just little things i'm > > running across in my travels. aside: i actually teach git courses, so > > it's a bit embarrassing

What's cooking in git.git (Jun 2018, #01; Fri, 1)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes described

[PATCH 0/1] git-p4: add options --commit and --disable-rebase

On a daily work with multiple local git branches, the usual way to submit only a specified commit was to cherry-pick the commit on master then run git-p4 submit. It can be very annoying to switch between local branches and master, only to submit one commit. The proposed new way is to select directl

[PATCH 1/1] git-p4: add options --commit and --disable-rebase

On a daily work with multiple local git branches, the usual way to submit only a specified commit was to cherry-pick the commit on master then run git-p4 submit. It can be very annoying to switch between local branches and master, only to submit one commit. The proposed new way is to select directl

Re: [PATCH v4 8/9] checkout: add advice for ambiguous "checkout "

On Thu, May 31, 2018 at 3:52 PM, Ævar Arnfjörð Bjarmason wrote: > As the "checkout" documentation describes: > > If is not found but there does exist a tracking branch in > exactly one remote (call it ) with a matching name, treat > as equivalent to [...] / > This is a really useful f

Re: [PATCH v4 9/9] checkout & worktree: introduce checkout.defaultRemote

On Thu, May 31, 2018 at 5:49 PM, Stefan Beller wrote: >> I considered splitting this into checkout.defaultRemote and >> worktree.defaultRemote, but it's probably less confusing to break our >> own rules that anything shared between config should live in core.* >> than have two config settings, and

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi team, especially Stefan: your thorough investigation about a better name than range-diff gives me confidence that my decision to retract my objection against has merit: it seems to be by far the one name that everybody but me agrees on. And I can adapt easily. On Sat, 26 May 2018, Øyvind Rønni

Re: [PATCH v2 12/18] branch-diff: use color for the commit pairs

Hi Todd, On Mon, 7 May 2018, Todd Zullinger wrote: > Johannes Schindelin wrote: > > > > On Sat, 5 May 2018, Todd Zullinger wrote: > > > >>> @@ -430,6 +451,8 @@ int cmd_branch_diff(int argc, const char **argv, > >>> const char *prefix) > >>> struct string_list branch1 = STRING_LIST_INIT_DUP;

Re: [PATCH 02/18] Add a new builtin: branch-diff

Hi Ramsay, On Wed, 9 May 2018, Ramsay Jones wrote: > On 05/05/18 20:41, Johannes Schindelin wrote: > [snip] > > [Sorry for the late reply - still catching up after (long weekend) > UK public holiday] > > > Well, what I would want to do is let the cloud work for me. By adding an > > automated bu

Re: [PATCH 00/18] Add `branch-diff`, a `tbdiff` lookalike

Hi Junio, On Tue, 22 May 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> In the picture, the three pre-context lines that are all indented by > >> a HT are prefixed by a SP, and that is prefixed by a '+' sign of the > >> outer diff. > > > > Yep, that's exactly it. > > > > The w

Re: [PATCH 3/3] submodule--helper: plug mem leak in print_default_remote

Hi Stefan, On Thu, 31 May 2018, Stefan Beller wrote: > On Thu, May 31, 2018 at 5:07 AM, Johannes Schindelin > wrote: > > Hi Stefan, > > > > On Wed, 30 May 2018, Stefan Beller wrote: > > > >> Signed-off-by: Stefan Beller > >> --- > >> builtin/submodule--helper.c | 1 + > >> 1 file changed, 1 in

Re: [GSoC][PATCH 0/2] rebase -i: rewrite append_todo_help() in C

On 31/05/18 20:25, Alban Gruin wrote: Hi Phillip, Le 31/05/2018 à 19:48, Phillip Wood a écrit : Hi Alban, it's great to see you working on this On 31/05/18 12:01, Alban Gruin wrote: This series rewrites append_todo_help() from shell to C. This is part of the effort to rewrite interactive reba

Re: [GSoC][PATCH 0/2] rebase -i: rewrite append_todo_help() in C

On 31/05/18 19:44, Stefan Beller wrote: On Thu, May 31, 2018 at 10:48 AM, Phillip Wood wrote: Hi Alban, it's great to see you working on this On 31/05/18 12:01, Alban Gruin wrote: This series rewrites append_todo_help() from shell to C. This is part of the effort to rewrite interactive rebase

Re: [PATCH v4 9/9] checkout & worktree: introduce checkout.defaultRemote

On Thu, May 31 2018, Stefan Beller wrote: > Hi Ævar, > > Sorry for chiming in late. I have a couple of thoughts: > >> ( >> cd /tmp && >> rm -rf tbdiff && >> git clone g...@github.com:trast/tbdiff.git && >> cd tbdiff && >> git branch -m topic && >>

Re: [PATCH v4 8/9] checkout: add advice for ambiguous "checkout "

On Fri, Jun 01 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> @@ -1269,6 +1270,16 @@ int cmd_checkout(int argc, const char **argv, const >> char *prefix) >> if (opts.patch_mode || opts.pathspec.nr) { >> int ret = checkout_paths(&opts, new_branch_info.name

Re: [PATCH v4 8/9] checkout: add advice for ambiguous "checkout "

On Fri, Jun 01 2018, Junio C Hamano wrote: > Junio C Hamano writes: > >> Ævar Arnfjörð Bjarmason writes: >> >>> @@ -1269,6 +1270,16 @@ int cmd_checkout(int argc, const char **argv, const >>> char *prefix) >>> if (opts.patch_mode || opts.pathspec.nr) { >>> int ret = checkout_p

Re: [PATCH v4 3/9] checkout.[ch]: move struct declaration into *.h

On Fri, Jun 01 2018, Junio C Hamano wrote: > Thomas Gummerer writes: > >> We seem to have plenty of structs defined in '.c' files, if they are >> only needed there. Its use also seems to be single purpose for the >> callback data, so I'm a bit puzzled how having this in a header file >> instea

Re: [RFC] git gc "--prune=now" semantics considered harmful

On Fri, Jun 1, 2018 at 2:04 AM Jeff King wrote: > > We'd also accept relative times like "5.minutes.ago" (in fact, the > default is a relative 2.weeks.ago, though it's long enough that the > difference between "2 weeks" and "2 weeks plus 5 minutes" may not matter > much). So we probably ought to j

Re: [PATCH] t9104: kosherly remove remote refs

Hi Chris, On Fri, 1 Jun 2018, Christian Couder wrote: > As there are plans to implement other ref storage systems, > let's use a way to remove remote refs that does not depend > on refs being files. > > This makes it clear to readers that this test does not > depend on which ref backend is used.

Assalamu`Alaikum.

Dear Sir/Madam. Assalamu`Alaikum. I am Dr mohammad ouattara, I have ($14.6 Million us dollars) to transfer into your account, I will send you more details about this deal and the procedures to follow when I receive a positive response from you, Have a great day, Dr mohammad ouattara.

ds/generation-numbers (was Re: What's cooking in git.git (Jun 2018, #01; Fri, 1))

On 6/1/2018 3:21 AM, Junio C Hamano wrote: * ds/commit-graph-lockfile-fix (2018-05-22) 1 commit (merged to 'next' on 2018-05-24 at 3d12a02b0c) + commit-graph: fix UX issue when .lock file exists (this branch is used by ds/commit-graph-fsck; uses ds/generation-numbers.) Update to ds/gen

Re: [RFC PATCH 4/6] commit-graph: avoid writing when repo is shallow

On 5/31/2018 10:30 PM, Junio C Hamano wrote: Derrick Stolee writes: Shallow clones do not interact well with the commit-graph feature for several reasons. Instead of doing the hard thing to fix those interactions, instead prevent reading or writing a commit-graph file for shallow repositories.

Re: does a new repo actually *need* default template content?

On Fri, Jun 01, 2018 at 03:06:10AM -0400, Jeff King wrote: > On Mon, May 28, 2018 at 07:56:12PM +0200, Ævar Arnfjörð Bjarmason wrote: > > > > > On Mon, May 28 2018, Robert P. J. Day wrote: > > > > > (apologies for more pedantic nitpickery, just little things i'm > > > running across in my trav

[PATCH/RFC/BUG] unpack-trees.c: do not use "the_index"

unpack-trees code works on multiple indexes specified in unpack_trees_options. Although they normally all refer to the_index at the call site, that is the caller's business. unpack-trees.c should not make any assumption about that and should use the correct index field in unpack_trees_options. Thi

t5318-commit-graph.sh breaks travis gettext poison job

In case you're not checking travis, [1] reports Test Summary Report --- t5318-commit-graph.sh(Wstat: 256 Tests: 62 Failed: 2) Failed tests: 61-62 Non-zero exit status: 1 This usually means you're grepping an i18n string [1] https://travis-ci.org/g

Re: t5318-commit-graph.sh breaks travis gettext poison job

On 6/1/2018 12:17 PM, Duy Nguyen wrote: In case you're not checking travis, [1] reports Test Summary Report --- t5318-commit-graph.sh(Wstat: 256 Tests: 62 Failed: 2) Failed tests: 61-62 Non-zero exit status: 1 This usually means you're grepping

Email Address: atmmaster...@gmail.com

Get Your Bank Atm Card, I Prepare Card That Worth Huge Amount Of Money Loaded In The Card Is $3,000.000m Us Dollars, With This Card You Can Make Maximum Withdrawals Of $500 Us Dollars Daily From Any Atm Machine In Your Country. Mr. Bouzou Tour, Manager Director Atm Card Department, Email Addre

[PATCH v2] sequencer: ensure labels that are object IDs are rewritten

When writing the todo script for --rebase-merges, we try to find a label for certain commits. If the label ends up being a valid object ID, such as when we merge a detached commit, we want to rewrite it so it is no longer a valid object ID. However, the code path that does this checks for its len

[PATCH] add -p: fix counting empty context lines in edited patches

From: Phillip Wood recount_edited_hunk() introduced in commit 2b8ea7f3c7 ("add -p: calculate offset delta for edited patches", 2018-03-05) required all context lines to start with a space, empty lines are not counted. This was intended to avoid any recounting problems if the user had introduced e

Re: [PATCH/RFC/BUG] unpack-trees.c: do not use "the_index"

Hi, On Fri, Jun 1, 2018 at 9:11 AM, Nguyễn Thái Ngọc Duy wrote: > unpack-trees code works on multiple indexes specified in > unpack_trees_options. Although they normally all refer to the_index at > the call site, that is the caller's business. unpack-trees.c should > not make any assumption about

Hello

My name is Lisa i saw your email today when i was searching for someone i can trust and let know more about me and i became interested in you, i will also like to know you the more, I believe we can move from here! I am waiting for your mail. and I have vital information you need to know. Please,

Re: [PATCH/RFC/BUG] unpack-trees.c: do not use "the_index"

On Fri, Jun 1, 2018 at 11:34 AM, Elijah Newren wrote: >> +/* Do not use the_index here, you probably want o->src_index */ >> +#define the_index the_index_should_not_be_used here > > Good call. Is the space instead of the underscore between the last two words intentional?

Re: [PATCH v2] sequencer: ensure labels that are object IDs are rewritten

Hi Brian, On Fri, 1 Jun 2018, brian m. carlson wrote: > When writing the todo script for --rebase-merges, we try to find a label > for certain commits. If the label ends up being a valid object ID, such > as when we merge a detached commit, we want to rewrite it so it is no > longer a valid obje

Re: [PATCH] add -p: fix counting empty context lines in edited patches

On Fri, Jun 1, 2018 at 10:46 AM, Phillip Wood wrote: > From: Phillip Wood > > recount_edited_hunk() introduced in commit 2b8ea7f3c7 ("add -p: > calculate offset delta for edited patches", 2018-03-05) required all > context lines to start with a space, empty lines are not counted. This > was inten

Re: [PATCH v3 5/7] mem-pool: fill out functionality

> @@ -108,3 +108,43 @@ void *mem_pool_calloc(struct mem_pool *mem_pool, size_t > count, size_t size) > memset(r, 0, len); > return r; > } > + > +int mem_pool_contains(struct mem_pool *mem_pool, void *mem) > +{ > + struct mp_block *p; > + > + /* Check if memory is alloc

Re: [PATCH 5/5] refspec.c: use rhs in parse_refspec instead of potentially uninitialized item->dst

On Thu, May 31, 2018 at 7:46 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Perhaps a better fisx is to explicitly assign NULL to item->dst when >> we see there is no right-hand-side. > > -- >8 -- > Subject: [PATCH] refspec-api: avoid uninitialized field in refspec item > > When parse_re

Re: [PATCH v4 1/9] checkout tests: index should be clean after dwim checkout

On Fri, Jun 01 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Assert that whenever there's a DWIM checkout that the index should be >> clean afterwards, in addition to the correct branch being checked-out. >> ... >> So let's amend the tests (mostly added in) 399e4a1c56 ("t2

Re: [GSoC][PATCH 0/2] rebase -i: rewrite append_todo_help() in C

> Thanks for the explanation, I see what you're trying to do. I don't have a > strong feeling either way, I can see the potential advantage but as it > changes strings that are currently translated I'm not sure it is cost free. > Do you know how the translators feel about the change as they're the

RE: [PATCH v3] fast-export: fix regression skipping some merge-commits

Hello, I need help on this topic again. I need to inform our customers what release this issue will be addressed in. I checked the 2.17.1 binary release recently and found that the fix is not included. Can someone help me with that information or point me to a document that I can use to deter

Re: [PATCH v4 8/9] checkout: add advice for ambiguous "checkout "

On Fri, Jun 01 2018, Eric Sunshine wrote: > On Thu, May 31, 2018 at 3:52 PM, Ævar Arnfjörð Bjarmason > wrote: >> As the "checkout" documentation describes: >> >> If is not found but there does exist a tracking branch in >> exactly one remote (call it ) with a matching name, treat >>

[PATCH 2/2] sequencer.c: plug mem leak in git_sequencer_config

Signed-off-by: Stefan Beller --- sequencer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sequencer.c b/sequencer.c index b98690ecd41..aba03e9429a 100644 --- a/sequencer.c +++ b/sequencer.c @@ -175,6 +175,7 @@ static int git_sequencer_config(const char *k, const char *v, void *cb)

[PATCH 1/2] sequencer.c: plug leaks in do_pick_commit

Going to leave, we additionally free the author and commit message and make sure to call update_abort_safety_file(). Signed-off-by: Stefan Beller --- This patch can apply on master. This is a follow up from https://public-inbox.org/git/nycvar.qro.7.76.6.1805311402210...@tvgsbejvaqbjf.bet/

Re: [PATCH] add -p: fix counting empty context lines in edited patches

On Fri, Jun 1, 2018 at 1:46 PM, Phillip Wood wrote: > recount_edited_hunk() introduced in commit 2b8ea7f3c7 ("add -p: > calculate offset delta for edited patches", 2018-03-05) required all > context lines to start with a space, empty lines are not counted. This > was intended to avoid any recounti

Re: What's cooking in git.git (Jun 2018, #01; Fri, 1)

> * jm/cache-entry-from-mem-pool (2018-05-24) 7 commits > - block alloc: add validations around cache_entry lifecyle > - block alloc: allocate cache entries from mem_pool > - mem-pool: fill out functionality > - mem-pool: add lifecycle management functions > - mem-pool: only search head block

how exactly can git config section names contain periods?

more oddities in my travels, this from Doc.../config.txt: "The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.`

RE: how exactly can git config section names contain periods?

> -Original Message- > From: git-ow...@vger.kernel.org On Behalf > Of Robert P. J. Day > Sent: June 1, 2018 4:14 PM > To: Git Mailing list > Subject: how exactly can git config section names contain periods? > > > more oddities in my travels, this from Doc.../config.txt: > > "The fil

Re: how exactly can git config section names contain periods?

On Fri, Jun 01, 2018 at 04:14:12PM -0400, Robert P. J. Day wrote: > more oddities in my travels, this from Doc.../config.txt: > > "The file consists of sections and variables. A section begins with > the name of the section in square brackets and continues until the > next section begins. Sec

[PATCH v5 3/8] checkout.[ch]: introduce an *_INIT macro

Add an *_INIT macro for the tracking_name_data similar to what exists elsewhere in the codebase, e.g. OID_ARRAY_INIT in sha1-array.h. This will make it more idiomatic in later changes to add more fields to the struct & its initialization macro. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout

[PATCH v5 8/8] checkout & worktree: introduce checkout.defaultRemote

Introduce a checkout.defaultRemote setting which can be used to designate a remote to prefer (via checkout.defaultRemote=origin) when running e.g. "git checkout master" to mean origin/master, even though there's other remotes that have the "master" branch. I want this because it's very handy to us

[PATCH v5 4/8] checkout.[ch]: change "unique" member to "num_matches"

Internally track how many matches we find in the check_tracking_name() callback. Nothing uses this now, but it will be made use of in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checkout.c b/che

[PATCH v5 5/8] checkout: pass the "num_matches" up to callers

Pass the previously added "num_matches" struct value up to the callers of unique_tracking_name(). This will allow callers to optionally print better error messages in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/checkout.c | 10 +++--- builtin/worktree.c | 4 ++-- chec

[PATCH v5 2/8] checkout.h: wrap the arguments to unique_tracking_name()

The line was too long already, and will be longer still when a later change adds another argument. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkout.h b/checkout.h index 9980711179..4cd4cd1c23 100644 --- a/checkou

[PATCH v5 6/8] builtin/checkout.c: use "ret" variable for return

There is no point in doing this right now, but in later change the "ret" variable will be inspected. This change makes that meaningful change smaller. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/checkout.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin

[PATCH v5 1/8] checkout tests: index should be clean after dwim checkout

Assert that whenever there's a DWIM checkout that the index should be clean afterwards, in addition to the correct branch being checked-out. The way the DWIM checkout code in checkout.[ch] works is by looping over all remotes, and for each remote trying to find if a given reference name only exist

[PATCH v5 7/8] checkout: add advice for ambiguous "checkout "

As the "checkout" documentation describes: If is not found but there does exist a tracking branch in exactly one remote (call it ) with a matching name, treat as equivalent to [...] / Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 7 +++ advice.c

[PATCH v5 0/8] ambiguous checkout UI & checkout.defaultRemote

This v5 should address all the comments to v4. Thanks all! It's one patch less because the struct isn't being moved around anymore. tbdiff: 1: 16d656ee3b ! 1: ab4529d9f5 checkout tests: index should be clean after dwim checkout @@ -29,6 +29,10 @@ "checkout", that's b

Re: how exactly can git config section names contain periods?

On Fri, 1 Jun 2018, Jeff King wrote: > This is mentioned later: > > There is also a deprecated [section.subsection] syntax. With this > syntax, the subsection name is converted to lower-case and is also > compared case sensitively. These subsection names follow the same > restrictions as s

Re: [PATCH v5 3/8] checkout.[ch]: introduce an *_INIT macro

On Fri, Jun 1, 2018 at 5:10 PM, Ævar Arnfjörð Bjarmason wrote: > checkout.[ch]: introduce an *_INIT macro checkout.c: introduce... > Add an *_INIT macro for the tracking_name_data similar to what exists > elsewhere in the codebase, e.g. OID_ARRAY_INIT in sha1-array.h. This > will make it more

Re: [PATCH v5 4/8] checkout.[ch]: change "unique" member to "num_matches"

On Fri, Jun 1, 2018 at 5:10 PM, Ævar Arnfjörð Bjarmason wrote: > checkout.[ch]: change "unique" member to "num_matches" checkout.c: change... > Internally track how many matches we find in the check_tracking_name() > callback. Nothing uses this now, but it will be made use of in a later > ch

Re: [PATCH v5 7/8] checkout: add advice for ambiguous "checkout "

On Fri, Jun 1, 2018 at 5:10 PM, Ævar Arnfjörð Bjarmason wrote: > As the "checkout" documentation describes: > > If is not found but there does exist a tracking branch in > exactly one remote (call it ) with a matching name, treat > as equivalent to [...] / > This is a really useful fe

Re: how exactly can git config section names contain periods?

Jeff King writes: > Syntactically we do allow: > > [foo.bar] > key = true > > in the config file, which should equivalent to: > > [foo "bar"] > key = true > > This is mentioned later: > > There is also a deprecated [section.subsection] syntax. With this > syntax, the subsection name i

Re: ds/generation-numbers (was Re: What's cooking in git.git (Jun 2018, #01; Fri, 1))

Derrick Stolee writes: >> A recently added "commit-graph" datafile has learned to store >> pre-computed generation numbers to speed up the decisions to stop >> history traversal. >> >> Will cook in 'next'. > > On Wednesday, these were marked as "Will merge to 'master'" What changed? Nothi

Re: [PATCH v3 12/20] commit-graph: verify parent list

Derrick Stolee writes: > The commit-graph file stores parents in a two-column portion of the > commit data chunk. If there is only one parent, then the second column > stores 0x to indicate no second parent. All right, it is certainly nice to have this information, but isn't it something

Re: how exactly can git config section names contain periods?

On Sat, Jun 02, 2018 at 08:05:22AM +0900, Junio C Hamano wrote: > > This has been deprecated since 2011. Maybe it's time to finally get rid > > of it. > > Sure, but is it worth the transition noise? > > The way we lightly utter the word "deprecated" around here probably > does not align well wit

Re: ds/generation-numbers (was Re: What's cooking in git.git (Jun 2018, #01; Fri, 1))

On 6/1/2018 7:15 PM, Junio C Hamano wrote: Derrick Stolee writes: A recently added "commit-graph" datafile has learned to store pre-computed generation numbers to speed up the decisions to stop history traversal. Will cook in 'next'. On Wednesday, these were marked as "Will merge

[PATCH 00/22] Mark more strings for translation

I originally wanted to have a look regularly at what's in 'pu', catch translatable strings that are not marked so and ask for updates. But I failed horribly at that, so for this cycle I just looked at all the changes between the last release and master and marked strings. This series probably won'

[PATCH 01/22] archive-tar.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- archive-tar.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/archive-tar.c b/archive-tar.c index b6f58ddf38..68e72d9176 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -121,7 +121,7 @@ static int stream_blocked(const stru

[PATCH 02/22] archive-zip.c: mark more strings for translation

One 'P' is lower cased because we normally start an error message with lowercase. Signed-off-by: Nguyễn Thái Ngọc Duy --- archive-zip.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/archive-zip.c b/archive-zip.c index 74f3fe9103..7ad46d8854 100644 --- a/archi

[PATCH 03/22] builtin/config.c: mark more strings for translation

There are also some minor adjustments in the strings. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/config.c | 48 +-- t/t1308-config-set.sh | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/builtin/config.c b/builtin/config.

[PATCH 14/22] object.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- object.c| 10 +- t/t1450-fsck.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/object.c b/object.c index f7f4de3aaf..c20ea782f1 100644 --- a/object.c +++ b/object.c @@ -51,7 +51,7 @@ int type_from_string_gently(cons

[PATCH 05/22] builtin/pack-objects.c: mark more strings for translation

Most of these are straight forward. GETTEXT_POISON does catch the last string in cmd_pack_objects(), but since this is --progress output, it's not supposed to be machine-readable. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 108 + t/t5

[PATCH 09/22] connect.c: mark more strings for translation

There are also some rephrasing and breaking sentences to help translators. Signed-off-by: Nguyễn Thái Ngọc Duy --- connect.c | 87 +++ t/t5512-ls-remote.sh | 2 +- t/t5570-git-daemon.sh | 6 +-- 3 files changed, 51 insertions(+), 44 deletion

[PATCH 07/22] commit-graph.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- commit-graph.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index 4c6127088f..5a300535b2 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -76,28 +76,28 @@ struct commit_graph *

[PATCH 04/22] builtin/grep.c: mark strings for translation and no full stops

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/grep.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index ee753a403e..58f941e951 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -489,7 +489,7 @@ static int grep_cache(struct gr

[PATCH 08/22] config.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- config.c | 76 +++ t/t1305-config-include.sh | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/config.c b/config.c index fbbf0f8e9f..80eae290e9 100644 --- a/config.c +++ b/config.c

[PATCH 13/22] exec-cmd.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- exec-cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exec-cmd.c b/exec-cmd.c index 02d31ee897..4f81f44310 100644 --- a/exec-cmd.c +++ b/exec-cmd.c @@ -358,7 +358,7 @@ int execl_git_cmd(const char *cmd, ...) } va_end

[PATCH 21/22] transport.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- transport.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/transport.c b/transport.c index a32da30dee..516a83b7f6 100644 --- a/transport.c +++ b/transport.c @@ -139,7 +139,7 @@ static struct ref *get_refs_from_bundle(

[PATCH 17/22] refspec.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- refspec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refspec.c b/refspec.c index ada7854f7a..1266e509c2 100644 --- a/refspec.c +++ b/refspec.c @@ -127,7 +127,7 @@ void refspec_item_init(struct refspec_item *item, const char *refspe

[PATCH 11/22] dir.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- dir.c | 8 t/t3005-ls-files-relative.sh | 4 ++-- t/t7063-status-untracked-cache.sh | 2 +- t/t7400-submodule-basic.sh| 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dir.c b/dir.c inde

[PATCH 10/22] convert.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- convert.c | 42 ++ t/t0021-conversion.sh | 2 +- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/convert.c b/convert.c index 64d0d30e08..e53911d4f8 100644 --- a/convert.c +++ b/convert.c