Re: [PATCH] doc: show usage of branch description

From: "Jacob Keller" Hi, On Sat, Sep 12, 2015 at 3:51 PM, Philip Oakley wrote: The branch description will be included in 'git format-patch --cover-letter' and in 'git pull-request' emails. Tell the reader. While here, clarify that the

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

On Sat, Sep 12, 2015 at 10:39 PM, Eric Sunshine wrote: > I realize that this is modeled closely after existing code in > branch.c, but, with the exception of parsing the ref file and > constructing a worktree structure, the main worktree case (id == NULL) > is entirely

[PATCH] Pass amend to pre-commit hook

Pass a single parameter 'amend' to the pre-commit hook when performing a commit amend. This allows 'incremental improvement' pre-commit hooks to prevent new code from violating a rule, but also allow the pre-commit hook to pass an amended commit where the amend has reverted back to the original

Re: [PATCH v2 2/5] enter_repo: avoid duplicating logic, use is_git_directory() instead

On Sun, Sep 13, 2015 at 8:04 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Mon, Sep 7, 2015 at 11:33 PM, Junio C Hamano wrote: >>> Nguyễn Thái Ngọc Duy writes: >>> Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v5 3/7] git-p4: return an empty list if a list config has no values

From: Lars Schneider Signed-off-by: Lars Schneider --- git-p4.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-p4.py b/git-p4.py index 40ad4ae..90d3b90 100755 --- a/git-p4.py +++ b/git-p4.py @@ -638,6 +638,8 @@ def

[PATCH v5 1/7] git-p4: add optional type specifier to gitConfig reader

From: Lars Schneider The functions “gitConfig” and “gitConfigBool” are almost identical. Make “gitConfig” more generic by adding an optional type specifier. Use the type specifier “—bool” with “gitConfig” to implement “gitConfigBool. This prepares the implementation

Re: [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list

Karthik Nayak writes: > On Mon, Sep 14, 2015 at 12:01 AM, Eric Sunshine > wrote: >> Specifically, I think you're referring to [1] (?). >> >> [1]: >> http://thread.gmane.org/gmane.comp.version-control.git/276363/focus=276676 > > No not that, that

[PATCH v5 5/7] git-p4: check free space during streaming

From: Lars Schneider git-p4 will just halt if there is not enough disk space while streaming content from P4 to Git. Add a check to ensure at least 4 times (arbitrarily chosen) the size of a streamed file is available. Signed-off-by: Lars Schneider

[PATCH v5 7/7] git-p4: add Git LFS backend for large file system

From: Lars Schneider Add example implementation including test cases for the large file system using Git LFS. Pushing files to the Git LFS server is not tested. Signed-off-by: Lars Schneider --- git-p4.py | 72

Re: git submodule ignores --git-dir

On 11.09.2015 17:15, Jens Lehmann wrote: > Unfortunately trying to show git the right work tree: > > $ git --git-dir=$PWD/repo2/.git --work-tree=$PWD/repo2 submodule update --init > > Didn't work as I expected it to either: > > fatal: /home/Sledge/libexec/git-core/git-submodule cannot be used

[PATCH v5 4/7] git-p4: add file streaming progress in verbose mode

From: Lars Schneider If a file is streamed from P4 to Git then the verbose mode prints continuously the progress as percentage like this: //depot/file.bin 20% (10 MB) Upon completion the progress is overwritten with depot source, local file and size like this:

[PATCH v5 6/7] git-p4: add support for large file systems

From: Lars Schneider Perforce repositories can contain large (binary) files. Migrating these repositories to Git generates very large local clones. External storage systems such as Git LFS [1], Git Fat [2], Git Media [3], git-annex [4] try to address this problem. Add

[PATCH v2] doc: show usage of branch description

The branch description will be included in 'git format-patch --cover-letter' and in 'git pull-request' emails. It can also be used in the automatic merge message. Tell the reader. While here, clarify that the description may be a multi-line explanation of the purpose of the branch's patch series.

Re: [PATCH] doc: show usage of branch description

From: "Philip Oakley" From: "Jacob Keller" Hi, On Sat, Sep 12, 2015 at 3:51 PM, Philip Oakley wrote: The branch description will be included in 'git format-patch --cover-letter' and in 'git pull-request' emails. Tell the

Re: [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list

On Mon, Sep 14, 2015 at 12:01 AM, Eric Sunshine wrote: > On Sun, Sep 13, 2015 at 12:46 PM, Eric Sunshine > wrote: >> On Sun, Sep 13, 2015 at 8:12 AM, Matthieu Moy >> wrote: >>> Karthik Nayak

Re: [PATCH] Pass amend to pre-commit hook

On Mon, Sep 14, 2015 at 01:14:20PM +0100, Alan Clucas wrote: > Pass a single parameter 'amend' to the pre-commit hook when performing a > commit amend. I think this is a sensible thing to want, and it has come up a few times. I'm not sure why the last round didn't get merged, though. Looks like

[PATCH v5 2/7] git-p4: add gitConfigInt reader

From: Lars Schneider Add a git config reader for integer variables. Please note that the git config implementation automatically supports k, m, and g suffixes. Signed-off-by: Lars Schneider --- git-p4.py | 11 +++ 1 file changed, 11

[PATCH v5 0/7] git-p4: add support for large file systems

From: Lars Schneider Diff to v4: * Add streaming progress in verbose mode. * Add check for free disk space. * Remove the limitation that no .gitattribues must be present. * Refactor large file system classes. The base implementation does not assume a ".gitattributes

Re: Unable to create temporary file '/var/git/tmv3-target-overlay.git/shallow_Un8ZOR': Permission denied

On Mon, 2015-08-31 at 16:56 +0700, Duy Nguyen wrote: > On Fri, Aug 21, 2015 at 6:36 PM, Joakim Tjernlund > wrote: > > I cannot push: > > # > git push origin > > Login for jo...@git.transmode.se > > Password: > > Counting objects: 7, done. > > Delta compression using

Re: [PATCH v2] l10n: de.po: translate 123 new messages

Acked-by: Phillip Sz > Signed-off-by: Ralf Thielow > --- > po/de.po | 395 > ++- > 1 file changed, 188 insertions(+), 207 deletions(-) > > diff --git a/po/de.po b/po/de.po > index

Re: [PATCH v4] gc: save log from daemonized gc --auto and print it next time

Nguyễn Thái Ngọc Duy writes: > While commit 9f673f9 (gc: config option for running --auto in > background - 2014-02-08) helps reduce some complaints about 'gc > --auto' hogging the terminal, it creates another set of problems. > > The latest in this set is, as the result of

[PATCH v2 1/2] git-p4: add test case for "Translation of file content failed" error

From: Lars Schneider A P4 repository can get into a state where it contains a file with type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4 attempts to retrieve the file then the process crashes with a "Translation of file content failed" error.

[PATCH v2 0/2] git-p4: handle "Translation of file content failed"

From: Lars Schneider diff to v1: * add a test case * use Popen "communication" function instead of "wait" Thanks to Junio for feedback! Known issue: My fix works only if git-p4 is executed in verbose mode. In normal mode no exceptions are thrown and git-p4 just exits.

[PATCH v2 2/2] git-p4: handle "Translation of file content failed"

From: Lars Schneider A P4 repository can get into a state where it contains a file with type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4 attempts to retrieve the file then the process crashes with a "Translation of file content failed" error. Fix this by

Re: [PATCH] doc: show usage of branch description

"Philip Oakley" writes: > It still means that my patch is incomplete in its aim to bring out > these possible broader usages. > > I haven't yet looked at the mail archives to see if there is more > around the time of those introductions. I guess this is largely my fault,

Re: [PATCH] l10n: de.po: translate 123 new messages

Hi, thanks for review! Good eyes. :-) 2015-09-13 20:37 GMT+02:00 Matthias Rüster : > Hi Ralf, > > thanks for your work! > I have only a few things to add: > > > one little typo: > >> @@ -1228,20 +1227,19 @@ msgstr[1] "" >> msgid " (use \"git pull\" to merge the

Re: [PATCH] Pass amend to pre-commit hook

On 14/09/15 15:47, Jeff King wrote: On Mon, Sep 14, 2015 at 01:14:20PM +0100, Alan Clucas wrote: Pass a single parameter 'amend' to the pre-commit hook when performing a commit amend. I think this is a sensible thing to want, and it has come up a few times. I'm not sure why the last round

[PATCH v7] git-p4: add config git-p4.pathEncoding

From: Lars Schneider diff to v6: * Always print the encoded path in verbose mode. v6 is already on next (a9e383). This patch must be applied on next. Is this the right way to handle this situation? Thanks, Lars Lars Schneider (1): git-p4: improve path encoding

Re: [PATCH v2 2/2] dir.c: don't exclude whole dir prematurely if neg pattern may match

Nguyễn Thái Ngọc Duy writes: > diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt > index 473623d..889a72a 100644 > --- a/Documentation/gitignore.txt > +++ b/Documentation/gitignore.txt > @@ -82,12 +82,9 @@ PATTERN FORMAT > > - An optional prefix "`!`"

Re: [PATCH v4] gc: save log from daemonized gc --auto and print it next time

Junio C Hamano writes: > Thanks, will queue. Ehh, I spoke a bit too early. >> diff --git a/builtin/gc.c b/builtin/gc.c >> index bcc75d9..2c3aaeb 100644 >> --- a/builtin/gc.c >> +++ b/builtin/gc.c >> @@ -43,9 +43,20 @@ static struct argv_array prune_worktrees = >>

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

On Sat, Sep 12, 2015 at 11:19 PM, Eric Sunshine wrote: > On Fri, Sep 4, 2015 at 5:39 PM, Michael Rappazzo wrote: >> The code formerly in branch.c was largely the basis of the >> get_worktree_list implementation is now moved to worktree.c, >> and the

Re: [PATCH 2/2] fetch: fetch submodules in parallel

On Sat, Sep 12, 2015 at 12:11 PM, Junio C Hamano wrote: >> + if (start_command([i])) >> + die(_("Could not start child process")); >> + flags = fcntl(children[i].err, F_GETFL); >> +

[PATCH v7] git-p4: improve path encoding verbose output

From: Lars Schneider If a path with non-ASCII characters is detected then print always the encoding and the encoded string in verbose mode. Signed-off-by: Lars Schneider --- git-p4.py | 19 +-- 1 file changed, 9

Re: [PATCH] l10n: de.po: translate 123 new messages

Hi, thanks for review! Am 13. September 2015 um 20:35 schrieb Phillip Sz : >> #: wt-status.c:1105 >> -#, fuzzy >> msgid "No commands done." >> -msgstr "Keine Commits geparst." >> +msgstr "Keine Kommandos ausgeführt." >> > > Are you sure about this? "done" could also

Re: [PATCH 2/2] fetch: fetch submodules in parallel

On Mon, Sep 14, 2015 at 09:46:58AM -0700, Stefan Beller wrote: > I tried implementing a buffering solution for both stdout and stderr, > but that doesn't really workout well if you consider interleaved output > on the pipes as we cannot accurately replay that later on. To do that > we would need

[PATCH v2] l10n: de.po: translate 123 new messages

Translate 123 new messages came from git.pot update in df0617b (l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 395 ++- 1 file changed, 188 insertions(+), 207

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

Mike Rappazzo writes: > On Sat, Sep 12, 2015 at 10:39 PM, Eric Sunshine > wrote: >>> +struct worktree_list *get_worktree_list() >> >> Can we be more concise and call this get_worktrees()? > > I prefer 'get_worktree_list' because I also added the

Developing- Where to Start

Hello all, I'm a third year Computer Science student at the University of Notre Dame, and for the final project of my Data Structures class, my group and I have to find a way to contribute our (hopefully) newly-found data structures and optimization knowledge to a well-known open source project.

Re: Developing- Where to Start

On Mon, Sep 14, 2015 at 2:30 PM, Christian Couder wrote: > Hi, > > On Mon, Sep 14, 2015 at 10:42 PM, Breanna Devore-McDonald > wrote: >> Hello all, >> >> I'm a third year Computer Science student at the University of Notre >> Dame,

Re: [PATCH] strtoul_ui: actually report error in case of negative input

On Mon, Sep 14, 2015 at 08:30:54AM +0200, Matthieu Moy wrote: >> Fix it by changing the last check to trigger earlier, as soon as it >> becomes bigger than INT_MAX. > > What if the value is actually greater than INT_MAX? The function is > returning an unsigned long (64 bits on 64bits

[ANNOUNCE] Git v2.6.0-rc2

A release candidate Git v2.6.0-rc2 is now available for testing at the usual places. It is comprised of 439 non-merge commits since v2.5.0, contributed by 59 people, 14 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following

What's cooking in git.git (Sep 2015, #03; Mon, 14)

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 tip of 'master' is slightly past 2.6-rc2; hopefully l10n team can work on this without updates before the end of the cycle. You can find

Re: Developing- Where to Start

Hi, On Mon, Sep 14, 2015 at 10:42 PM, Breanna Devore-McDonald wrote: > Hello all, > > I'm a third year Computer Science student at the University of Notre > Dame, and for the final project of my Data Structures class, my group > and I have to find a way to

Re: [PATCHv2] fetch submodules in parallel

Stefan Beller writes: > This replaces the last patch of the "Parallel git submodule fetching" > series. Changes: > > * have correct return code in submodule fetching when one submodule fails > * use poll instead of select now > * broke down into more smaller functions instead

Patches generated by "git format-patch -M -B" can't be applied with "git apply"?

A bot I wrote uses 'git format-patch -M -B' to generate a patch to send off to be applied with 'git am' on a remote machine. Alas, renames do not appear to work; git am rejects them with error: file2: already exists in working directory This happens both with the git that ships with Ubuntu 14.04

[L10N] Kickoff of translation for Git 2.6.0 round 2

Hi, Git v2.6.0-rc2 had been released, and introduced three i18n improvements. Please update your translations based on this commit: l10n: git.pot: v2.6.0 round 2 (3 improvements) Introduce three i18n improvements from the following commits: * tag, update-ref: improve description of

[PATCH 4/7] rerere: delay the recording of preimage

We record the preimage only when there is no directory to record the conflict we encountered, i.e. when $GIT_DIR/rr-cache/$ID does not exist. As the plan is to allow multiple pairs as variants for the same conflict ID eventually, this logic needs to go. As the first step in

[PATCH 6/7] t4200: rerere a merge with two identical conflicts

When the context of multiple identical conflicts are different, two seemingly the same conflict resolution cannot be safely applied. In such a case, at least we should be able to record these two resolutions separately in the rerere database, and reuse them when we see the same conflict later.

[PATCH 2/7] rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id

This will help fixing bootstrap corner-case issues, e.g. having an empty $GIT_DIR/rr-cache/$ID directory would fail to record a preimage, in later changes in this series. Signed-off-by: Junio C Hamano --- rerere.c | 32 +--- 1 file changed, 29

[PATCH 3/7] rerere: handle leftover rr-cache/$ID directory and postimage files

If by some accident there is only $GIT_DIR/rr-cache/$ID directory existed, we wouldn't have recorded a preimage for a conflict that is newly encountered, which would mean after a manual resolution, we wouldn't have recorded it by storing the postimage, because the logic used to be "if there is no

[PATCH 7/7] rerere: do use multiple variants

This enables the multiple-variant support for real. Multiple conflicts of the same shape can have differences in contexts where they appear, interfering the replaying of recorded resolution of one conflict to another, and in such a case, their resolutions are recorded as different variants under

[PATCH 5/7] rerere: allow multiple variants to exist

The shape of the conflict in a path determines the conflict ID. The preimage and postimage pair that was recorded for the conflict ID previously may or may not replay well for the conflict we just saw. Currently, we punt when the previous resolution does not cleanly replay, but ideally we should

[PATCH 1/7] rerere: split conflict ID further

The plan is to keep assigning the backward compatible conflict ID based on the hash of the (normalized) text of conflicts, keep using that conflict ID as the directory name under $GIT_DIR/rr-cache/, but allow each conflicted path to use a separate "variant" to record resolutions, i.e. having more

[PATCH 0/7] saving and replaying multiple variants with rerere

This is a continuation of jc/rerere topic that is now in 'next'. The old topic is purely about refactoring and code cleaning and this series builds on top of it. We record a previously seen conflict and its resolution in a subdirectory of $GIT_DIR/rr-cache, and the name of the subdirectory is

Re: Patches generated by "git format-patch -M -B" can't be applied with "git apply"?

Yes, "diff -M -B" is known to be problematic, unfortunately. It incorrectly creates an irreversible patch under certain conditions. http://thread.gmane.org/gmane.linux.kernel/1879635 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: Patches generated by "git format-patch -M -B" can't be applied with "git apply"?

Dan Kegel writes: Yes, "diff -M -B" is known to be problematic, unfortunately. It incorrectly creates an irreversible patch under certain conditions. http://thread.gmane.org/gmane.linux.kernel/1879635 -- To unsubscribe from this list: send the line "unsubscribe git" in the body

Re: Git configure/make does not honor ARFLAGS

On Mon, Sep 14, 2015 at 12:59 AM, Jeff King wrote: > On Sun, Sep 13, 2015 at 09:57:08PM -0700, Junio C Hamano wrote: > >> On Sun, Sep 13, 2015 at 9:30 PM, Jeff King wrote: >> > >> > Ah, OK. Today I learned something. :) >> > >> > Jeffrey, can you produce a tested

[PATCHv2] fetch submodules in parallel

This replaces the last patch of the "Parallel git submodule fetching" series. Changes: * have correct return code in submodule fetching when one submodule fails * use poll instead of select now * broke down into more smaller functions instead of one giant. (I think it is an improvement, but I

[PATCHv2] fetch: fetch submodules in parallel

If we run external commands in parallel we cannot pipe the output directly to the our stdout/err as it would mix up. So each process's output will flow through a pipe, which we buffer. One subprocess can be directly piped to out stdout/err for a low latency feedback to the user. Example: Let's

Re: [PATCH v2 1/2] git-p4: add test case for "Translation of file content failed" error

On 09/14/2015 06:55 PM, larsxschnei...@gmail.com wrote: From: Lars Schneider A P4 repository can get into a state where it contains a file with type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4 attempts to retrieve the file then the process crashes with

Re: Git configure/make does not honor ARFLAGS

Jeffrey Walton writes: >> Oh, indeed. ac179b4d9. Looks good to me. >> >> My follow-up question was going to be: is this something we should be >> setting in config.mak.uname for appropriate versions of Darwin? It >> wasn't clear to me from Eric's description if this is

Re: [PATCHv1 0/3] git-p4: fixing import with labels when commit is not transferred

Hi Luke, >Marcus - if you're able to take a look at this and see if it >fixes your problem that would be very useful. Fix works for me. Thanks a lot for fixing this issue. Best regards, Marcus On 27/08/15 09:18, "Luke Diamand" wrote: >Marcus Holl discovered that git-p4

Re: [PATCH 2/2] fetch: fetch submodules in parallel

On Mon, Sep 14, 2015 at 10:17 AM, Jeff King wrote: > On Mon, Sep 14, 2015 at 09:46:58AM -0700, Stefan Beller wrote: > >> I tried implementing a buffering solution for both stdout and stderr, >> but that doesn't really workout well if you consider interleaved output >> on the pipes

Re: [PATCH 2/2] fetch: fetch submodules in parallel

Jeff King wrote: > On Mon, Sep 14, 2015 at 09:46:58AM -0700, Stefan Beller wrote: >> I tried implementing a buffering solution for both stdout and stderr, >> but that doesn't really workout well if you consider interleaved output >> on the pipes as we cannot accurately replay that later on. [...]

Re: [PATCH v9 1/2] submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()

Max Kirillov writes: > Functions which directly operate submodule's object database do not > handle the case when the submodule is linked worktree (which are > introduced in c7b3a3d2fe). Instead of fixing the path calculation use > already existing strbuf_git_path_submodule()

Re: [PATCH v8 0/2] Submodule object path

Max Kirillov writes: > On Thu, Sep 10, 2015 at 06:10:13PM -0700, Junio C Hamano wrote: >> When I push the updated 'pu' out, could you please check > > I follow the pu merges. So far resolutions seem correct and > all tests pass. The primary thing I ask from "eyeballing by the

Re: [PATCH 2/2] fetch: fetch submodules in parallel

Jeff King writes: > I don't think you need exact timing information. This is no different > than running the commands themselves, with stdout and stderr writing to > a pty that your terminal emulator will then read() from. If the program > produces intermingled stdout/stderr that

Re: [PATCH v7] git-p4: improve path encoding verbose output

larsxschnei...@gmail.com writes: > From: Lars Schneider > > If a path with non-ASCII characters is detected then print always the > encoding and the encoded string in verbose mode. Earlier if the user tells us that s/he knows what she is doing by setting the

Re: [PATCH 2/2] fetch: fetch submodules in parallel

On Mon, Sep 14, 2015 at 10:55:09AM -0700, Jonathan Nieder wrote: > > I don't think you need exact timing information. This is no different > > than running the commands themselves, with stdout and stderr writing to > > a pty that your terminal emulator will then read() from. If the program > >

Re: [PATCH v7] git-p4: add config git-p4.pathEncoding

larsxschnei...@gmail.com writes: > From: Lars Schneider > > diff to v6: > * Always print the encoded path in verbose mode. > > v6 is already on next (a9e383). This patch must be applied on next. > Is this the right way to handle this situation? Yes, I thought that the

Re: [PATCH v4 5/8] branch: drop non-commit error reporting

Karthik Nayak writes: > Remove the error reporting variable to make the code easier to port > over to using ref-filter APIs. This variable is not required as in > ref-filter we already check for possible errors and report them. H. What do you exactly mean "possible

Re: [PATCH] gitk: accelerators for the main menu

Paul Mackerras writes: > On Wed, Sep 09, 2015 at 03:20:53PM +0200, Giuseppe Bilotta wrote: >> This allows fast, keyboard-only usage of the menu (e.g. Alt+V, N to open a >> new view). >> >> Signed-off-by: Giuseppe Bilotta > > Thanks, applied.

Re: [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list

Karthik Nayak writes: > + /* > + * First we obtain all regular branch refs and if the HEAD is > + * detached then we insert that ref to the end of the ref_fist > + * so that it can be printed and removed first. > + */ >

Re: [PATCH] strtoul_ui: actually report error in case of negative input

Max Kirillov writes: > If s == "-1" and CPU is i386, then none of the checks is triggered, including > the last "(unsigned int) ul != ul", because ul == 2**32 - 1, which fits into > "unsigned int". Thanks for noticing and reporting. > Fix it by changing the last check to

Re: Fwd: Translate Pro Git book to Russian and Ukrainian

On Sat, 12 Sep 2015 23:11:40 +0300 Dmitry Strelnikov wrote: > Good day! > I am Russian and Ukrainian native speaker. I have a little free time > and I want to help in translating. > What I may do for it? Please read [1] -- especially the section titled

Re: Git Deployment using existing multiple environments

On Sun, Sep 13, 2015 at 10:55 PM, Sukhwinder Singh wrote: > Thank you for the reply. Let's say I do setup three different repositories > then how can we move work from one repository to the other. For example, from > Test Environment to UAT. If there are any

Re: Fwd: Translate Pro Git book to Russian and Ukrainian

On Mon, 14 Sep 2015 12:48:52 +0300 Konstantin Khomoutov wrote: > > Good day! > > I am Russian and Ukrainian native speaker. I have a little free time > > and I want to help in translating. > > What I may do for it? > > Please read [1] -- especially the section titled