Re: Git in Outreachy December 2019?

2019-10-22 Thread Emily Shaffer
On Fri, Sep 20, 2019 at 06:47:01PM -0700, Emily Shaffer wrote: > On Fri, Sep 20, 2019 at 10:04:48AM -0700, Jonathan Tan wrote: > > > Prospective mentors need to sign up on that site, and should propose a > > > project they'd be willing to mentor. > > > >

Re: [PATCH 1/1] documentation: remove empty doc files

2019-10-22 Thread Emily Shaffer
On Tue, Oct 22, 2019 at 06:19:35PM +, Heba Waly via GitGitGadget wrote: > From: Heba Waly > > Remove empty and redundant documentation files from the > Documentation/technical/ directory. > > As part of moving the documentation from Documentation/technical/api-* to > header files, the follow

Re: [PATCH v2 1/1] config: move documentation to config.h

2019-10-22 Thread Emily Shaffer
On Tue, Oct 22, 2019 at 07:05:06AM +, Heba Waly via GitGitGadget wrote: > From: Heba Waly > > Move the documentation from Documentation/technical/api-config.txt into > config.h This is still a little thin for what we usually want from commit messages. Try to imagine that five years from now,

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-22 Thread Emily Shaffer
On Sun, Oct 20, 2019 at 09:35:17PM +1300, Heba Waly wrote: > On Sat, Oct 19, 2019 at 11:52 AM Emily Shaffer > wrote: > > > > On Fri, Oct 18, 2019 at 12:06:59AM +, Heba Waly via GitGitGadget wrote: > > > From: Heba Waly > > > > Hi Heba, > >

Re: Outreachy Winter 2019

2019-10-21 Thread Emily Shaffer
On Mon, Oct 21, 2019 at 11:54:01AM -0500, Karina Saucedo wrote: > Hello, my name is Karina and I'm and Outreachy applicant. I´m interested in > applying to the project 'Add did you mean hints´ and I was wondering how > can I start contributing since there seem to be no issues on the github > page.

Re: [Outreachy] First contribution

2019-10-21 Thread Emily Shaffer
On Mon, Oct 21, 2019 at 12:39:16PM +0200, Miriam R. wrote: > Dear Git developers, > I’m an Outreachy applicant, I would like to make my contribution to > apply to this Outreachy internship period. Welcome, Miriam! Good to hear from you. > > I have found this issue tagged as open and goodfirstiss

[Git Developer Blog] [PATCH] post: a tour of git's object types

2019-10-18 Thread Emily Shaffer
t the objects look like and how their names are generated. This is related to https://gitlab.com/git-scm/blog/issues/15 Signed-off-by: Emily Shaffer --- Hi all, In the hopes of getting some more momentum on the developer blog, here's a crosspost from my personal blog some months ago, targeted f

Re: [PATCH v6 1/2] documentation: add tutorial for first contribution

2019-10-18 Thread Emily Shaffer
On Fri, Oct 18, 2019 at 06:40:27PM +0200, SZEDER Gábor wrote: > > Just leaving a quick note here: an entry about the new command should > be added to 'command-list.txt' as well, so it will be included in the > list of available commands in 'git help -a' or even in 'git help' > and in completion, i

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-18 Thread Emily Shaffer
On Fri, Oct 18, 2019 at 12:06:59AM +, Heba Waly via GitGitGadget wrote: > From: Heba Waly Hi Heba, Thanks for the patch! I'd like to highlight to the community that this is an Outreachy applicant and microproject. Heba, when you send the next version, I think you can add [Outreachy] manuall

[PATCH v6] documentation: add tutorial for object walking

2019-10-11 Thread Emily Shaffer
does not cover how to create new commands or search for options from the command line or gitconfigs. There is an associated patchset at https://github.com/nasamuffin/git/tree/revwalk that contains a reference implementation of the code generated by this tutorial. Signed-off-by: Emily Shaffer Helped

Re: [PATCH v5] documentation: add tutorial for object walking

2019-10-11 Thread Emily Shaffer
On Fri, Oct 11, 2019 at 07:50:10PM +0200, SZEDER Gábor wrote: > On Thu, Oct 10, 2019 at 08:19:32AM -0700, Emily Shaffer wrote: > > diff --git a/Documentation/MyFirstObjectWalk.txt > > b/Documentation/MyFirstObjectWalk.txt > > new file mode 100644 > > index 00..7

Re: [PATCH v5] documentation: add tutorial for object walking

2019-10-11 Thread Emily Shaffer
On Fri, Oct 11, 2019 at 02:50:34PM +0900, Junio C Hamano wrote: > Emily Shaffer writes: > > > @@ -77,6 +77,7 @@ API_DOCS = $(patsubst %.txt,%,$(filter-out > > technical/api-index-skel.txt technica > > SP_ARTICLES += $(API_DOCS) > > > > TECH_DOCS +

[PATCH v5] documentation: add tutorial for object walking

2019-10-10 Thread Emily Shaffer
search for options from the command line or gitconfigs. There is an associated patchset at https://github.com/nasamuffin/git/tree/revwalk that contains a reference implementation of the code generated by this tutorial. Signed-off-by: Emily Shaffer Helped-by: Eric Sunshine --- Primarily since v5

Re: Raise your hand to Ack jk/code-of-conduct if your Ack fell thru cracks

2019-10-08 Thread Emily Shaffer
gt; > Acked-by: Jonathan Tan > > Acked-by: Thomas Gummerer > > Acked-by: brian m. carlson > > Acked-by: Elijah Newren > > > > Junio, would you mind picking it up, please? Yes, I'd like to join too - I was missed by the scan. Acked-by: Emily Shaffer I'm very excited for us to adopt this document. - Emily

Re: Outreachy

2019-10-07 Thread Emily Shaffer
On Sun, Oct 06, 2019 at 01:32:54AM +0530, Rajni Jha wrote: > Hello! Welcome! Thank you for introducing yourself and please don't hesitate to ask any questions you may have. > > I am an outreachy applicant and I am looking forward to working with git > for my outreachy internship. Hope this will

Re: [Outreachy] Outreachy internship program

2019-10-03 Thread Emily Shaffer
t > bash command does not exist. Should I install something similar to iTerm > instead on windows and just start fresh? ty. > > George! > > On Thu, Oct 3, 2019 at 11:14 AM Emily Shaffer wrote: >> >> Hi George, >> >> Great to hear that you're walking

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

2019-10-03 Thread Emily Shaffer
On Thu, Oct 03, 2019 at 02:04:39PM +0900, Junio C Hamano wrote: > 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 branche

[PATCH v4] promisor-remote: skip move_to_tail when no-op

2019-09-30 Thread Emily Shaffer
g Signed-off-by: Emily Shaffer --- Since v3 missed a small comment change. promisor-remote.c| 3 +++ t/t0410-partial-clone.sh | 13 + 2 files changed, 16 insertions(+) diff --git a/promisor-remote.c b/promisor-remote.c index 9bc296cdde..9bd5b79d59 100644 --- a/promiso

[PATCH v3] promisor-remote: skip move_to_tail when no-op

2019-09-30 Thread Emily Shaffer
g Signed-off-by: Emily Shaffer --- Fixed up some nits from Peff in v2. Thanks especially for the catch on capturing the output of the fetch - I had been grepping it before I realized that test_must_fail accounted for unexpected signal exits, and forgot to remove the redirect. - Emily p

Re: [PATCH] CODE_OF_CONDUCT: mention individual project-leader emails

2019-09-26 Thread Emily Shaffer
On Thu, Sep 26, 2019 at 03:20:46AM -0400, Jeff King wrote: > So here's a patch that I think improves the situation. Looks great to me and addresses my only concern with the original patch. Hearty ACK. - Emily

[PATCH v2] promisor-remote: skip move_to_tail when no-op

2019-09-26 Thread Emily Shaffer
the user without removing the filter or re-cloning the repo and hoping to miss this edge case. Now, when promisor_remote_move_to_tail() would be a no-op, just do a no-op. In cases of promisor_remote_move_to_tail() where r is not already at the tail of the list, it works as before. Signed-off-b

Re: [PATCH] promisor-remote: skip move_to_tail when n=1

2019-09-26 Thread Emily Shaffer
On Thu, Sep 26, 2019 at 03:55:35AM -0400, Jeff King wrote: > On Wed, Sep 25, 2019 at 02:37:18PM -0700, Emily Shaffer wrote: > > > Previously, when promisor_remote_move_to_tail() is called for a > > promisor_remote which is currently the *only* element in promisors, a > >

[PATCH] promisor-remote: skip move_to_tail when n=1

2019-09-25 Thread Emily Shaffer
po and hoping to miss this edge case. Now, when promisor_remote_move_to_tail() would be a no-op, just do a no-op. In cases of promisor_remote_move_to_tail() where n>1, it works correctly. Signed-off-by: Emily Shaffer --- This change showed up for us in a user bugreport; I'm actually fa

Re: [PATCH] add a Code of Conduct document

2019-09-24 Thread Emily Shaffer
> > I've cc'd g...@sfconservancy.org here, because I think it's important for > > all of the project committee members to endorse it (and because the > > document puts us on the hook for enforcing it!). > > I tried looking it up but I couldn't find who the project committee > members are. Is this l

Re: Git in Outreachy December 2019?

2019-09-20 Thread Emily Shaffer
On Fri, Sep 20, 2019 at 10:04:48AM -0700, Jonathan Tan wrote: > > Prospective mentors need to sign up on that site, and should propose a > > project they'd be willing to mentor. > > [snip] > > > I'm happy to discuss possible projects if anybody has an idea but isn't > > sure how to develop it int

Re: [PATCH] doc: MyFirstContribution: fix cmd placement instructions

2019-09-19 Thread Emily Shaffer
Thanks for sending this. I guess I don't know the alphabet very well :) A different color we could paint the bikeshed would be to write "add a new line for `psuh` immediately after it" in these places instead. But I have no preference whatsoever. - Emily Reviewed-by: Emily S

Re: [DISCUSSION] Growing the Git community

2019-09-19 Thread Emily Shaffer
On Thu, Sep 19, 2019 at 10:34:23AM -0700, Denton Liu wrote: > Aside from getting the first email sent, most of my time learning to > contribute to Git stemmed from the fact that there's a lot of tribal > knowledge that's not really written down anywhere. Here are some of the > smaller things that c

Re: RFC - Git Developer Blog

2019-09-17 Thread Emily Shaffer
On Tue, Sep 17, 2019 at 03:22:38PM -0400, James Ramsay wrote: > On 13 Sep 2019, at 10:05, pedro rijo wrote: > > > Just a minor question: since we have git-scm, pro-git, and git > > translations in github, why not keep in the same place, under the same > > organization? I just find it easier to fin

Re: Git in Outreachy December 2019?

2019-09-16 Thread Emily Shaffer
On Fri, Sep 13, 2019 at 04:51:49PM -0400, Jeff King wrote: > On Fri, Sep 13, 2019 at 01:03:17PM -0700, Jonathan Tan wrote: > > > > Do we have interested mentors for the next round of Outreachy? > > > > > > The deadline for Git to apply to the program is September 5th. The > > > deadline for mento

Re: Git in Outreachy December 2019?

2019-09-05 Thread Emily Shaffer
On Wed, Sep 04, 2019 at 03:41:15PM -0400, Jeff King wrote: > On Tue, Aug 27, 2019 at 01:17:57AM -0400, Jeff King wrote: > > > Do we have interested mentors for the next round of Outreachy? > > > > The deadline for Git to apply to the program is September 5th. The > > deadline for mentors to have

Re: [BUG] You can't have single quote in your username

2019-08-22 Thread Emily Shaffer
On Thu, Aug 22, 2019 at 09:58:48AM -0700, Bryan Turner wrote: > On Thu, Aug 22, 2019 at 5:32 AM Giuseppe Crinò wrote: > > > > Note how `git log` discards the ending quote character: > > > > > root@NBR1710R:~/repo# git add foo > > root@NBR1710R:~/repo# git commit -m 'first' > > [master (root-com

Re: [PATCH v2 2/2] bugreport: generate config whitelist based on docs

2019-08-21 Thread Emily Shaffer
On Sat, Aug 17, 2019 at 10:38:46PM +0200, Martin Ågren wrote: > On Sat, 17 Aug 2019 at 02:42, Emily Shaffer wrote: > > > > Add a new step to the build to generate a whitelist of git-config > > variables which are appropriate to include in the output of > > git-bugr

[PATCH v2 0/2] add git-bugreport tool

2019-08-16 Thread Emily Shaffer
output as they're likely harmless, but very verbose; I didn't want the user to stop reading and never examine the shorter and scarier generated output, like the config. Thanks for thoughts. - Emily Emily Shaffer (2): bugreport: add tool to generate debugging info bugreport: gene

[PATCH v2 2/2] bugreport: generate config whitelist based on docs

2019-08-16 Thread Emily Shaffer
g documentation, where contributors are already used to documenting their new config keys. Additionally, add annotations to the sendemail config documentation in order to demonstrate a proof of concept. Signed-off-by: Emily Shaffer --- .gitignore | 1 + Docum

[PATCH v2 1/2] bugreport: add tool to generate debugging info

2019-08-16 Thread Emily Shaffer
t" if they have put their repository into a state they are confused by. Signed-off-by: Emily Shaffer --- .gitignore | 1 + Documentation/git-bugreport.txt | 51 Makefile| 1 + command-list.txt| 1 + git-b

Re: [PATCH] bugreport: add tool to generate debugging info

2019-08-16 Thread Emily Shaffer
On Fri, Aug 16, 2019 at 09:41:41AM -0700, Junio C Hamano wrote: > Emily Shaffer writes: > > > I think comparing this habit to the .gitignore isn't quite fair - > > .gitignore tells me I forgot to add my new command binary to it, when I > > run `git status` to see wh

Re: [PATCH] bugreport: add tool to generate debugging info

2019-08-15 Thread Emily Shaffer
On Thu, Aug 15, 2019 at 04:40:50PM -0700, Junio C Hamano wrote: > Emily Shaffer writes: > > > I think a whitelist of config options to print would grow stale > > immediately, and the options we're missing would be very likely to be > > configs to turn on new exp

Re: [PATCH] bugreport: add tool to generate debugging info

2019-08-15 Thread Emily Shaffer
On Thu, Aug 15, 2019 at 03:29:24PM -0700, Junio C Hamano wrote: > Emily Shaffer writes: > > >> > +NOTE > >> > + > >> > +Bug reports can be sent to git@vger.kernel.org. > >> > >> I am not sure if this belongs here. > > > &g

Re: [PATCH] bugreport: add tool to generate debugging info

2019-08-15 Thread Emily Shaffer
On Thu, Aug 15, 2019 at 07:36:57AM -0700, Junio C Hamano wrote: > Derrick Stolee writes: > > > Config options to consider stripping out: > > > > *url* > > *pass* (anything "password" but also "sendmail.smtppass") > > Blacklisting? I wonder if users feel safer if these are limited to > k

Re: [PATCH] bugreport: add tool to generate debugging info

2019-08-15 Thread Emily Shaffer
On Thu, Aug 15, 2019 at 10:07:57PM +0200, Johannes Schindelin wrote: > Hi, > > On Thu, 15 Aug 2019, Derrick Stolee wrote: > > > On 8/14/2019 10:34 PM, Emily Shaffer wrote: > > > diff --git a/git-bugreport.sh b/git-bugreport.sh > > > new file mode 10075

Re: [PATCH] bugreport: add tool to generate debugging info

2019-08-15 Thread Emily Shaffer
On Thu, Aug 15, 2019 at 11:10:12AM -0700, Junio C Hamano wrote: > Emily Shaffer writes: > > > diff --git a/Documentation/git-bugreport.txt > > b/Documentation/git-bugreport.txt > > new file mode 100644 > > index 00..c5f45bbee8 > > --- /dev/null >

Re: [PATCH] bugreport: add tool to generate debugging info

2019-08-15 Thread Emily Shaffer
On Thu, Aug 15, 2019 at 10:15:24AM -0400, Derrick Stolee wrote: > > - Do we want to advertise the Git mailing list for bug reports? > > That is possible. Isn't there another mailing list for git users? I know there's an IRC channel for Git users, I dunno about mailing list. I'm worried that pla

[PATCH] bugreport: add tool to generate debugging info

2019-08-14 Thread Emily Shaffer
this to their local "Git expert" if they have put their repository into a state they are confused by. Signed-off-by: Emily Shaffer --- There are some things I'm not certain about from this patch, I'd appreciate feedback. - Do we want to advertise the Git mailing list for bug

Re: [PATCH v4] documentation: add tutorial for revision walking

2019-08-14 Thread Emily Shaffer
On Wed, Aug 07, 2019 at 12:19:12PM -0700, Junio C Hamano wrote: > Emily Shaffer writes: > > > Since v3, only a couple of minor changes from Jonathan Tan - thanks. > > > > I'm dropping the updates for the RFC set, since they're incremental from > > now. Ne

Re: $> git branch splat response considered harmful

2019-08-08 Thread Emily Shaffer
one, are intended for interactive use and not really meant for scripting or piping. You can usually come up with an equivalent from the plumbing commands, which Bryan has suggested for you with `git for-each-ref`. Git project tries very hard to maintain output format of the plumbing commands so as to not break folks' scripts, but such promises aren't usually made for porcelain commands. -- Emily Shaffer

[PATCH v4] documentation: add tutorial for revision walking

2019-08-06 Thread Emily Shaffer
intentionally does not cover how to create new commands or search for options from the command line or gitconfigs. There is an associated patchset at https://github.com/nasamuffin/git/tree/revwalk that contains a reference implementation of the code generated by this tutorial. Signed-off-by: Emily Shaffer

Re: [RFC PATCH v3 00/13] example implementation of revwalk tutorial

2019-08-06 Thread Emily Shaffer
On Thu, Jul 25, 2019 at 11:25:02AM +0200, Johannes Schindelin wrote: > Hi Emily, > > On Mon, 1 Jul 2019, Emily Shaffer wrote: > > > Since v2, mostly reworded comments, plus fixed the issues mentioned in > > the tutorial itself. Thanks Eric for the review. > > > &

Re: [PATCH v3] documentation: add tutorial for revision walking

2019-08-06 Thread Emily Shaffer
On Wed, Jul 24, 2019 at 04:32:53PM -0700, Jonathan Tan wrote: > Thanks - I think this is a useful guide to what can be a complicated > topic. It looks good overall; I just have some minor comments below. > > > diff --git a/Documentation/Makefile b/Documentation/Makefile > > index 76f2ecfc1b..91e5d

Re: [PATCH 1/1] merge-recursive: avoid directory rename detection in recursive case

2019-08-06 Thread Emily Shaffer
> like yourself might do a double take. > > If folks find it more readable to use regular grep instead of > test_i18ngrep, I can change this line as well as the "core dumped" > check immediately below over to regular grep. > It's fine by me, I see your point. > Thanks for taking a look. :-) Reviewed-by: Emily Shaffer

Re: RFC - Git Developer Blog

2019-08-06 Thread Emily Shaffer
On Tue, Aug 06, 2019 at 09:27:30AM -0400, Jeff King wrote: > On Tue, Aug 06, 2019 at 06:59:21AM +0200, Christian Couder wrote: > > > When Git Rev News was started I thought that there could be such a > > group effort to encourage each other to publish articles in it, but I > > must say that outsid

Re: RFC - Git Developer Blog

2019-08-06 Thread Emily Shaffer
On Tue, Aug 06, 2019 at 08:19:15AM -0400, Derrick Stolee wrote: > On 8/6/2019 12:52 AM, Andrew Ardill wrote: > > On Tue, 6 Aug 2019 at 11:51, Emily Shaffer wrote: > > > >> Are folks interested in writing and reviewing this kind of content? > > I am interested in w

Re: RFC - Git Developer Blog

2019-08-06 Thread Emily Shaffer
On Tue, Aug 06, 2019 at 09:20:52AM -0400, Jeff King wrote: > On Mon, Aug 05, 2019 at 06:49:35PM -0700, Emily Shaffer wrote: > > > Are folks interested in writing and reviewing this kind of content? Any > > ideas for where we may be able to host (maybe git-scm)? > > I thin

Re: [PATCH 1/1] merge-recursive: avoid directory rename detection in recursive case

2019-08-06 Thread Emily Shaffer
e the recursive > case treat 'conflict' as 'false' for opt->detect_directory_renames. > > Reported-by: Emily Shaffer > Signed-off-by: Elijah Newren > --- > > I really should introduce constants like > DETECT_DIRECTORY_RENAMES_NEVER= 0 >

RFC - Git Developer Blog

2019-08-05 Thread Emily Shaffer
Hi all, In backchannels recently there has been some discussion about the idea of a Git-project-blessed blog written by Git contributors, generally covering usability tips or overviews of the internals of Git which the general public tend to find confusing. Ideally, we could use a channel like th

BUG() during criss-cross merge with directory rename and deleted file

2019-07-26 Thread Emily Shaffer
Hi all, As mentioned during the standup in #git-devel today, we encountered a BUG() during certain circumstances of a criss-cross merge. Timing has prevented me from getting the repro case together to send just yet, but it appears that the issue is as follows: - During a merge in a repo with fai

Re: Need help

2019-07-24 Thread Emily Shaffer
og. > > If this is not a right place ask this type of query then plz ignore it. > > Regards > Gobinda Nandi > Software Engineer > -- Emily Shaffer

Re: [PATCH] documentation: add tutorial for revision walking

2019-07-15 Thread Emily Shaffer
On Fri, Jul 12, 2019 at 05:39:48PM -0700, Josh Steadmon wrote: > On 2019.06.20 14:06, Emily Shaffer wrote: > > On Wed, Jun 19, 2019 at 08:17:29AM -0700, Junio C Hamano wrote: > > > Emily Shaffer writes: > > > > > > > Maybe there's a case for s

[PATCH v3] transport-helper: enforce atomic in push_refs_with_push

2019-07-11 Thread Emily Shaffer
't using a transport-helper to get to the upstream, i.e. when we've added a local repository as a remote: git remote add ~/upstream upstream Signed-off-by: Emily Shaffer --- Since the previous version, made a couple changes based on Junio's comments on the testcase. - Use show-

Re: [PATCH v2] transport-helper: enforce atomic in push_refs_with_push

2019-07-11 Thread Emily Shaffer
On Wed, Jul 10, 2019 at 10:53:30AM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > >> + # the new branch should not have been created upstream > >> + test_must_fail git -C "$d" rev-parse refs/heads/atomic && > > > > The new branch should not have been created; if this rev-parse > > su

Re: [PATCH v2] transport-helper: enforce atomic in push_refs_with_push

2019-07-11 Thread Emily Shaffer
On Wed, Jul 10, 2019 at 10:44:22AM -0700, Junio C Hamano wrote: > Emily Shaffer writes: > > > +test_expect_success 'push --atomic also prevents branch creation, reports > > collateral' ' > > + # Setup upstream repo - empty for now > > + d=

[PATCH v2] transport-helper: enforce atomic in push_refs_with_push

2019-07-09 Thread Emily Shaffer
't using a transport-helper to get to the upstream, i.e. when we've added a local repository as a remote: git remote add ~/upstream upstream Signed-off-by: Emily Shaffer --- Since v2, I combined the test cases into one. Unfortunately the new test case is checking a few things at once

Re: [PATCH] transport-helper: enforce atomic in push_refs_with_push

2019-07-09 Thread Emily Shaffer
Firstly, sorry for the delay, I wasn't working for national holiday from the 4th til yesterday. > If I were tasked with developing this further, I would try to move as much > of the setup into the initial test case (if there is already a `setup` > test case; otherwise I would create one). In fact,

Re: [PATCH] transport-helper: enforce atomic in push_refs_with_push

2019-07-03 Thread Emily Shaffer
On Wed, Jul 03, 2019 at 09:41:46PM +0200, Johannes Schindelin wrote: > Hi Emily, > > On Wed, 3 Jul 2019, Emily Shaffer wrote: > > > > > + up="$HTTPD_URL"/smart/atomic-branches.git && > > > > + test_commit atomic1 && > &

Re: [PATCH] transport-helper: enforce atomic in push_refs_with_push

2019-07-03 Thread Emily Shaffer
> > > > +' > > > + > > > +test_expect_success 'push --atomic shows all failed refs' ' > > > + # Make up/master, up/allrefs > > > + d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-failed-refs.git && > > > + git init --bare "$d" && > > > + git --git-dir="$d" config http.receivepack true && > > > + up="$HTTPD_URL"

Re: [PATCH] transport-helper: enforce atomic in push_refs_with_push

2019-07-03 Thread Emily Shaffer
On Wed, Jul 03, 2019 at 11:13:45AM -0700, Junio C Hamano wrote: > SZEDER Gábor writes: > > > On Tue, Jul 02, 2019 at 02:37:42PM -0700, Junio C Hamano wrote: > >> > +test_expect_success 'push --atomic shows all failed refs' ' > >> > +# Make up/master, up/allrefs > >> > +d=$HTTPD_DO

Re: [PATCH] transport-helper: enforce atomic in push_refs_with_push

2019-07-03 Thread Emily Shaffer
> > +test_expect_success 'push --atomic also prevents branch creation' ' > > + # Make up/master > > + d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git && > > + git init --bare "$d" && > > + git --git-dir="$d" config http.receivepack true && > > Why not `-C "$d"`? The example I had found bel

Re: [PATCH] transport-helper: enforce atomic in push_refs_with_push

2019-07-02 Thread Emily Shaffer
On Tue, Jul 02, 2019 at 02:37:42PM -0700, Junio C Hamano wrote: > > > > +test_expect_success 'push --atomic also prevents branch creation' ' > > + # Make up/master > > + d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git && > > + git init --bare "$d" && > > + git --git-dir="$d" config http.r

Re: [PATCH] transport-helper: enforce atomic in push_refs_with_push

2019-07-02 Thread Emily Shaffer
On Tue, Jul 02, 2019 at 01:16:46PM -0700, Junio C Hamano wrote: > Emily Shaffer writes: > > > + if ((flags & TRANSPORT_PUSH_ATOMIC) && err) { > > + for (struct ref *it = remote_refs; it; it = it->next) > > +

[PATCH] transport-helper: enforce atomic in push_refs_with_push

2019-07-01 Thread Emily Shaffer
't using a transport-helper to get to the upstream, i.e. when we've added a local repository as a remote: git remote add ~/upstream upstream Signed-off-by: Emily Shaffer --- t/t5541-http-push-smart.sh | 58 ++ transport-helper.c

[RFC PATCH v3 11/13] walken: add filtered object walk

2019-07-01 Thread Emily Shaffer
objects seen in each case. Signed-off-by: Emily Shaffer Change-Id: I6d22ba153c1afbc780c261c47f1fa03ea478b5ed --- builtin/walken.c | 22 +- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/builtin/walken.c b/builtin/walken.c index b613102cfb..7b46377a2e 100644 --- a

[RFC PATCH v3 07/13] walken: filter for authors from gmail address

2019-07-01 Thread Emily Shaffer
to create their own more generalized grep filters during revision walks. Signed-off-by: Emily Shaffer --- builtin/walken.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/walken.c b/builtin/walken.c index f116bb6fca..a600f88cf6 100644 --- a/builtin

[RFC PATCH v3 05/13] walken: configure rev_info and prepare for walk

2019-07-01 Thread Emily Shaffer
empty, and the walk would terminate immediately. Signed-off-by: Emily Shaffer Change-Id: I76754b740227cf17a449f3f536dbbe37031e6f9a --- builtin/walken.c | 50 1 file changed, 50 insertions(+) diff --git a/builtin/walken.c b/builtin/walken.c

[RFC PATCH v3 06/13] walken: perform our basic revision walk

2019-07-01 Thread Emily Shaffer
to `git log --oneline`. Signed-off-by: Emily Shaffer Change-Id: If6dc5f3c9d14df077b99e42806cf790c96191582 --- builtin/walken.c | 42 ++ 1 file changed, 42 insertions(+) diff --git a/builtin/walken.c b/builtin/walken.c index 333d9ecc5e..f116bb6fca 100644

[RFC PATCH v3 12/13] walken: count omitted objects

2019-07-01 Thread Emily Shaffer
inues to dereference omitted trees and commits. This is part of a tutorial on performing revision walks. Signed-off-by: Emily Shaffer --- builtin/walken.c | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/builtin/walken.c b/builtin/walken.c index 7b46377a2e..163

[RFC PATCH v3 04/13] walken: add handler to git_config

2019-07-01 Thread Emily Shaffer
on when we need it. Signed-off-by: Emily Shaffer --- builtin/walken.c | 32 ++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/builtin/walken.c b/builtin/walken.c index 19657b5e31..e53c42ea18 100644 --- a/builtin/walken.c +++ b/builtin/walken.c

[RFC PATCH v3 13/13] walken: reverse the object walk order

2019-07-01 Thread Emily Shaffer
x27;s recommended to pipe the output through `head` or `tail` or to redirect it into a file. Signed-off-by: Emily Shaffer Change-Id: I91883b209a61ae4d87855878291e487fe36220c4 --- builtin/walken.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/walken.c b/builtin/walken.c index 1638f

[RFC PATCH v3 09/13] walken: demonstrate reversing a revision walk list

2019-07-01 Thread Emily Shaffer
The final installment in the tutorial about sorting revision walk outputs. This commit reverses the commit list, so that we see newer commits last (handy since we aren't using a pager). Signed-off-by: Emily Shaffer --- builtin/walken.c | 3 +++ 1 file changed, 3 insertions(+) diff --

[RFC PATCH v3 10/13] walken: add unfiltered object walk from HEAD

2019-07-01 Thread Emily Shaffer
e the unfiltered version, as this will make the tutorial easier to follow. This commit is part of a tutorial on revision walking. Signed-off-by: Emily Shaffer Change-Id: If3b11652ba011b28d29b1c3984dac4a3f80a5f53 --- builtin/walken.c | 91 1 file ch

[RFC PATCH v3 00/13] example implementation of revwalk tutorial

2019-07-01 Thread Emily Shaffer
Since v2, mostly reworded comments, plus fixed the issues mentioned in the tutorial itself. Thanks Eric for the review. Emily Shaffer (13): walken: add infrastructure for revwalk demo walken: add usage to enable -h walken: add placeholder to initialize defaults walken: add handler to

[RFC PATCH v3 01/13] walken: add infrastructure for revwalk demo

2019-07-01 Thread Emily Shaffer
tutorial in Documentation/MyFirstRevWalk.txt. Signed-off-by: Emily Shaffer Change-Id: I64297621919412f54701e111366e99c4ef0feae3 --- Makefile | 1 + builtin.h| 1 + builtin/walken.c | 18 ++ 3 files changed, 20 insertions(+) create mode 100644 builtin/walken.c diff

[RFC PATCH v3 03/13] walken: add placeholder to initialize defaults

2019-07-01 Thread Emily Shaffer
Eventually, we will want a good place to initialize default variables for use during our revision walk(s) in `git walken`. For now, there's nothing to do here, but let's add the scaffolding so that it's easy to tell where to put the setup later on. Signed-off-by: Emily Shaffe

[RFC PATCH v3 02/13] walken: add usage to enable -h

2019-07-01 Thread Emily Shaffer
ke parse_options(). With this change, we can now add cmd_walken to the builtins set and expect tests to pass, so we'll do so - cmd_walken is now open for business. Signed-off-by: Emily Shaffer Change-Id: I2919dc1efadb82acb335617ea24371c84b03bbce --- builtin/walken.c | 21 +++

[RFC PATCH v3 08/13] walken: demonstrate various topographical sorts

2019-07-01 Thread Emily Shaffer
Order the revision walk by author or commit dates to demonstrate how to apply topo_sort to a revision walk. While following the tutorial, new contributors are guided to run a walk with each sort and compare the results. Signed-off-by: Emily Shaffer Change-Id

[PATCH v3] documentation: add tutorial for revision walking

2019-07-01 Thread Emily Shaffer
intentionally does not cover how to create new commands or search for options from the command line or gitconfigs. There is an associated patchset at https://github.com/nasamuffin/git/tree/revwalk that contains a reference implementation of the code generated by this tutorial. Signed-off-by: Emily Shaffer

Re: [RFC PATCH v2 10/13] walken: add unfiltered object walk from HEAD

2019-07-01 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 08:48:31PM -0400, Eric Sunshine wrote: > On Thu, Jun 27, 2019 at 6:31 PM Emily Shaffer wrote: > > On Thu, Jun 27, 2019 at 01:37:58AM -0400, Eric Sunshine wrote: > > > Don't localize the die() message via _() here or in the preceding > > >

Re: [RFC PATCH v2 00/13] example implementation of revwalk tutorial

2019-06-27 Thread Emily Shaffer
On Wed, Jun 26, 2019 at 04:50:19PM -0700, Emily Shaffer wrote: > Since r1, made some significant changes. > > - Added a commit for counting the 'omitted' list, to match the new >section added to the tutorial. > - Added significant comments to allow the sample to bet

Re: [RFC PATCH v2 11/13] walken: add filtered object walk

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 01:42:45AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > Demonstrate how filter specs can be used when performing a revision walk > > of all object types. In this case, tree depth is used. Contributors who > &

Re: [RFC PATCH v2 10/13] walken: add unfiltered object walk from HEAD

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 01:37:58AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > Provide a demonstration of a revision walk which traverses all types of > > object, not just commits. This type of revision walk is used for > > operat

Re: [RFC PATCH v2 09/13] walken: demonstrate reversing a revision walk list

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 01:26:19AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > The final installment in the tutorial about sorting revision walk > > outputs. This commit reverses the commit list, so that we see newer > > commits

Re: [RFC PATCH v2 08/13] walken: demonstrate various topographical sorts

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 01:22:10AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > Order the revision walk by author or commit dates, to demonstrate how to > > s/,// Done.

Re: [RFC PATCH v2 07/13] walken: filter for authors from gmail address

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 01:20:25AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > In order to demonstrate how to create grep filters for revision walks, > > filter the walk performed by cmd_walken() to print only commits which > > ar

Re: [RFC PATCH v2 06/13] walken: perform our basic revision walk

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 01:16:58AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > Add the final steps needed and implement the walk loop itself. We add a > > method walken_commit_walk() which performs the final setup to revision.c > > a

Re: [RFC PATCH v2 05/13] walken: configure rev_info and prepare for walk

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 01:06:32AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > `struct rev_info` is what's used by the struct itself. > > What "struct itself"? Do you mean 'struct rev_info' is used by the > _w

Re: [RFC PATCH v2 04/13] walken: add handler to git_config

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 12:54:15AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > For now, we have no configuration options we want to set up for > > ourselves, but in the future we may need to. At the very least, we > > should invo

Re: [RFC PATCH v2 02/13] walken: add usage to enable -h

2019-06-27 Thread Emily Shaffer
On Thu, Jun 27, 2019 at 12:47:25AM -0400, Eric Sunshine wrote: > On Wed, Jun 26, 2019 at 7:51 PM Emily Shaffer wrote: > > It's expected that Git commands support '-h' in order to provide a > > consistent user experience (and this expectation is enforced by the > &

[RFC PATCH v2 13/13] walken: reverse the object walk order

2019-06-26 Thread Emily Shaffer
x27;s recommended to pipe the output through `head` or `tail` or to redirect it into a file. Signed-off-by: Emily Shaffer Change-Id: I91883b209a61ae4d87855878291e487fe36220c4 --- builtin/walken.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/walken.c b/builtin/walken.c index dc59f

[RFC PATCH v2 11/13] walken: add filtered object walk

2019-06-26 Thread Emily Shaffer
objects seen in each case. Signed-off-by: Emily Shaffer Change-Id: I6d22ba153c1afbc780c261c47f1fa03ea478b5ed --- builtin/walken.c | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/builtin/walken.c b/builtin/walken.c index 42b23ba1ec..a744d042d8 100644 --- a

[RFC PATCH v2 05/13] walken: configure rev_info and prepare for walk

2019-06-26 Thread Emily Shaffer
empty, and the walk would terminate immediately. Signed-off-by: Emily Shaffer Change-Id: I76754b740227cf17a449f3f536dbbe37031e6f9a --- builtin/walken.c | 50 1 file changed, 50 insertions(+) diff --git a/builtin/walken.c b/builtin/walken.c

[RFC PATCH v2 06/13] walken: perform our basic revision walk

2019-06-26 Thread Emily Shaffer
to `git log --oneline`. Signed-off-by: Emily Shaffer Change-Id: If6dc5f3c9d14df077b99e42806cf790c96191582 --- builtin/walken.c | 43 +++ 1 file changed, 43 insertions(+) diff --git a/builtin/walken.c b/builtin/walken.c index c463eca843..335dcb6b21 100644

[RFC PATCH v2 09/13] walken: demonstrate reversing a revision walk list

2019-06-26 Thread Emily Shaffer
tup_revisions(). (This is mentioned in the accompanying tutorial.) Signed-off-by: Emily Shaffer --- builtin/walken.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/walken.c b/builtin/walken.c index 6cc451324a..958923c172 100644 --- a/builtin/walken.c +++ b/builtin/walken.c @

  1   2   >