Re: [RFC PATCH 0/3] rebase-interactive

{cc:+junio} On Tue, Mar 20, 2018 at 11:31 PM, Wink Saville wrote: > Anyway, I've played around and my current thoughts are to not create > any new files and keep git_rebase__interactive and the new > git_rebase__interactive__preserve_merges functions in >

Re: [PATCH v4 5/5] ref-filter: get_ref_atom_value() error handling

On Tue, Mar 20, 2018 at 6:30 PM, Junio C Hamano <gits...@pobox.com> wrote: > Eric Sunshine <sunsh...@sunshineco.com> writes: >> int ret = 0; >> void *buf = get_obj(oid, obj, , ); >> if (!buf) >> ret = strbuf_error(_("missing objec

Re: [RFC PATCH 0/3] rebase-interactive

On Tue, Mar 20, 2018 at 5:23 PM, Wink Saville <w...@saville.com> wrote: > On Tue, Mar 20, 2018 at 2:11 PM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> A problem with this approach is that it loses "blame" information. A >> git-blame of git-re

Re: [RFC PATCH 0/3] rebase-interactive

On Tue, Mar 20, 2018 at 4:45 PM, Wink Saville wrote: > Patch 0001 creates a library of functions which can be > used by git-rebase--interactive and > git-rebase--interactive--preserve-merges. The functions are > those that exist in git-rebase--interactive.sh plus new > functions

Re: [GSoC][PATCH v6] parse-options: do not show usage upon invalid option value

On Tue, Mar 20, 2018 at 1:50 PM, Paul-Sebastian Ungureanu wrote: > Usually, the usage should be shown only if the user does not know what > options are available. If the user specifies an invalid value, the user > is already aware of the available options. In

Re: [PATCH v4 5/5] ref-filter: get_ref_atom_value() error handling

On Tue, Mar 20, 2018 at 12:05 PM, Olga Telezhnaya wrote: > ref-filter: get_ref_atom_value() error handling This doesn't tell us much about what this patch is doing. Perhaps a better subject would be: ref-filter: libify get_ref_atom_value() > Finish removing die()

Re: [PATCH v4 2/5] ref-filter: add return value && strbuf to handlers

On Tue, Mar 20, 2018 at 12:05 PM, Olga Telezhnaya wrote: > Continue removing die() calls from ref-filter formatting logic, > so that it could be used by other commands. > [...] > Signed-off-by: Olga Telezhnaia > --- > diff --git a/ref-filter.c

Re: [PATCH v4 4/4] worktree: teach "add" to check out existing branches

On Sat, Mar 17, 2018 at 6:22 PM, Thomas Gummerer wrote: > [...] > However we can do a little better than that, and check the branch out if > it is not checked out anywhere else. This will help users who just want > to check an existing branch out into a new worktree, and

Re: [PATCH v4 2/4] worktree: be clearer when "add" dwim-ery kicks in

On Tue, Mar 20, 2018 at 3:26 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Sat, Mar 17, 2018 at 6:22 PM, Thomas Gummerer <t.gumme...@gmail.com> wrote: >> Currently there is no indication in the "git worktree add" output that >> a new branch was crea

Re: [PATCH v4 2/4] worktree: be clearer when "add" dwim-ery kicks in

On Sat, Mar 17, 2018 at 6:22 PM, Thomas Gummerer wrote: > Currently there is no indication in the "git worktree add" output that > a new branch was created. This would be especially useful information > in the case where the dwim of "git worktree add " kicks in, as the >

Re: [PATCH v4 2/4] worktree: be clearer when "add" dwim-ery kicks in

On Sat, Mar 17, 2018 at 6:22 PM, Thomas Gummerer wrote: > Currently there is no indication in the "git worktree add" output that > a new branch was created. This would be especially useful information > in the case where the dwim of "git worktree add " kicks in, as the >

Re: [PATCH v4 1/4] worktree: improve message when creating a new worktree

On Sat, Mar 17, 2018 at 6:22 PM, Thomas Gummerer wrote: > [...] > Fix these inconsistencies, and no longer show the identifier by making > the 'git reset --hard' call quiet, and printing the message directly > from the builtin command instead. > > Signed-off-by: Thomas

Re: [PATCH v6 1/3] Makefile: generate Perl header from template file

On Sun, Mar 18, 2018 at 10:50 PM, Dan Jacques wrote: > Currently, the generated Perl script headers are emitted by commands in > the Makefile. This mechanism restricts options to introduce alternative > header content, needed by Perl runtime prefix support, and obscures the >

Re: user-manual: patch proposals and questions

On Sun, Mar 18, 2018 at 7:49 PM, kalle wrote: > 1.I wonder, why the "user-manual" is so hidden on the (official?) site > git-scm.com [it is accessible at git-scm.com/docs/user-manual ,but is > not viewable in /docs ] The git-scm.com website is maintained as a distinct

Re: [PATCH v2 0/3] git worktree prune improvements

On Thu, Mar 15, 2018 at 12:44 PM, Nguyễn Thái Ngọc Duy wrote: > v2 fixes comments from Eric and rebases on 'master' since 'worktree > move' has been merged. Commit messages are updated to reflect this. Thanks. Aside from a couple minor commit message tweaks (not worth a

Re: [PATCH v2 3/3] worktree prune: improve prune logic when worktree is moved

On Thu, Mar 15, 2018 at 12:44 PM, Nguyễn Thái Ngọc Duy wrote: > Automatic detection of worktree relocation by a user (via 'mv', for > instance) was removed by 618244e160 (worktree: stop supporting moving > worktrees manually - 2016-01-22). Prior to that, >

Re: [PATCH v2 2/3] worktree: delete dead code

On Thu, Mar 15, 2018 at 12:44 PM, Nguyễn Thái Ngọc Duy wrote: > This "link" was a feature in early iterations of multiple worktree > functionality for some reason it was dropped [1]. Since nobody creates > this "link", there's no need to check it. > > This is mostly used to let

Re: [PATCH v2 0/2] git-svn: --author-prog improvements

On Sun, Mar 18, 2018 at 5:19 PM, Andreas Heiduk wrote: > No comments on this one? I can't speak for Eric W., but my impression was that v2 did not address his concern that patch 2/2's unconditional change of behavior was unacceptable[1]. He didn't say so explicitly, but

Re: [PATCH] Makefile: detect compiler and enable more warnings in DEVELOPER=1

On Sun, Mar 18, 2018 at 5:28 AM, Jeff King <p...@peff.net> wrote: > On Sun, Mar 18, 2018 at 05:06:07AM -0400, Eric Sunshine wrote: >> On MacOS, "cc -v" output is: >> --- >8 --- >> Apple LLVM version 9.0.0 (clang-900.0.39.2) >> Target: x8

Re: [PATCH] Makefile: detect compiler and enable more warnings in DEVELOPER=1

On Sun, Mar 18, 2018 at 5:17 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Sun, Mar 18, 2018 at 10:06 AM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> On MacOS, "cc -v" output is: >> --- >8 --- >> Apple LLVM version 9.0.0 (clang-900.0.39.

Re: [PATCH] Makefile: detect compiler and enable more warnings in DEVELOPER=1

On Sun, Mar 18, 2018 at 09:18:34AM +0100, Nguyễn Thái Ngọc Duy wrote: > The set of extra warnings we enable when DEVELOPER has to be > conservative because we can't assume any compiler version the > developer may use. Detect the compiler version so we know when it's > safe to enable -Wextra and

Re: [PATCH 04/36] t/helper: merge test-lazy-init-name-hash into test-tool

On Sun, Mar 18, 2018 at 4:25 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Sun, Mar 18, 2018 at 3:11 AM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> On Sat, Mar 17, 2018 at 3:53 AM, Nguyễn Thái Ngọc Duy <pclo...@gmail.com> >> wrote: >>>

Re: [PATCH 34/36] t/helper: merge test-urlmatch-.. into test-tool

On Sat, Mar 17, 2018 at 3:54 AM, Nguyễn Thái Ngọc Duy wrote: > t/helper: merge test-urlmatch-.. into test-tool Spelled out fully: t/helper: merge test-urlmatch-normalization into test-tool needs only 58 columns, so is well within the 70-72 column recommendation for

Re: [PATCH 22/36] t/helepr: merge test-read-cache into test-tool

On Sat, Mar 17, 2018 at 3:54 AM, Nguyễn Thái Ngọc Duy wrote: > t/helepr: merge test-read-cache into test-tool s/helepr/helper/ > Signed-off-by: Nguyễn Thái Ngọc Duy

Re: [PATCH 04/36] t/helper: merge test-lazy-init-name-hash into test-tool

On Sat, Mar 17, 2018 at 3:53 AM, Nguyễn Thái Ngọc Duy wrote: > diff --git a/cache.h b/cache.h > @@ -333,7 +333,7 @@ struct index_state { > -extern int test_lazy_init_name_hash(struct index_state *istate, int > try_threaded); > +extern int lazy_init_name_hash_for_testing(struct

Re: [RFC PATCH] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default

On Sat, Mar 17, 2018 at 3:11 PM, Thomas Gummerer <t.gumme...@gmail.com> wrote: > On 03/17, Eddy Petrișor wrote: >> vin., 16 mar. 2018, 23:44 Eric Sunshine <sunsh...@sunshineco.com> a scris: >> > It may be a disservice to remove mention of git-blame and git-shortl

Re: [RFC PATCH] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default

On Fri, Mar 16, 2018 at 5:33 PM, Thomas Gummerer wrote: > Subject: [PATCH] SubmittingPatches: mention the git contacts command > > Instead of just mentioning 'git blame' and 'git shortlog', which make > it harder than necessary for new contributors to pick out the >

Re: [PATCH v12 04/10] utf8: teach same_encoding() alternative UTF encoding names

On Fri, Mar 16, 2018 at 1:50 PM, Junio C Hamano <gits...@pobox.com> wrote: > Eric Sunshine <sunsh...@sunshineco.com> writes: >> However, I'm having a tough time imagining cases in which callers >> would want same_encoding() to return true if both arguments are NULL, &g

Re: [PATCH v12 04/10] utf8: teach same_encoding() alternative UTF encoding names

On Thu, Mar 15, 2018 at 7:35 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: >> On 16 Mar 2018, at 00:25, Eric Sunshine <sunsh...@sunshineco.com> wrote: >>>if (is_encoding_utf8(src) && is_encoding_utf8(dst)) >>>return 1

Re: [PATCH v12 04/10] utf8: teach same_encoding() alternative UTF encoding names

On Thu, Mar 15, 2018 at 6:57 PM, wrote: > The function same_encoding() checked only for alternative UTF-8 encoding > names. Teach it to check for all kinds of alternative UTF encoding > names. > > Signed-off-by: Lars Schneider > --- > diff

Re: [PATCH v2 5/5] ref-filter: get_ref_atom_value() error handling

On Thu, Mar 15, 2018 at 4:47 PM, Martin Ågren wrote: > These are "real" errors and yield several more changes in the remainder. > Ignoring those BUG-type messages at the beginning of this patch would > give a patch like the one below. > > +static int get_object(struct

Re: [GSoC] [PATCH] test: avoid pipes in git related commands for test suite

On Wed, Mar 14, 2018 at 5:57 AM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Wed, Mar 14 2018, Eric Sunshine jotted: >> On Tue, Mar 13, 2018 at 4:19 PM, Pratik Karki <predatoram...@gmail.com> >> wrote: >>> -'git diff-tree -r -M --name-status

Re: [GSoC] [PATCH] test: avoid pipes in git related commands for test suite

Thanks for the patch. See comments below... On Tue, Mar 13, 2018 at 4:19 PM, Pratik Karki wrote: > This patch removes the necessity of pipes in git related commands for test > suite. > > Exit code of the upstream in a pipe is ignored so, it's use should be > avoided.

Re: [PATCH v11 10/10] convert: add round trip check based on 'core.checkRoundtripEncoding'

On Fri, Mar 9, 2018 at 3:22 PM, Junio C Hamano <gits...@pobox.com> wrote: > Eric Sunshine <sunsh...@sunshineco.com> writes: >> On Fri, Mar 9, 2018 at 12:35 PM, <lars.schnei...@autodesk.com> wrote: >>> /* Don't encode to the default encoding

Re: [PATCH v11 10/10] convert: add round trip check based on 'core.checkRoundtripEncoding'

On Fri, Mar 9, 2018 at 12:35 PM, wrote: > [...] > Add 'core.checkRoundtripEncoding', which contains a comma separated > list of encodings, to define for what encodings Git should check the > conversion round trip if they are used in the 'working-tree-encoding' >

Re: [PATCH 1/2] t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'

On Thu, Mar 8, 2018 at 5:01 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > Sorry for the confusion. I meant "return 1" as used elsewhere in the > test suite[1]. > [1]: For example, the "setup" test of t4151-am-abort.sh. Additional context: e6821d09e4 (t

Re: [PATCH 1/2] t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'

On Thu, Mar 8, 2018 at 4:49 PM, SZEDER Gábor <szeder@gmail.com> wrote: > On Thu, Mar 8, 2018 at 7:51 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> An alternative approach used elsewhere in the test suite[1] would be >> simply to 'exit' if test_cmp fails: >

Re: [PATCH 1/2] t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'

On Thu, Mar 8, 2018 at 7:38 AM, SZEDER Gábor wrote: > The test 'cvs update (-p)' redirects and checks 'test_cmp's stdout and > even its stderr. The commit introducing this test in 6e8937a084 > (cvsserver: Add test for update -p, 2008-03-27) doesn't discuss why, > in fact

Re: [PATCH] userdiff.c: Add C# async keyword in diff pattern

On Thu, Mar 8, 2018 at 5:04 AM, Thomas Levesque wrote: > Currently C# async methods are not shown in diff hunk headers. I just > added the async keyword to the csharp method pattern so that they are > properly detected. Thanks for the contribution. Please sign-off your

Re: [PATCH v10 7/9] convert: check for detectable errors in UTF encodings

On Wed, Mar 7, 2018 at 12:30 PM, wrote: > Check that new content is valid with respect to the user defined > 'working-tree-encoding' attribute. > > Signed-off-by: Lars Schneider > --- > diff --git a/convert.c b/convert.c > @@ -266,6 +266,58

Re: [PATCH v10 6/9] convert: add 'working-tree-encoding' attribute

On Wed, Mar 7, 2018 at 12:30 PM, wrote: > [...] > Add an attribute to tell Git what encoding the user has defined for a > given file. If the content is added to the index, then Git converts the > content to a canonical UTF-8 representation. On checkout Git will >

Re: [PATCH] xdiff: improve trimming preprocessing

On Tue, Mar 6, 2018 at 6:05 PM, Jun Wu wrote: > Excerpts from Eric Sunshine's message of 2018-03-06 14:23:46 -0500: >> On Tue, Mar 6, 2018 at 6:53 AM, Jun Wu wrote: >> > + printf "x%.0s" {1..934} >>d # pad common suffix to 1024 bytes >> >> The expression {x..y} is

Re: [PATCH v9 5/8] convert: add 'working-tree-encoding' attribute

On Tue, Mar 6, 2018 at 5:13 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: >> On 06 Mar 2018, at 21:42, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> On Sun, Mar 4, 2018 at 3:14 PM, <lars.schnei...@autodesk.com> wrote: >>> + return xstrdu

Re: [PATCH v9 0/8] convert: add support for different encodings

On Sun, Mar 4, 2018 at 3:14 PM, wrote: > Changes since v8: [...] > > Thanks a lot Eric for your great review! I think I fixed everything you > objected with one exception. You noticed that the current code only > checks for BOMs corresponding to the declared size (16

Re: [PATCH v9 6/8] convert: check for detectable errors in UTF encodings

On Sun, Mar 4, 2018 at 3:14 PM, wrote: > Check that new content is valid with respect to the user defined > 'working-tree-encoding' attribute. > > Signed-off-by: Lars Schneider > --- > diff --git a/convert.c b/convert.c > @@ -266,6 +266,53

Re: [PATCH v9 5/8] convert: add 'working-tree-encoding' attribute

On Sun, Mar 4, 2018 at 3:14 PM, wrote: > Git recognizes files encoded with ASCII or one of its supersets (e.g. > UTF-8 or ISO-8859-1) as text files. All other encodings are usually > interpreted as binary and consequently built-in Git text processing > tools (e.g.

Re: [PATCH] xdiff: improve trimming preprocessing

On Tue, Mar 6, 2018 at 6:53 AM, Jun Wu wrote: > xdiff-interface trims common suffix if ctxlen is 0. Teach it to also > trim common prefix, and trim less lines if ctxlen > 0. So it can benefit > the default diff command, as seen by profiling: [...] A few comments (below) based upon

Re: [PATCH 1/4] builtin/config: introduce `--default`

On Tue, Mar 6, 2018 at 1:52 AM, Jeff King wrote: > On Mon, Mar 05, 2018 at 06:17:26PM -0800, Taylor Blau wrote: >> In an aim to replace: >> $ git config --get-color slot [default] [...] >> with: >> $ git config --default default --color slot [...] >> introduce `--defualt` to

Re: [PATCH 1/4] builtin/config: introduce `--default`

On Mon, Mar 5, 2018 at 9:17 PM, Taylor Blau wrote: > In an aim to replace: > > $ git config --get-color slot [default] [...] > > with: > > $ git config --default default --color slot [...] > > introduce `--defualt` to behave as if the given default were present and

Re: [PATCH 2/2] git-svn: allow empty email-address in authors-prog and authors-file

On Mon, Mar 5, 2018 at 4:37 AM, Andreas Heiduk <ashei...@gmail.com> wrote: > 2018-03-05 2:42 GMT+01:00 Eric Sunshine <sunsh...@sunshineco.com>: >> On Sun, Mar 4, 2018 at 6:22 AM, Andreas Heiduk <ashei...@gmail.com> wrote: >>> The email address in --authors-

Re: [RFC] Contributing to Git (on Windows)

On Mon, Mar 5, 2018 at 1:26 PM, Jonathan Nieder wrote: > Johannes Schindelin wrote: >> The Google gang (you & Junio included) uses Linux. Peff uses Linux. From >> what I can see Duy, Eric and Jake use Linux. That covers already the most >> active reviewers right there. > > We

Re: [PATCH] t2028: fix minor error and issues in newly-added "worktree move" tests

On Mon, Mar 5, 2018 at 1:37 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >> Could you please save 'git worktree's output into an intermediate >> file, and run 'grep' on the file's contents? > > Here is what I tentatively came up with, while deciding

Re: [PATCH 2/2] git-svn: allow empty email-address in authors-prog and authors-file

On Sun, Mar 4, 2018 at 6:22 AM, Andreas Heiduk wrote: > The email address in --authors-file and --authors-prog can be empty but > git-svn translated it into a syntethic email address in the form > $USERNAME@$REPO_UUID. Now git-svn behaves like git-commit: If the email > is

Re: [PATCH 1/2] git-svn: search --authors-prog in PATH too

On Sun, Mar 4, 2018 at 6:22 AM, Andreas Heiduk wrote: > In 36db1eddf9 ("git-svn: add --authors-prog option", 2009-05-14) the path > to authors-prog was made absolute because git-svn changes the current > directoy in some situations. This makes sense if the program is part of

Re: [PATCH v8 7/7] convert: add round trip check based on 'core.checkRoundtripEncoding'

On Sun, Mar 4, 2018 at 2:08 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: >> On 25 Feb 2018, at 20:50, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> On Sat, Feb 24, 2018 at 11:28 AM, <lars.schnei...@autodesk.com> wrote: >>> +

Re: [PATCH v2 0/7] nd/worktree-move reboot

On Mon, Feb 12, 2018 at 4:49 AM, Nguyễn Thái Ngọc Duy wrote: > v2 basically fixes lots of comments from Eric (many thanks!): memory > leak, typos, document updates, tests, corner case fixes. > Interdiff: Thanks, I finally got around to doing a full re-read of the entire

[PATCH] t2028: fix minor error and issues in newly-added "worktree move" tests

restoring a worktree location by means of a separate test somewhat distant from the test which moved it rather than using test_when_finished() to restore it in a self-contained fashion Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com> --- This patch is built atop nd/worktree-mo

Re: [PATCH] git.el: handle default excludesfile properly

On Sat, Mar 3, 2018 at 9:57 PM, Dorab Patel wrote: > Thanks for reviewing and locating the commits. > > OK, I'll re-roll and add the relevant commits. It may take some time. > > Should I just send the revised patch as a separate thread (with the > relevant commits and

Re: [PATCH 37/44] packfile: add repository argument to prepare_packed_git

On Sat, Mar 3, 2018 at 6:36 AM, Nguyễn Thái Ngọc Duy wrote: > Add a repository argument to allow prepare_packed_git callers to > be more specific about which repository to handle. See c28d027a52c > (sha1_file: add repository argument to link_alt_odb_entry, 2018-02-20) > for an

Re: [PATCH 13/44] pack: move approximate object count to object store

On Sat, Mar 3, 2018 at 6:36 AM, Nguyễn Thái Ngọc Duy wrote: > The approximate_object_count() function maintains a rough count of > objects in a repository to estimate how long object name abbreviates > should be. Object names are scoped to a repository and the > appropriate

Re: [PATCH 09/44] object-store: free alt_odb_list

On Sat, Mar 3, 2018 at 6:36 AM, Nguyễn Thái Ngọc Duy wrote: > Free the memory and reset alt_odb_{list, tail} to NULL. > > Signed-off-by: Stefan Beller > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/object.c b/object.c > @@

Re: [PATCH 06/44] repository: introduce raw object store field

On Sat, Mar 3, 2018 at 6:35 AM, Nguyễn Thái Ngọc Duy wrote: > The raw object store field will contain any objects needed for > access to objects in a given repository. > > This patch introduces the raw object store and populates it with the > `objectdir`, which used to be part

Re: [PATCH] git.el: handle default excludesfile properly

On Sat, Mar 3, 2018 at 8:36 PM, Dorab Patel wrote: > Correct me if I'm wrong, but my understanding, from > https://git-scm.com/docs/gitignore, is that $HOME/.gitignore is used > only if it is specified as the value of core.excludesfile in > ~/.gitconfig. It is not used by

Re: Worktree silently deleted on git fetch/gc/log

On Fri, Mar 2, 2018 at 6:53 AM, Duy Nguyen wrote: > I'm going to improve it a bit in this case either way, I think I have > some idea: (mostly to Eric) since worktree B is alive and kicking, it > should keep at least HEAD or index updated often. We can delay > deleting a

Re: [PATCH 1/2] completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate

On Sat, Mar 3, 2018 at 4:23 AM, Nguyễn Thái Ngọc Duy wrote: > There is not a strong reason to hide this option, and git-merge already > completes this one. Let's allow to complete this for all commands (and > let git-completion.bash do the suppressing if neede).

Re: [PATCH 3/3] worktree prune: improve prune logic when worktree is moved

On Fri, Mar 2, 2018 at 10:39 PM, Nguyễn Thái Ngọc Duy wrote: > Worktree manual move support is actually gone in 618244e160 (worktree: > stop supporting moving worktrees manually - 2016-01-22). Before that, > this gitdir could be updated often when the worktree is accessed. That

Re: [PATCH 1/3] gc.txt: more details about what gc does

On Fri, Mar 2, 2018 at 10:39 PM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt > @@ -15,8 +15,9 @@ DESCRIPTION > --- > Runs a number of housekeeping tasks

Re: [PATCH] git.el: handle default excludesfile properly

On Fri, Mar 2, 2018 at 10:48 PM, Dorab Patel wrote: > The previous version only looked at core.excludesfile for locating the > excludesfile. So, when core.excludesfile was not defined, it did not > use the possible default locations. > > The current version uses either

Re: [PATCH] smart-http: document flush after "# service" line

On Sat, Mar 3, 2018 at 12:27 AM, Jeff King wrote: > Subject: smart-http: document flush after "# service" line > > The http-protocol.txt spec fails to mention that a flush > packet comes in the smart server response after sending any > the "service" header. "any the"? >

Re: Worktree silently deleted on git fetch/gc/log

On Fri, Mar 2, 2018 at 6:34 AM, Дилян Палаузов wrote: > Your assumption is correct: when renaming the directory apparently I have > not adjusted /git/A/.git/worktrees/B/gitdir to the new location. > > I fixed the situation by renaming /git/B to /git/B.bak, creating a

Re: Worktree silently deleted on git fetch/gc/log

On Thu, Mar 1, 2018 at 2:24 PM, Дилян Палаузов wrote: > /git/A/.git/worktrees/b/ is missing - that is the point. > /git/B/,git wasn't modified since the worktree was created, cat: > gitdir: /git/A/.git/worktrees/b I'll assume that the lowercase 'b' was a typo in your

Re: [PATCH] git-gui: bind CTRL/CMD+numpad ENTER to do_commit

On Thu, Mar 1, 2018 at 9:39 AM, Birger Skogeng Pedersen wrote: > --- Please sign-off on your patch. See Documentation/SubmittingPatches. Also, it would be helpful to write at least a short commit message justifying the change. The reason you gave in your lead-in email[1]

Re: [GSoC][PATCH v2] userdiff: add built-in pattern for golang

On Thu, Mar 1, 2018 at 6:19 AM, Alban Gruin wrote: > This adds xfuncname and word_regex patterns for golang, a quite > popular programming language. It also includes test cases for the > xfuncname regex (t4018) and updated documentation. > > The xfuncname regex finds

Re: Worktree silently deleted on git fetch/gc/log

On Wed, Feb 28, 2018 at 7:44 AM, Дилян Палаузов wrote: > A (branch master) and > B (branch g) which is a worktree of the first. > > /git/B g>$ git fetch > [...] > From https://... >13e4c55a0..02655d5fb g -> origin/g >c37a3ca25..bc7888511 master ->

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

On Wed, Feb 28, 2018 at 5:17 PM, Alban Gruin wrote: > Yes, but I can split the line like that: > > % cat >baz.go<<\EOF > package baz > func baz(arg1 int64, > arg2 int64) { > } > EOF > % go build baz.go > > This complies to the standard

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

On Wed, Feb 28, 2018 at 4:31 PM, Alban Gruin wrote: >>> diff --git a/userdiff.c b/userdiff.c >>> @@ -38,6 +38,15 @@ IPATTERN("fortran", >>> +PATTERNS("golang", >>> +/* Functions */ >>> +"^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n" >> >> Why is the brace (and

Re: [PATCH v8 5/7] convert: add 'working-tree-encoding' attribute

On Tue, Feb 27, 2018 at 6:16 AM, Lars Schneider <larsxschnei...@gmail.com> wrote: >> On 25 Feb 2018, at 08:15, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> On Sat, Feb 24, 2018 at 11:27 AM, <lars.schnei...@autodesk.com> wrote: >> The above paragraph

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

On Wed, Feb 28, 2018 at 12:29 PM, Alban Gruin wrote: > This adds xfuncname and word_regex patterns for golang, a quite > popular programming language. It also includes test cases for the > xfuncname regex (t4018) and an updated documentation. s/an // > The xfuncname regex

Re: [PATCH v3 14/35] connect: request remote refs using v2

On Tue, Feb 27, 2018 at 5:04 PM, Jeff King wrote: > On Tue, Feb 27, 2018 at 01:58:00PM -0800, Junio C Hamano wrote: >> So are we looking for a natural name to call an array of trings? I >> personally do not mind argv_array too much, but perhaps we can call >> it a string_array and

Re: [PATCH v2 0/4] Delete ignore_env member in struct repository

On Tue, Feb 27, 2018 at 4:58 AM, Nguyễn Thái Ngọc Duy wrote: > v2 fixes the incorrect use of consecutive getenv() and adds a comment > to clarify the role of old_gitdir > > diff --git a/environment.c b/environment.c > @@ -148,18 +149,34 @@ static char *expand_namespace(const

Re: [PATCH v8 3/7] utf8: add function to detect prohibited UTF-16/32 BOM

On Sun, Feb 25, 2018 at 6:35 AM, Lars Schneider <larsxschnei...@gmail.com> wrote: >> On 25 Feb 2018, at 04:41, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> Is this interpretation correct? When I read [1], I interpret it as >> saying that no BOM _of an

Re: [PATCH 1/1] git-p4: add format-patch subcommand

On Mon, Feb 26, 2018 at 6:48 AM, Luke Diamand wrote: > It takes a list of P4 changelists and generates a patch for > each one, using "p4 describe". > [...] > Signed-off-by: Luke Diamand > --- > diff --git a/git-p4.py b/git-p4.py > @@ -3749,6 +3761,277 @@ class

Re: [PATCH 1/4] repository.c: move env-related setup code back to environment.c

On Mon, Feb 26, 2018 at 5:30 AM, Nguyễn Thái Ngọc Duy wrote: > It does not make sense that generic repository code contains handling > of environment variables, which are specific for the main repository > only. Refactor repo_set_gitdir() function to take $GIT_DIR and >

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

On Mon, Feb 26, 2018 at 5:17 AM, Duy Nguyen wrote: > On Thu, Feb 22, 2018 at 7:31 AM, Junio C Hamano wrote: >> * nd/worktree-move (2018-02-12) 7 commits >> >> "git worktree" learned move and remove subcommands. >> >> Expecting a reroll. >> cf.

Re: [PATCH v2 06/13] git-send-email: unconditionally use Net::{SMTP,Domain}

On Sun, Feb 25, 2018 at 2:46 PM, Ævar Arnfjörð Bjarmason wrote: > The Net::SMTP and Net::Domain were both first released with perl > v5.7.3[1], since my d48b284183 ("perl: bump the required Perl version > to 5.8 from 5.6.[21]", 2010-09-24) we've depended on 5.8, so there's > no

Re: [PATCH v2 04/13] gitweb: hard-depend on the Digest::MD5 5.8 module

On Sun, Feb 25, 2018 at 2:46 PM, Ævar Arnfjörð Bjarmason wrote: > Since my d48b284183 ("perl: bump the required Perl version to 5.8 from > 5.6.[21]", 2010-09-24), we've depended on 5.8, so there's no reason to > conditionally require Digest::MD5 anymore. It was released with

Re: [PATCH v8 7/7] convert: add round trip check based on 'core.checkRoundtripEncoding'

On Sat, Feb 24, 2018 at 11:28 AM, wrote: > UTF supports lossless conversion round tripping and conversions between > UTF and other encodings are mostly round trip safe as Unicode aims to be > a superset of all other character encodings. However, certain encodings >

Re: [PATCH v8 5/7] convert: add 'working-tree-encoding' attribute

On Sat, Feb 24, 2018 at 11:27 AM, wrote: > Git recognizes files encoded with ASCII or one of its supersets (e.g. > UTF-8 or ISO-8859-1) as text files. All other encodings are usually > interpreted as binary and consequently built-in Git text processing > tools (e.g.

Re: [PATCH v8 4/7] utf8: add function to detect a missing UTF-16/32 BOM

On Sat, Feb 24, 2018 at 11:27 AM, wrote: > If the endianness is not defined in the encoding name, then let's > be strict and require a BOM to avoid any encoding confusion. The > is_missing_required_utf_bom() function returns true if a required BOM > is missing. > >

Re: [PATCH v8 3/7] utf8: add function to detect prohibited UTF-16/32 BOM

On Sat, Feb 24, 2018 at 11:27 AM, wrote: > Whenever a data stream is declared to be UTF-16BE, UTF-16LE, UTF-32BE > or UTF-32LE a BOM must not be used [1]. The function returns true if > this is the case. > > [1] http://unicode.org/faq/utf_bom.html#bom10 > >

Re: [PATCH v2 4/5] diff.c: initialize hash algo when running in --no-index mode

On Fri, Feb 23, 2018 at 10:34 PM, Nguyễn Thái Ngọc Duy wrote: > Our "git diff" command supports running as a standalone tool. In this > code path, we try to hash the file content but after > 18e2588e11 (sha1_file: switch uses of SHA-1 to the_hash_algo - > 2018-02-01), there is

Re: [PATCH 04/11] t3030-merge-recursive: don't check the stderr of a subshell

On Fri, Feb 23, 2018 at 6:39 PM, SZEDER Gábor wrote: > The two test checking 'git mmerge-recursive' in an empty worktree in s/mmerge/merge/, I guess. > 't3030-merge-recursive.sh' fail when the test script is run with '-x' > tracing (and using a shell other than a Bash

Re: [BUG] Worktree prune complains about missing path

On Tue, Feb 20, 2018 at 3:36 PM, Randall S. Becker wrote: > I’m a bit confused about this, as I thought I understood worktrees :(. > > /home/randall/nsgit/test/test dir.mytest: rm -rf dest.wt > /home/randall/nsgit/test/test dir.mytest/dest: git worktree prune -v > Removing

Re: [PATCH] Fix misconversion of gitsubmodule.txt

On Tue, Feb 20, 2018 at 3:51 AM, marmot1123 wrote: > In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions > `submodule’s`. > It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. Thanks for the contribution. Please sign-off your patch; see

Re: [PATCH v2 4/9] t3701: don't hard code sha1 hash values

On Mon, Feb 19, 2018 at 6:29 AM, Phillip Wood wrote: > Purge the index lines from diffs so we're not hard coding sha1 hash > values in the expected output. Perhaps the commit message could provide a bit more explanation about why this is a good idea. For instance,

Re: [PATCH v2 3/9] t3701: use test_write_lines and write_script

On Mon, Feb 19, 2018 at 6:29 AM, Phillip Wood wrote: > From: Phillip Wood > > Simplify things slightly by using the above helpers. > > Signed-off-by: Phillip Wood > --- > diff --git a/t/t3701-add-interactive.sh

Re: [PATCH v2 2/9] t3701: indent here documents

On Mon, Feb 19, 2018 at 6:29 AM, Phillip Wood wrote: > From: Phillip Wood > > Indent here documents in line with the current style for tests. > > Signed-off-by: Phillip Wood > --- > diff --git

[PATCH 1/2] git-worktree.txt: fix missing ")" typo

.@gmail.com> Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com> --- Documentation/git-worktree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 41585f535d..c941c48827 100644 --- a/Docu

[PATCH 2/2] git-worktree.txt: fix indentation of example and text of 'add' command

ot;) rather than being treated as a formatting directive. Fix these problems by adding the missing "+" line before the example code block. Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com> --- Documentation/git-worktree.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Docu

[PATCH 0/2] fix minor git-worktree.txt botches

This patch series fixes a couple git-worktree.txt botches from 4e85333197 (worktree: make add dwim, 2017-11-26). Eric Sunshine (2): git-worktree.txt: fix missing ")" typo git-worktree.txt: fix indentation of example and text of 'add' command Documentation/git-worktree.txt |

<    4   5   6   7   8   9   10   11   12   13   >