Re: [PATCH 2/2] grep: fix builds with with no thread support

Hello, On Saturday 18 March 2017 12:11 AM, Brandon Williams wrote: Commit 0281e487fd91 ("grep: optionally recurse into submodules") added functions grep_submodule() and grep_submodule_launch() which uses "struct work_item" which is defined only when thread support is available. The original

Re: [PATCH v6 00/27] Remove submodule from files-backend.c

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > v6 should address all Micheal's comments in v5, except a few that I > replied back. The interdiff looks a bit messy due to some new > refactoring (05/27) in files_rename_ref(), but it makes the final > output easier to read. > > 03/27 and

Re: [PATCH v6 26/27] t1406: new tests for submodule ref store

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > t/t1406-submodule-ref-store.sh (new +x) | 95 > + > 1 file changed, 95 insertions(+) > create mode 100755 t/t1406-submodule-ref-store.sh > >

Use base32?

On Wed, 8 Mar 2017, Johannes Schindelin wrote: > > Linus Torvalds writes ("Re: RFC: Another proposed hash function transition > > plan"): > > Of course, having written that, I now realize how it would cause > > > problems for the usual shit-for-brains case-insensitive > filesystems. > > So I

Re: [PATCH 0/8] Various changes to the "tag" command

On Sat, Mar 18, 2017 at 10:32:48AM +, Ævar Arnfjörð Bjarmason wrote: > This series incorporates and replaces all the "tag" patches I have > floating around the list, and adds a lot in the mix which discovered > while working on the initial two patches, but which made sense as > separate

Re: [PATCHv2 2/2] tests: make the 'test_pause' helper work in non-verbose mode

On Sat, Mar 18, 2017 at 05:14:00PM +0100, SZEDER Gábor wrote: > When the 'test_pause' helper function invokes the shell mid-test, it > explicitly redirects the shell's stdout and stderr to file descriptors > 3 and 4, which are the stdout and stderr of the tests (i.e. where they > would be

Re: [PATCHv2 1/2] tests: create an interactive gdb session with the 'debug' helper

On Sat, Mar 18, 2017 at 05:13:59PM +0100, SZEDER Gábor wrote: > The 'debug' test helper is supposed to facilitate debugging by running > a command of the test suite under gdb. Unfortunately, its usefulness > is severely limited, because that gdb session is not interactive, > since the test's,

Re: [PATCH] tests: create an interactive gdb session with the 'debug' helper

On Sat, Mar 18, 2017 at 05:10:18PM +0100, SZEDER Gábor wrote: > > but perhaps this should add: > > > > >&3 2>&4 > > > > to be on the safe side. That covers running without "-v", as well as > > cases where the test script is redirecting output > > That wouldn't buy us much. First, file

Re: [PATCH 6/8] ref-filter: Add --no-contains option to tag/branch/for-each-ref

On Sat, Mar 18, 2017 at 10:32:54AM +, Ævar Arnfjörð Bjarmason wrote: > Change the tag, branch & for-each-ref commands to have a --no-contains > option in addition to their longstanding --contains options. > > This allows for finding the last-good rollout tag given a known-bad > . Given a

Re: [PATCH 5/8] tag: Implicitly supply --list given the -n option

On Sat, Mar 18, 2017 at 10:32:53AM +, Ævar Arnfjörð Bjarmason wrote: > Most of the work for this was done in my preceding "tag: Implicitly > supply --list given another list-like option", but I've split off this > patch since it's more contentious. Now invocations these invocations > will be

Re: [PATCH 4/8] tag: Implicitly supply --list given another list-like option

On Sat, Mar 18, 2017 at 10:32:52AM +, Ævar Arnfjörð Bjarmason wrote: > With this change errors messages such as "--contains option is only > allowed with -l" don't make sense anymore, since options like > --contain turn on -l. Instead we error out when list-like options such > as --contain

Re: [PATCH 3/8] tag: Change misleading --list documentation

On Sat, Mar 18, 2017 at 11:43:47AM -0700, Junio C Hamano wrote: > > +test_expect_success 'Multiple -l or --list options are equivalent to one > > -l option' ' > > + git tag -l -l >actual && > > + test_cmp expect actual && > > + git tag --list --list >actual && > > + test_cmp expect

Re: [PATCH] receive-pack: simplify run_update_post_hook()

On Sat, Mar 18, 2017 at 10:12:07AM -0700, Junio C Hamano wrote: > >> - argv_array_push(, hook); > >>for (cmd = commands; cmd; cmd = cmd->next) { > >>if (cmd->error_string || cmd->did_not_exist) > >>continue; > >> + if (!proc.args.argc) > >> +

Re: [PATCH v2 1/2] l10n: Introduce framework for localizing man pages

Junio C Hamano writes: > Travis seems to have failed. Perhaps something like this is needed, > at least? > > .travis.yml | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/.travis.yml b/.travis.yml > index 591cc57b80..719e5cdb00 100644 > --- a/.travis.yml > +++

Dear Friend,

Dear Friend, With due respect to your person and much sincerity of purpose . I have a business proposal which I will like to handle with you. $14.5 Million USD is involve. But be rest assured that everything is legal and risk free as I have concluded all the arrangements and the legal papers

Re: [patthoyts/git-gui] Don't barf on duplicate recent repo list entries, nor a full list (#10)

From: Pat Thoyts To: patthoyts/git-gui Cc: Philip Oakley ; Mention Sent: Saturday, March 18, 2017 3:47 PM Subject: Re: [patthoyts/git-gui] Don't barf on duplicate recent repo list entries, nor a full list (#10) Merged #10. -- Thanks. This also completes

Re: [PATCH] rev-parse: match @{u}, @{push} and ^{} case-insensitively

Ævar Arnfjörð Bjarmason writes: > I'm not suggesting that we make all the options accept garbage like > the date option in the name of consistency. Then "approxidate is case insensitive so others should too" argument does not hold water. Not that it has to, as I would prefer

Re: [PATCH v3 1/2] diff --no-index: optionally follow symlinks

Dennis Kaarsemaker writes: > diff --git a/diff.c b/diff.c > index be11e4ef2b..2afecfb939 100644 > --- a/diff.c > +++ b/diff.c > @@ -2815,7 +2815,7 @@ int diff_populate_filespec(struct diff_filespec *s, > unsigned int flags) > s->size = xsize_t(st.st_size);

Re: [PATCH v3 0/2] diff --no-index: support symlinks and pipes

Dennis Kaarsemaker writes: > Normal diff provides arguably better output: the diff of the output of the > commands. This series makes it possible for git diff --no-index to follow > symlinks and read from pipes, mimicking the behaviour of normal diff. > > v1:

Re: Is there a way to have a local version of a header file?

Am 19.03.2017 um 00:22 schrieb Samuel Lijin: I'd just provide a .sample and tell people what to do with it in the README. The alternative is to provide config.h as is and tell people to use "git update-index --assume-unchanged" immediately after cloning to ignore changes to the file, but this is

[PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

--- bisect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bisect.c b/bisect.c index 30808cadf..6feed8533 100644 --- a/bisect.c +++ b/bisect.c @@ -131,7 +131,7 @@ static void show_list(const char *debug, int counted, int nr, unsigned flags =

Re: [PATCH v6 18/27] files-backend: replace submodule_allowed check in files_downcast()

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > files-backend.c is unlearning submodules. Instead of having a specific > check for submodules to see what operation is allowed, files backend > now takes a set of flags at init. Each operation will check if the > required flags is present

[PATCH] revision.c: fix an 'Using integer as NULL pointer' warning

Signed-off-by: Ramsay Jones --- Hi Duy, If you need to re-roll your 'nd/prune-in-worktree' branch, could you please squash this into the relevant patch (commit 0a30ae48bb, "revision.c: --indexed-objects add objects from all worktrees", 18-03-2017). Thanks! ATB,

Re: [PATCH v6 17/27] refs: move submodule code out of files-backend.c

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > files-backend is now initialized with a $GIT_DIR. Converting a submodule > path to where real submodule gitdir is located is done in get_ref_store(). > > This gives a slight performance improvement for submodules since we > don't convert

Re: [PATCH v6 16/27] path.c: move some code out of strbuf_git_path_submodule()

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > refs is learning to avoid path rewriting that is done by > strbuf_git_path_submodule(). Factor out this code so it could be reused > by refs* Is the "*" on the previous line is a typo, or did you want to add a footnote, or ...? >

Re: [PATCH v6 11/27] refs.c: introduce get_main_ref_store()

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > refs.c | 16 > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/refs.c b/refs.c > index e7606716dd..2637353b72 100644 > --- a/refs.c > +++

Re: [PATCH v6 02/27] files-backend: make files_log_ref_write() static

On 19/03/17 19:10, Michael Haggerty wrote: > On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: >> Created in 5f3c3a4e6f (files_log_ref_write: new function - 2015-11-10) >> but probably never used outside refs-internal.c >> >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >>

Re: [PATCH v6 09/27] files-backend: add and use files_refname_path()

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > Keep repo-related path handling in one place. This will make it easier > to add submodule/multiworktree support later. > > This automatically adds the "if submodule then use the submodule version > of git_path" to other call sites too. But it

Subject: [PATCH 2/2] refs: remove forward declaration for files_log_ref_write()

Commit 7d3989dac9 ("files-backend: make files_log_ref_write() static", 18-03-2017) made the files_log_ref_write() function static by adding an, otherwise useless, forward declaration. This causes sparse to issue a warning. A much simpler solution is to simply add the static keyword to the

[PATCH 1/2] refs: remove unused head_ref_submodule() implementation

commit 990eaca068 ("refs: remove dead for_each_*_submodule()", 18-03-2017) removed the public declaration of head_ref_submodule(), but forgot to remove the definition. Signed-off-by: Ramsay Jones --- Hi Duy, If you need to re-roll your 'nd/prune-in-worktree'

Re: [BUG] "git stash -- path" reports wrong unstaged changes

This series implements my proposal for fixing bug in git stash -- , plus the two other things I noticed while looking at the code. > I think one option would be to to just keep quiet about the exact > changes that git stash push makes, similar to what we do in the > --include-untracked and in the

[PATCH/RFC 1/3] stash: show less information for stash push --

When using git stash push -- in the following sequence: git init -q repo cd repo for i in one two; do echo content >$i git add $i done git commit -qm base for i in one two; do echo change >$i done

[PATCH/RFC 3/3] stash: pass the pathspec argument to git reset

For "git stash -p --no-keep-index", the pathspec argument is currently not passed to "git reset". This means that changed that are staged but that are excluded from the pathspec still get unstaged by git stash -p. Make sure that doesn't happen by passing the pathspec argument to the git reset in

[PATCH/RFC 2/3] stash: make push -p -q --no-keep-index quiet

Currently when using "git stash push -p -q --no-keep-index", the -q flag is not passed to the git reset which is executed when --no-keep-index is also passed in. This means that git stash is somewhat verbose in this mode even when the -q flag is passed in. This was always the case since "git

Re: [PATCH v6 03/27] files-backend: delete dead code in files_init_db()

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > safe_create_dir() can do adjust_shared_perm() internally, and init-db > has always created 'refs' in shared mode since the beginning, > af6e277c5e (git-init-db: initialize shared repositories with --shared - > 2005-12-22). So this code looks

Re: [PATCH v6 02/27] files-backend: make files_log_ref_write() static

On 03/18/2017 03:03 AM, Nguyễn Thái Ngọc Duy wrote: > Created in 5f3c3a4e6f (files_log_ref_write: new function - 2015-11-10) > but probably never used outside refs-internal.c > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > refs/files-backend.c | 3 +++ > refs/refs-internal.h

[PATCH v2] push: Re-include "push.default=tracking" in the documentation

Change the documentation for push.tracking=* to re-include a mention of what "tracking" does. The "tracking" option was renamed to "upstream" back in 53c4031 ("push.default: Rename 'tracking' to 'upstream'", 2011-02-16), this section was then subsequently rewritten in 87a70e4 ("config doc:

Re: [PATCH] rev-parse: match @{u}, @{push} and ^{} case-insensitively

On Sun, Mar 19, 2017 at 1:55 PM, Junio C Hamano wrote: > > Ævar Arnfjörð Bjarmason writes: > > > Change the revision parsing logic to match @{upstream}, @{u}, @{push}, > > ^{commit}, ^{tree} etc. case-insensitively. All of these cases > > currently emit

Re: Add configuration options for some commonly used command-line options

On Sun, Mar 19, 2017 at 2:18 PM, brian m. carlson wrote: > On Sun, Mar 19, 2017 at 11:15:33AM +0100, Matthieu Moy wrote: >> I think the main problem is indeed "stop the users from shooting >> themselves in the foot". Many command-line options change the behavior >>

Re: Add configuration options for some commonly used command-line options

On Sun, Mar 19, 2017 at 11:15:33AM +0100, Matthieu Moy wrote: > I think the main problem is indeed "stop the users from shooting > themselves in the foot". Many command-line options change the behavior > completely so allowing users to enable them by default means allowing > the users to change

Re: [PATCH] rev-parse: match @{u}, @{push} and ^{} case-insensitively

Ævar Arnfjörð Bjarmason writes: > Change the revision parsing logic to match @{upstream}, @{u}, @{push}, > ^{commit}, ^{tree} etc. case-insensitively. All of these cases > currently emit "unknown revision or path not in the working tree" > errors. > > This change makes them

Re: Add configuration options for some commonly used command-line options

Duy Nguyen writes: > On Thu, Feb 19, 2015 at 5:32 PM, Matthieu Moy > wrote: >> +### Add configuration options for some commonly used command-line options >> + >> +This includes: >> + >> +* git am -3 >> + >> +* git am -c >> + >> +Some people

Re: [PATCH] rev-parse: match @{u}, @{push} and ^{} case-insensitively

On Sun, Mar 19, 2017 at 10:19 AM, Duy Nguyen wrote: > On Sun, Mar 19, 2017 at 5:34 AM, Ævar Arnfjörð Bjarmason > wrote: >> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt >> index ba11b9c95e..55bde6ea65 100644 >> ---

Add configuration options for some commonly used command-line options (Was: [RFH] GSoC 2015 application)

On Thu, Feb 19, 2015 at 5:32 PM, Matthieu Moy wrote: > +### Add configuration options for some commonly used command-line options > + > +This includes: > + > +* git am -3 > + > +* git am -c > + > +Some people always run the command with these options, and would >

Re: [PATCH v3 1/4] environment.c: fix potential segfault by get_git_common_dir()

On Sun, Mar 19, 2017 at 12:54 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> setup_git_env() must be called before this function to initialize >> git_common_dir so that it returns a non NULL string. And it must return >> a non NULL string or

Re: [PATCH] rev-parse: match @{u}, @{push} and ^{} case-insensitively

On Sun, Mar 19, 2017 at 5:34 AM, Ævar Arnfjörð Bjarmason wrote: > diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt > index ba11b9c95e..55bde6ea65 100644 > --- a/Documentation/revisions.txt > +++ b/Documentation/revisions.txt > @@ -96,7 +96,8 @@ some output

[PATCH] git-commit.txt: list post-rewrite in HOOKS section

The hook was added in a86ed83cce (Merge branch 'tr/notes-display' - 2010-03-24), which updated githooks.txt but not git-commit.txt. git-commit.txt was later updated in e858af6d50 (commit: document a couple of options - 2012-06-08). Since this commit focused on command line options, this section

Stop

Stop

Re: [PATCH 1/8] tag: Remove a TODO item from the test suite

On Sun, Mar 19, 2017 at 1:48 AM, Jakub Narębski wrote: > W dniu 18.03.2017 o 11:32, Ævar Arnfjörð Bjarmason pisze: > >> @@ -136,7 +135,6 @@ test_expect_success \ >> 'listing a tag using a matching pattern should output that tag' \ >> 'test $(git tag -l mytag) =