Re: [PATCH v2] trailer: load config to handle core.commentChar

On Thu, Apr 28, 2016 at 4:00 PM, Rafal Klys wrote: > trailer: load config to handle core.commentChar This subject is describing low-level details of the patch rather than giving a high-level overview. A possible rewrite might be: trailer: respect core.commentChar > Fall

Re: [PATCH] trailer: load config to handle core.commentChar

On Wed, Apr 27, 2016 at 4:31 PM, Junio C Hamano wrote: >> On Wed, Apr 27, 2016 at 9:24 PM, Rafal Klys wrote: >>> Add call to git_config(git_default_config, NULL) to update the >>> comment_char_line from default '#' to possible different value set in >>>

Re: [PATCH 53/83] builtin/apply: make find_header() return -1 instead of die()ing

On Mon, Apr 25, 2016 at 9:18 AM, Duy Nguyen wrote: > On Sun, Apr 24, 2016 at 8:33 PM, Christian Couder > wrote: >> To be compatible with the rest of the error handling in builtin/apply.c, >> find_header() should return -1 instead of calling die().

Re: [PATCH 53/83] builtin/apply: make find_header() return -1 instead of die()ing

On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder wrote: > To be compatible with the rest of the error handling in builtin/apply.c, > find_header() should return -1 instead of calling die(). > > Unfortunately find_header() already returns -1 when no header is found, >

Re: [PATCH v14 3/6] t0040-parse-options: improve test coverage

On Mon, Apr 25, 2016 at 2:40 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > On Wed, Apr 13, 2016 at 10:57 PM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> Each of these patches should have a single conceptual purpose. It >> seems, from the above e

Re: [PATCH 2/2] merge: warn --no-commit merge when no new commit is created

On Tue, Apr 26, 2016 at 5:37 PM, Junio C Hamano wrote: > A user who uses "--no-commit" does so with the intention to record a > resulting merge after amending the merge result in the working tree. > But there is nothing to amend and record, if the same "git merge" > without

Re: [PATCH 51/83] builtin/apply: make apply_patch() return -1 instead of die()ing

On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder wrote: > To libify `git apply` functionality we have to signal errors > to the caller instead of die()ing. > > As a first step in this direction, let's make apply_patch() return > -1 in case of errors instead of dying.

Re: [PATCH 49/83] builtin/apply: move 'lock_file' global into 'struct apply_state'

On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder wrote: > We cannot have a 'struct lock_file' allocated on the stack, as lockfile.c > keeps a linked list of all created lock_file structures. By talking about "the stack" here, I suppose you mean that your initial idea

Re: [PATCH 45/83] builtin/apply: move 'state' init into init_apply_state()

On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder wrote: > Signed-off-by: Christian Couder > --- > diff --git a/builtin/apply.c b/builtin/apply.c > @@ -4670,6 +4670,28 @@ static int option_parse_directory(const struct option > *opt, > +static

Re: [PATCH 1/3] githooks.txt: Improve the intro section

On Sun, Apr 24, 2016 at 4:20 PM, Ævar Arnfjörð Bjarmason wrote: > Change the documentation so that: > [...] > Signed-off-by: Ævar Arnfjörð Bjarmason > --- > diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt > @@ -130,7 +130,11 @@ The

Re: [PATCH v3 2/3] travis-ci: express Linux/OS X dependency versions more clearly

On Sunday, April 24, 2016, wrote: > The Git Travis CI OSX build always installs the latest versions of Git LFS and > Perforce via brew and the Linux build installs fixed versions. Consequently > new > LFS/Perforce versions can brake the OS X build even if there is no

Re: [PATCH v8 0/6] Move PGP verification out of verify-tag

n seems to address the few minor review comments from v7. Regardless of the whitespace nit in patch 5/6, this series is still: Reviewed-by: Eric Sunshine <sunsh...@sunshineco.com> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH v8 5/6] verify-tag: move tag verification code to tag.c

On Fri, Apr 22, 2016 at 10:52 AM, wrote: > The PGP verification routine for tags could be accessed by other modules > that require to do so. > > Publish the verify_tag function in tag.c and rename it to gpg_verify_tag > so it does not conflict with builtin/mktag's static

Re: [PATCH v2 04/12] worktree.c: mark current worktree

On Thu, Apr 21, 2016 at 5:33 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Thu, Apr 21, 2016 at 3:19 PM, Duy Nguyen <pclo...@gmail.com> wrote: >> On Thu, Apr 21, 2016 at 2:20 PM, Eric Sunshine <sunsh...@sunshineco.com> >> wrote: >>> On Wed, Apr 20, 2

Re: [PATCH v2 04/12] worktree.c: mark current worktree

On Wed, Apr 20, 2016 at 9:24 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/worktree.c b/worktree.c > @@ -178,6 +182,18 @@ struct worktree **get_worktrees(void) > } > ALLOC_GROW(list, counter + 1,

Re: [PATCH v2 03/12] worktree.c: make find_shared_symref() return struct worktree *

On Wed, Apr 20, 2016 at 9:24 AM, Nguyễn Thái Ngọc Duy wrote: > This gives the caller more information and they can answer things like, > "is it the main worktree" or "is it the current worktree". The latter > question is needed for the "checkout a rebase branch" case later. > >

Re: [PATCH v2 01/12] path.c: add git_common_path() and strbuf_git_common_path()

On Wed, Apr 20, 2016 at 9:24 AM, Nguyễn Thái Ngọc Duy wrote: > diff --git a/path.c b/path.c > @@ -503,6 +503,35 @@ void strbuf_git_path_submodule(struct strbuf *buf, const > char *path, > +const char *git_common_path(const char *fmt, ...) > +{ > + struct strbuf *pathname

Re: [PATCH v7 4/6] verify-tag: prepare verify_tag for libification

On Tue, Apr 19, 2016 at 1:47 PM, wrote: > The current interface of verify_tag() resolves reference names to SHA1, > however, the plan is to make this functionality public and the current > interface is cumbersome for callers: they are expected to supply the > textual

Re: [PATCH v7 0/6] Move PGP verification out of verify-tag

hey are not worth a re-roll (perhaps Junio can address them when/if he picks up the series). As before, the entire series is: Reviewed-by: Eric Sunshine <sunsh...@sunshineco.com> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to ma

Re: [PATCH v7 6/6] tag -v: verfy directly rather than exec-ing verify-tag

On Tue, Apr 19, 2016 at 1:47 PM, wrote: > tag -v: verfy directly rather than exec-ing verify-tag s/verfy/verify: > Instead of having tag -v fork to run verify-tag, use the > gpg_verify_tag() function directly. This description is easy enough to understand. Thanks. >

Re: [PATCH v6 0/6] Move PGP verification out of verify-tag

feedback Thanks. See my responses to individual patches for a few very minor issues, not necessarily even deserving a re-roll. With or without the code and commit message nits addressed, this version is: Reviewed-by: Eric Sunshine <sunsh...@sunshineco.com> -- To unsubscribe from this list: s

Re: [PATCH v6 6/6] tag -v: verfy directly rather than exec-ing verify-tag

On Sun, Apr 17, 2016 at 6:27 PM, wrote: > tag -v forks into verify-tag, which only calls gpg_verify_tag(). "forks into" sounds odd. > Instead of forking to verify-tag, call gpg_verify_tag directly(). s/ directly()/() directly/ I found the commit message of your previous

Re: [PATCH v6 4/6] verify-tag: add sha1 argument to verify_tag()

On Sun, Apr 17, 2016 at 6:26 PM, wrote: > verify-tag: add sha1 argument to verify_tag() Mentioned previously[1]: This subject is talking about low level details of the change rather than giving a high-level overview. A suggested replacement[1] would be: verify-tag:

Re: [PATCH v6 3/6] verify-tag: change variable name for readability

On Sun, Apr 17, 2016 at 6:26 PM, wrote: > The run_gpg_verify() function has two variables, size and len. > > This may come off as confusing when reading the code. Clarify which > one pertains to the length of the tag headers by renaming len to > payload_length. The commit

Re: [PATCH v5 2/6] t7030-verify-tag: Adds validation for multiple tags

On Sun, Apr 17, 2016 at 2:38 PM, Santiago Torres <santi...@nyu.edu> wrote: > On Sun, Apr 17, 2016 at 02:19:00PM -0400, Eric Sunshine wrote: >> Junio already made this correction and others in the three patches he >> queued on his 'pu' branch. It's possible that he also

Re: [PATCH v5 2/6] t7030-verify-tag: Adds validation for multiple tags

On Sun, Apr 17, 2016 at 1:31 PM, Santiago Torres wrote: >> + grep "^.GNUPG" expect.stderr && >> >> Hmm, is there a reason you didn't stick with the more strict regex >> Peff suggested? >> >> ^.GNUPG:. >> >> (Genuine question: I'm not saying your choice is wrong, I'm

Re: [PATCH v5 0/6] tag: move PGP verification code to tag.c

On Sun, Apr 17, 2016 at 1:34 PM, Santiago Torres <santi...@nyu.edu> wrote: > On Thu, Apr 07, 2016 at 12:19:37PM -0400, Eric Sunshine wrote: >> If you make any changes beyond the minor ones mentioned in my reviews >> or beyond plagiarizing commit message enhancements offere

Re: [PATCH v2 1/2] test-lib: add a function to compare an expection with stdout from a command

On Sun, Apr 17, 2016 at 11:19 AM, Johannes Sixt <j...@kdbg.org> wrote: > Am 17.04.2016 um 05:07 schrieb Eric Sunshine: >> Hmm, considering that $(...) collapses each whitespace run (including >> newlines) down to a single space, I don't see how you could get a

Re: [PATCH v2 2/2] t1500-rev-parse: rewrite each test to run in isolation

On Sun, Apr 17, 2016 at 5:42 AM, SZEDER Gábor wrote: > Quoting Michael Rappazzo : >> +test_expect_success 'GIT_DIR=../.git, core.bare = false: >> is-bare-repository' ' >> + mkdir work && >> + test_when_finished "rm -rf work" && >> +

Re: [PATCH v2 1/2] test-lib: add a function to compare an expection with stdout from a command

On Sat, Apr 16, 2016 at 11:54 PM, Jeff King <p...@peff.net> wrote: > On Sat, Apr 16, 2016 at 11:07:02PM -0400, Eric Sunshine wrote: >> > test_stdout accepts an expection and a command to execute. It will execute >> > the command and then compare t

Re: [PATCH v2 2/2] t1500-rev-parse: rewrite each test to run in isolation

On Sat, Apr 16, 2016 at 12:13:50PM -0400, Michael Rappazzo wrote: > t1500-rev-parse has many tests which change directories and leak > environment variables. This makes it difficult to add new tests without > minding the environment variables and current directory. > > Each test is now setup,

Re: [PATCH v2 1/2] test-lib: add a function to compare an expection with stdout from a command

On Sat, Apr 16, 2016 at 12:13 PM, Michael Rappazzo wrote: > test-lib: add a function to compare an expection with stdout from a command Rather long subject. Perhaps: test-lib: add convenience function to check command output > test_stdout accepts an expection and a

Re: [PATCH/RFC 6/6] clone: send refspec for single-branch clones

On Fri, Apr 15, 2016 at 3:19 PM, David Turner wrote: > For single-branch clones (when we know in advance what the remote > branch name will be), send a refspec so that the server doesn't > tell us about any other refs. > > Signed-off-by: David Turner

Re: [PATCH/RFC 5/6] fetch: pass refspec to http server

On Fri, Apr 15, 2016 at 3:19 PM, David Turner wrote: > When fetching over http, send the requested refspec to the server. > The server will then only send refs matching that refspec. It is > permitted for old servers to ignore that parameter, and the client > will

Re: [PATCH/RFC 3/6] http-backend: handle refspec argument

On Fri, Apr 15, 2016 at 3:19 PM, David Turner wrote: > Allow clients to pass a "refspec" parameter through to upload-pack; > upload-pack will only advertise refs which match that refspec. > > Signed-off-by: David Turner > --- > diff --git

Re: Cannot checkout a branch / worktree shows multiple branches for the same directory

On Thu, Apr 14, 2016 at 3:51 PM, Krzysztof Voss wrote: > I stumbled upon an interesting problem when checking out a branch. > I had to switch to a testing branch to merge in some changes from yet > another branch, but when I tried to check out the testing branch I got > a message

Re: [PATCH v14 4/6] parse-options.c: make OPTION_COUNTUP respect "unspecified" values

On Wed, Apr 13, 2016 at 1:43 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > On Wed, Apr 13, 2016 at 11:03 PM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> On Wed, Apr 13, 2016 at 4:39 AM, Pranit Bauva <pranit.ba...@gmail.com> wrote: >>> On Wed,

Re: [PATCH v14 6/6] commit: add a commit.verbose config variable

On Wed, Apr 13, 2016 at 5:15 AM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > On Wed, Apr 13, 2016 at 11:44 AM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: >>> +test_

Re: [PATCH v14 4/6] parse-options.c: make OPTION_COUNTUP respect "unspecified" values

On Wed, Apr 13, 2016 at 4:39 AM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > On Wed, Apr 13, 2016 at 11:26 AM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: >>> +test_ex

Re: [PATCH v14 3/6] t0040-parse-options: improve test coverage

On Wed, Apr 13, 2016 at 4:59 AM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > On Wed, Apr 13, 2016 at 10:56 AM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: >>> +test_exp

Re: [PATCH v14 6/6] commit: add a commit.verbose config variable

On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > Add commit.verbose configuration variable as a convenience for those > who always prefer --verbose. > > Helped-by: Junio C Hamano <gits...@pobox.com> > Helped-by: Eric Sunshine <sunsh..

Re: [PATCH v14 5/6] t7507-commit-verbose: improve test coverage by testing number of diffs

ow and why the return value of the fake "editor" changed, thus the order of the 2nd and 3rd paragraphs should be swapped. [1]: http://article.gmane.org/gmane.comp.version-control.git/290663 > Helped-by: Eric Sunshine <sunsh...@sunshineco.com> > Signed-off-by: Pranit Bauva <pran

Re: [PATCH v14 4/6] parse-options.c: make OPTION_COUNTUP respect "unspecified" values

On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva wrote: > OPT_COUNTUP() merely increments the counter upon --option, and resets it > to 0 upon --no-option, which means that there is no "unspecified" value > with which a client can initialize the counter to determine whether

Re: [PATCH v14 3/6] t0040-parse-options: improve test coverage

On Tue, Apr 12, 2016 at 7:02 PM, Pranit Bauva wrote: > Include tests to check for multiple levels of quiet and to check if the > '--no-quiet' option sets it to 0. > > Signed-off-by: Pranit Bauva > --- > diff --git a/t/t0040-parse-options.sh

Re: [PATCH] t1500-rev-parse: rewrite each test to run in isolation

On Sat, Apr 9, 2016 at 7:19 AM, Michael Rappazzo wrote: > t1500-rev-parse has many tests which change directories and leak > environment variables. This makes it difficult to add new tests without > minding the environment variables and current directory. > > Each test is now

Re: [PATCH] send-email: detect and offer to skip backup files

On Tue, Apr 12, 2016 at 6:53 PM, Junio C Hamano wrote: > Diligent people save output from format-patch to files, proofread > and edit them and then finally send the result out. If the > resulting files are sent out with "git send-email 0*", this ends up > sending backup files

Re: [PATCH v2 05/21] t6030: generalize test to not rely on current implementation

On Sun, Apr 10, 2016 at 9:47 AM, Torsten Bögershausen wrote: > On 10.04.16 15:18, Stephan Beyer wrote: >> diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh >> @@ -10,36 +10,34 @@ exec > + if [ -f "$_file" ]; then > I know that the old code did the same, is

Re: [PATCH v2 03/21] t/test-lib-functions.sh: generalize test_cmp_rev

On Sun, Apr 10, 2016 at 9:18 AM, Stephan Beyer wrote: > test_cmp_rev() took exactly two parameters, the expected revision > and the revision to test. This commit generalizes this function > such that it takes any number of at least two revisions: the > expected one and a list of

Re: [PATCH v2 04/21] t: use test_cmp_rev() where appropriate

On Sun, Apr 10, 2016 at 9:18 AM, Stephan Beyer wrote: > test_cmp_rev() from t/test-lib-functions.sh is used to make many > tests clearer. > > Signed-off-by: Stephan Beyer > --- > diff --git a/t/t3310-notes-merge-manual-resolve.sh >

Re: Hardcoded #!/bin/sh in t5532 causes problems on Solaris

On Sun, Apr 10, 2016 at 3:01 PM, Junio C Hamano wrote: > Subject: t1020: do not overuse printf and use write_script > > The test prepares a sample file "dir/two" with a single incomplete > line in it with "printf", and also prepares a small helper script > "diff" to create a

Re: [PATCH v3 1/2] refs: add a new function set_worktree_head_symref

On Fri, Apr 8, 2016 at 2:37 AM, Kazuki Yamaguchi <k...@rhe.jp> wrote: > On Thu, Apr 07, 2016 at 05:20:10PM -0400, Eric Sunshine wrote: >> On Sun, Mar 27, 2016 at 10:37 AM, Kazuki Yamaguchi <k...@rhe.jp> wrote: >> > +int set_worktree_head_symref(const ch

Re: [PATCH] format-patch: allow --no-patch to disable patch output

On Thu, Apr 7, 2016 at 12:46 PM, Jacob Keller wrote: > The documentation for format-patch indicates that --no-patch wilL > suppress patch output. It also incorrectly mentions that -s will also > suppress the patch output, but this is incorrect because -s is used to > add

Re: [PATCH v3 1/2] refs: add a new function set_worktree_head_symref

On Sun, Mar 27, 2016 at 10:37 AM, Kazuki Yamaguchi wrote: > Add a new function set_worktree_head_symref, to update HEAD symref for > the specified worktree. > > To update HEAD of a linked working tree, > create_symref("worktrees/$work_tree/HEAD", "refs/heads/$branch", msg) > could be

Re: [PATCH v5 0/6] tag: move PGP verification code to tag.c

f's code. >> > * Updated the error-handling/printing issues that were introduced when. >> >libifying the verify_tag function. >> >> This version is a more pleasant read, easier to digest and understand. >> All of my review comments were minor; nothing demanding a re-r

Re: [PATCH v5 0/6] tag: move PGP verification code to tag.c

version is a more pleasant read, easier to digest and understand. All of my review comments were minor; nothing demanding a re-roll. As such, this version is: Reviewed-by: Eric Sunshine <sunsh...@sunshineco.com> If you do happen to re-roll based upon the review comments, feel free to ad

Re: [PATCH v5 6/6] tag: use gpg_verify_function in tag -v call

On Tue, Apr 5, 2016 at 12:07 PM, wrote: > tag: use gpg_verify_function in tag -v call This is a low-level description of what the patch is doing, but you normally want the subject to present a high-level overview. Perhaps something like: tag -v: verify directly rather

Re: [PATCH v5 4/6] builtin/verify-tag: replace name argument with sha1

On Tue, Apr 5, 2016 at 12:07 PM, wrote: > builtin/verify-tag: replace name argument with sha1 builtin/verify-tag: prepare verify_tag() for libification > This change is meant to prepare verify_tag for libification. Many > existing modules/commands already do the refname

Re: [PATCH v5 2/6] t7030-verify-tag: Adds validation for multiple tags

On Tue, Apr 5, 2016 at 12:07 PM, wrote: > t7030-verify-tag: Adds validation for multiple tags s/t7030-verify-tag/t7030/ s/Adds/add > The verify-tag command supports multiple tag names as an argument. > However, existing tests only test for invocation with a single tag, so >

Re: [PATCH v12 2/5] test-parse-options: print quiet as integer

On Tue, Apr 5, 2016 at 11:39 AM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > On Mon, Apr 4, 2016 at 3:00 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: >>> Current impl

Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

On Tue, Apr 5, 2016 at 6:21 AM, Elia Pinto <gitter.spi...@gmail.com> wrote: > 2016-04-01 22:25 GMT+02:00 Eric Sunshine <sunsh...@sunshineco.com>: >> In addition to review comments by others, why are the new curl_dump() >> and curl_trace() functions duplicated

Re: [PATCH] api-trace.txt: fix typo

On Tue, Apr 5, 2016 at 6:05 AM, Elia Pinto wrote: > The correct api is trace_printf_key > > Signed-off-by: Elia Pinto > --- > diff --git a/Documentation/technical/api-trace.txt > b/Documentation/technical/api-trace.txt > @@ -28,7 +28,7 @@ static

Re: [PATCH v4 2/6] t/t7030-verify-tag.sh: Adds validation for multiple tags

On Mon, Apr 4, 2016 at 9:46 PM, Santiago Torres <santi...@nyu.edu> wrote: > Eric Sunshine wrote: >> > +test_expect_success GPG 'verify multiple tags' ' >> > + tags="fourth-signed sixth-signed seventh-signed" && >> > + for i in $ta

Re: [PATCH v4 6/6] tag.c: Change gpg_verify_tag argument to sha1

On Mon, Apr 4, 2016 at 10:10 PM, Santiago Torres <santi...@nyu.edu> wrote: > On Mon, Apr 04, 2016 at 10:00:17PM -0400, Eric Sunshine wrote: >> On Mon, Apr 4, 2016 at 6:22 PM, <santi...@nyu.edu> wrote: >> > - return gpg_verify_tag(name, GPG_VERIFY_VERBOSE); >

Re: [PATCH v4 6/6] tag.c: Change gpg_verify_tag argument to sha1

On Mon, Apr 4, 2016 at 6:22 PM, wrote: > tag.c: Change gpg_verify_tag argument to sha1 s/Change/change/ > The gpg_verify_tag function resolves the ref for any existing object. > However, git tag -v resolves to only tag-refs. We can provide support > for sha1 by moving the

Re: [PATCH v4 5/6] tag: use pgp_verify_function in tag -v call

On Mon, Apr 4, 2016 at 6:22 PM, wrote: > Instead of running the verify-tag plumbing command, we use the > pgp_verify_tag(). This avoids the usage of an extra fork call. To do > this, we extend the number of parameters that tag.c takes, and > verify-tag passes. Redundant calls

Re: [PATCH v4 4/6] tag.c: Replace varialbe name for readability

On Mon, Apr 4, 2016 at 6:22 PM, wrote: > tag.c: Replace varialbe name for readability s/Replace/replace/ s/varialbe/variable/ > The run_gpg_verify function has two variables size, and len. This may > come off as confusing when reading the code. We clarify which one > pertains

Re: [PATCH v4 2/6] t/t7030-verify-tag.sh: Adds validation for multiple tags

On Mon, Apr 4, 2016 at 6:22 PM, wrote: > t/t7030-verify-tag.sh: Adds validation for multiple tags Rewrite: t7030: test verify-tag with multiple tags The leading "t/" and the trailing "-*.sh" were dropped since they add no value. > The verify-tag command supports

Re: [PATCH v5 4/4] pretty: test --expand-tabs

On Mon, Apr 4, 2016 at 8:58 PM, Junio C Hamano wrote: > The test prepares a simple commit with HT on its log message lines, > and makes sure that > > - formats that should or should not expand tabs by default do or do >not expand tabs respectively, > > - with explicit

Re: [PATCH v12 5/5] commit: add a commit.verbose config variable

On Sun, Apr 3, 2016 at 8:58 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > The fact that the 32 new tests are nearly identical suggests strongly > that the testing should instead either be table-driven or be done via > for-loops to systematically cover all cases. Not on

Re: [PATCH] git-format-patch.txt: don't show -s as shorthand for multiple options

On Mon, Apr 4, 2016 at 6:38 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Mon, Apr 4, 2016 at 4:07 PM, Junio C Hamano <gits...@pobox.com> wrote: >> Eric Sunshine <sunsh...@sunshineco.com> writes: >>>> Given that the ifndef/endif block immediat

Re: [PATCH] git-format-patch.txt: don't show -s as shorthand for multiple options

On Mon, Apr 4, 2016 at 4:07 PM, Junio C Hamano <gits...@pobox.com> wrote: > Eric Sunshine <sunsh...@sunshineco.com> writes: >>> Given that the ifndef/endif block immediately before this part is >>> also about excluding -p/-u/--patch when formatting the documentat

Re: [PATCH] git-format-patch.txt: don't show -s as shorthand for multiple options

On Mon, Apr 4, 2016 at 3:32 PM, Junio C Hamano <gits...@pobox.com> wrote: > Eric Sunshine <sunsh...@sunshineco.com> writes: >> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt >> @@ -28,10 +28,12 @@ ifdef::git-diff[] >> endif::git-d

Re: [PATCH 5/5] t/t5520: test --[no-]autostash with pull.rebase=true

On Mon, Apr 4, 2016 at 1:36 PM, Mehul Jain wrote: > On Mon, Apr 4, 2016 at 10:22 PM, Matthieu Moy > wrote: >> I think it would be much simpler to drop the loop, and write instead >> something like (untested): > > I tested it (with few minor

Re: [PATCH] git-format-patch.txt: don't show -s as shorthand for multiple options

Ping? On Sun, Mar 27, 2016 at 5:26 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > git-format-patch recognizes -s as shorthand only for --signoff, however, > its documentation shows -s as shorthand for both --signoff and > --no-patch. Resolve this confusion by suppressi

Re: [PATCH v12 1/5] t0040-test-parse-options.sh: fix style issues

On Mon, Apr 4, 2016 at 8:45 AM, Pranit Bauva wrote: > Okay I will do the change. I was previously unaware about the use of > '\' before EOF. I googled it now. But I am still confused about its > use in this scenario. Upto what I understood, it is used where you > want to

Re: [PATCH] rev-parse: fix --git-common-dir when executed from subpath of main tree

On Sun, Apr 3, 2016 at 9:42 PM, Michael Rappazzo wrote: > Executing `git-rev-parse --git-common-dir` from the root of the main > worktree results in '.git', which is the relative path to the git dir. > When executed from a subpath of the main tree it returned somthing like:

Re: [PATCH] comment for a long #ifdef

On Sun, Apr 3, 2016 at 9:00 PM, Ivan Pozdeev wrote: > --- Missing sign-off. See Documentation/SubmittingPatches. > compat/poll/poll.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/compat/poll/poll.c b/compat/poll/poll.c > index db4e03e..5eb0280

Re: [PATCH v3 2/4] t/t7030-verify-tag.sh: Adds validation for multiple tags

On Sun, Apr 3, 2016 at 5:58 PM, Santiago Torres <santi...@nyu.edu> wrote: > On Sun, Apr 03, 2016 at 09:07:25AM -0400, Jeff King wrote: >> On Sun, Apr 03, 2016 at 03:59:46AM -0400, Eric Sunshine wrote: >> > On Sun, Apr 3, 2016 at 12:40 AM, Jeff King <p...@peff.net> wr

Re: [PATCH v12 4/5] t7507-commit-verbose: improve test coverage by testing number of diffs

On Sun, Apr 3, 2016 at 8:02 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: >> Make the fake "editor" store output of grep in a file so that we can >> see how many diffs were

Re: [PATCH v12 5/5] commit: add a commit.verbose config variable

On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > Add commit.verbose configuration variable as a convenience for those > who always prefer --verbose. > > Signed-off-by: Pranit Bauva > --- > diff --git a/Documentation/config.txt

Re: [PATCH v12 4/5] t7507-commit-verbose: improve test coverage by testing number of diffs

, regardless of whether grep found diff headers or not, and to give the reason for making this change ("so that you don't have to use 'test_must_fail' for cases when no diff headers are expected and can instead easily use 'test_line_count = 0'"). The patch itself looks fine and is easy e

Re: [PATCH v12 3/5] parse-options.c: make OPTION_COUNTUP respect "unspecified" values

On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > The reason to make it respect "unspecified" values is to give the > ability to differentiate whether `--option` or `--no-option` was > specified at all. "unspecified" values should be in the form of negative > values.

Re: [PATCH v12 2/5] test-parse-options: print quiet as integer

On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > Current implementation of parse-options.c treats OPT__QUIET() as integer > and not boolean and thus it is more appropriate to print it as integer > to avoid confusion. I can buy this line of reasoning, however, it

Re: [PATCH v12 1/5] t0040-test-parse-options.sh: fix style issues

On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > Signed-off-by: Pranit Bauva > --- > diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh > @@ -7,7 +7,7 @@ test_description='our own option parser' > > . ./test-lib.sh > > -cat >

Re: [PATCH v2 0/7] t5520: tests for --[no-]autostash option

5, 3/5 are improved > as suggested by Eric in the previous round. Thanks, this version was a pleasant read, much simpler and easier to digest than the previous round[1]. With or without addressing the few minor nits in my review (none of which warrant a re-roll)

Re: [PATCH v2 7/7] t5520: test --[no-]autostash with pull.rebase=true

On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain wrote: > "--[no-]autostash" option for git-pull is only valid in rebase mode( s/"--[no-]autostash"/The --[no-]autostash/ Also, move the '(' from the end of the line to the beginning of the next line. > i.e. either --rebase

Re: [PATCH v2 5/7] t5520: factor out common code

f code. > > Factor out common code into test_pull_autostash_fail() and then call it in > these tests. > > Helped-by: Eric Sunshine <sunsh...@sunshineco.com> > Signed-off-by: Mehul Jain <mehul.jain2...@gmail.com> > --- > diff --git a/t/t5520-pull.sh

Re: [PATCH v2 4/7] t5520: factor out common code

f code. > > Factor out common code into test_pull_autostash() and then call it in > these tests. > > Helped-by: Eric Sunshine <sunsh...@sunshineco.com> > Signed-off-by: Mehul Jain <mehul.jain2...@gmail.com> > --- > diff --git a/t/t5520-pull.sh b/t/t5520-pul

Re: [PATCH 5/5] t/t5520: test --[no-]autostash with pull.rebase=true

On Fri, Apr 1, 2016 at 6:27 AM, Mehul Jain wrote: > I tried out this method also. Below is the script that I wrote for this: > > test_autostash () { > OLDIFS=$IFS > IFS=',=' > while read -r expect cmd config_variable value > do >

Re: [PATCH v3 3/4] builtin/verify-tag: move verification code to tag.c

On Sat, Apr 2, 2016 at 7:16 PM, wrote: > The PGP verification routine for tags could be accessed by other > commands that require it. We do this by moving it to the common tag.c > code. We rename the verify_tag() function to pgp_verify_tag() to avoid > conflicts with the

Re: [PATCH v3 3/4] builtin/verify-tag: move verification code to tag.c

On Sun, Apr 3, 2016 at 12:45 AM, Jeff King wrote: > On Sat, Apr 02, 2016 at 07:16:14PM -0400, santi...@nyu.edu wrote: >> - len = parse_signature(buf, size); >> - >> - if (size == len) { >> - if (flags & GPG_VERIFY_VERBOSE) >> -

Re: [PATCH v3 2/4] t/t7030-verify-tag.sh: Adds validation for multiple tags

On Sun, Apr 3, 2016 at 12:40 AM, Jeff King wrote: > In fact, I suspect you could replace the "GOODSIG" check as well by > doing something like: > > # verifying 3 tags in one invocation should be exactly like > # verifying the 3 separately > tags="fourth-signed sixth-signed

Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

On Fri, Apr 1, 2016 at 6:44 AM, Elia Pinto wrote: > Implements the GIT_CURL_DEBUG environment variable to allow a greater > degree of detail of GIT_CURL_VERBOSE, in particular the complete > transport header and all the data payload exchanged. > It might be useful if a

Re: [PATCH 1/2] submodule--helper, module_clone: always operate on absolute paths

On Fri, Apr 1, 2016 at 3:30 PM, Junio C Hamano wrote: > Subject: [PATCH] submodule--helper: do not borrow absolute_path() result for > too long > > absolute_path() is designed to allow its callers to take a brief > peek of the result (typically, to be fed to functions like >

Re: [PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy

On Fri, Apr 1, 2016 at 1:14 PM, Jeff King wrote: > On Fri, Apr 01, 2016 at 10:03:25AM -0700, Junio C Hamano wrote: >> From: Stefan Beller >> Date: Thu, 31 Mar 2016 11:04:03 -0700 >> Subject: [PATCH] notes: don't leak memory in git_config_get_notes_strategy >>

Re: [PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy

On Thu, Mar 31, 2016 at 8:35 PM, Stefan Beller wrote: > `value` is just a temporary scratchpad, so we need to make sure it doesn't > leak. It is xstrdup'd in `git_config_get_string_const` and > `parse_notes_merge_strategy` just compares the string against predefined > values,

Re: [PATCH v4] git-send-pack: fix --all option when used with directory

On Thu, Mar 31, 2016 at 6:02 PM, Junio C Hamano wrote: > By the way, for some reason it was unusually painful to find the > exact breakage by bisecting between maint-2.4 and maint-2.6. It > somehow ended up on fingering random places like v2.6.0 itself. > > The true culprit is

Re: [PATCHv2 3/5] submodule--helper clone: remove double path checking

On Thu, Mar 31, 2016 at 5:04 PM, Stefan Beller wrote: > submodule--helper clone: remove double path checking I think Junio mentioned in v1 that calling this "path checking" is misleading. > We make sure that the parent directory of path exists (or create it > otherwise) and

Re: [PATCHv2 2/5] submodule--helper clone: simplify path check

On Thu, Mar 31, 2016 at 5:04 PM, Stefan Beller wrote: > submodule--helper clone: simplify path check I don't see anything in the patch which simplifies a path check. Instead, this version of the patch is now fixing a potential NULL-dereference. > The calling shell code makes

Re: [PATCHv3 1/4] notes: don't leak memory in git_config_get_notes_strategy

On Thu, Mar 31, 2016 at 2:04 PM, Stefan Beller wrote: > `value` is just a temporary scratchpad, so we need to make sure it doesn't > leak. It is xstrdup'd in `git_config_get_string_const` and > `parse_notes_merge_strategy` just compares the string against predefined > values,

<    10   11   12   13   14   15   16   17   18   19   >