Re: [PATCH v2 00/34] Teach the sequencer to act as rebase -i's backend

Am 13.12.2016 um 16:29 schrieb Johannes Schindelin: base-commit: 8d7a455ed52e2a96debc080dfc011b6bb00db5d2 Published-As: https://github.com/dscho/git/releases/tag/sequencer-i-v2 Fetch-It-Via: git fetch https://github.com/dscho/git sequencer-i-v2 Thank you so much! I would appreciate if you

Re: [PATCH v2 05/34] sequencer (rebase -i): learn about the 'verbose' mode

Junio C Hamano writes: > Johannes Schindelin writes: > ... >> +if (opts->verbose) { >> +const char *argv[] = { >> +"diff-tree", "--stat", NULL, NULL >> +}; >> + ... >>

Re: Creating remote git repository?

On Wed, 14 Dec 2016 09:00:42 +0300 essam Ganadily wrote: > given that git is an old and mature product i wounder why there is no > command line (git.exe in windows) way of creating a remote git > repository? > > "git remote create repo myreponame" > > frankly speaking i

Creating remote git repository?

given that git is an old and mature product i wounder why there is no command line (git.exe in windows) way of creating a remote git repository? "git remote create repo myreponame" frankly speaking i know that our friends in the linux kernel project never felt the need to create remote

[PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

Add the from_user parameter to the 'is_transport_allowed' function. This allows callers to query if a transport protocol is allowed, given that the caller knows that the protocol is coming from the user (1) or not from the user (0) such as redirects in libcurl. If unknown a -1 should be provided

[PATCH v9 4/5] http: create function to get curl allowed protocols

Move the creation of an allowed protocols whitelist to a helper function. Signed-off-by: Brandon Williams --- http.c | 31 --- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/http.c b/http.c index 034426e..f7c488a 100644 ---

[PATCH v9 3/5] http: always warn if libcurl version is too old

Now that there are default "known-good" and "known-bad" protocols which are allowed/disallowed by 'is_transport_allowed' we should always warn the user that older versions of libcurl can't respect the allowed protocols for redirects. Signed-off-by: Brandon Williams --- http.c

[PATCH v9 2/5] transport: add protocol policy config option

Previously the `GIT_ALLOW_PROTOCOL` environment variable was used to specify a whitelist of protocols to be used in clone/fetch/push commands. This patch introduces new configuration options for more fine-grained control for allowing/disallowing protocols. This also has the added benefit of

[PATCH v9 0/5] transport protocol policy configuration

Only difference between v8 and v9 is that v9 has been rebased ontop of Jeff's http-walker-limit-redirect series 'jk/http-walker-limit-redirect'. Brandon Williams (5): lib-proto-disable: variable name fix transport: add protocol policy config option http: always warn if libcurl version is

[PATCH v9 1/5] lib-proto-disable: variable name fix

The test_proto function assigns the positional parameters to named variables, but then still refers to "$desc" as "$1". Using $desc is more readable and less error-prone. Signed-off-by: Brandon Williams --- t/lib-proto-disable.sh | 12 ++-- 1 file changed, 6

Re: What's cooking in git.git (Dec 2016, #03; Tue, 13)

> * sb/submodule-embed-gitdir (2016-12-12) 6 commits > - submodule: add absorb-git-dir function > - move connect_work_tree_and_git_dir to dir.h > - worktree: check if a submodule uses worktrees > - test-lib-functions.sh: teach test_commit -C > - submodule helper: support super prefix > -

Re: What's cooking in git.git (Dec 2016, #03; Tue, 13)

On 12/13, Junio C Hamano wrote: > * bw/realpath-wo-chdir (2016-12-12) 4 commits > - real_path: have callers use real_pathdup and strbuf_realpath > - real_path: create real_pathdup > - real_path: convert real_path_internal to strbuf_realpath > - real_path: resolve symlinks by hand > > The

What's cooking in git.git (Dec 2016, #03; Tue, 13)

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 branches, but I am still holding onto them. A few topics were merged to

Re: [PATCH v2 0/6] unicode_width.h: update the width tables to Unicode 9.0

Thanks. Very much appreciated.

Re: Proposal for an increased `gitk` cohesion with `git stash`.

Dearest all, am sorry my previous message did not enter the list (cross my fingers this will). I won't be pasting it verbatim because shame on me it leaked zombie processes (but that part got silently dropped out by kind Paul). In case anyone could be interested in the topic, and because a

[PATCHv3] git-p4 worktree support

Support for git-p4 worktrees. Adds test cases for using git from a worktree, and specifying the git directory either with the --git-dir command-line option, or with $ENV{GIT_DIR}. Luke Diamand (1): git-p4: support git worktrees git-p4.py | 17 +

Re: [PATCHv3] git-p4: support git worktrees

Luke Diamand writes: > git-p4 would attempt to find the git directory using > its own specific code, which did not know about git > worktrees. > > Rework it to use "git rev-parse --git-dir" instead. > > Add test cases for worktree usage and specifying > git directory via

[PATCH v2 5/6] update_unicode.sh: remove the plane filter

The uniset upstream has accepted my patches that eliminate the Unicode plane offsets from the output in '--32' mode. Remove the corresponding filter in update_unicode.sh. This also fixes the issue that the plane offsets were not removed from the second uniset call. Signed-off-by: Beat Bolli

[PATCH v2 3/6] update_unicode.sh: pin the uniset repo to a known good commit

The uniset upstream has added more commits that for example change the hexadecimal output in '--32' mode to decimal. Let's pin the repo to a commit that still outputs the width tables in the format we want. Signed-off-by: Beat Bolli ---

[PATCH v2 1/6] update_unicode.sh: move it into contrib/update-unicode

As it's used only by a tiny minority of the Git developer population, this script does not belong into the main Git source directory. Move it into contrib/ and adjust the paths to account for the new location. Signed-off-by: Beat Bolli --- .gitignore

[PATCH v2 4/6] update-unicode.sh: automatically download newer definition files

Checking just for the unicode data files' existence is not sufficient; we should also download them if a newer version exists on the Unicode consortium's servers. Option -N of wget does this nicely for us. Reviewed-by: Torsten Bögershausen Signed-off-by: Beat Bolli

[PATCH v2 2/6] update_unicode.sh: remove an unnecessary subshell level

After the move into contrib/update-unicode, we no longer create the unicode directory to have a clean working folder. Instead, the directory of the script is used. This means that the subshell can be removed. Signed-off-by: Beat Bolli ---

[PATCH v2 0/6] unicode_width.h: update the width tables to Unicode 9.0

This is v2 of my Unicode 9.0 series. After a short discussion [1], we decided to move the generator script into contrib. This is what this series now does first. The script is then updated in contrib. Diff to v1: - complete commit reordering - fix nits in the commit messages .gitignore

[PATCH v2 6/6] unicode_width.h: update the width tables to Unicode 9.0

Rerunning update-unicode.sh that we fixed in the previous commits produces these new tables. Signed-off-by: Beat Bolli --- unicode_width.h | 131 +--- 1 file changed, 107 insertions(+), 24 deletions(-) diff --git

[PATCH v3 10/16] pathspec: factor global magic into its own function

Create helper functions to read the global magic environment variables in additon to factoring out the global magic gathering logic into its own function. Signed-off-by: Brandon Williams --- pathspec.c | 127 + 1

[PATCH v3 11/16] pathspec: create parse_short_magic function

Factor out the logic responsible for parsing short magic into its own function. Signed-off-by: Brandon Williams --- pathspec.c | 54 -- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/pathspec.c b/pathspec.c

[PATCH v3 16/16] pathspec: rename prefix_pathspec to init_pathspec_item

Give a more relevant name to the prefix_pathspec function as it does more than just prefix a pathspec element. Signed-off-by: Brandon Williams --- pathspec.c | 24 +++- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pathspec.c b/pathspec.c

[PATCH v3 14/16] pathspec: create strip submodule slash helpers

Factor out the logic responsible for stripping the trailing slash on pathspecs referencing submodules into its own function. Signed-off-by: Brandon Williams --- pathspec.c | 68 ++ 1 file changed, 42 insertions(+),

[PATCH v3 12/16] pathspec: create parse_long_magic function

Factor out the logic responsible for parsing long magic into its own function. As well as hoist the prefix check logic outside of the inner loop as there isn't anything that needs to be done after matching "prefix:". Signed-off-by: Brandon Williams --- pathspec.c | 92

[PATCH v3 15/16] pathspec: small readability changes

A few small changes to improve readability. This is done by grouping related assignments, adding blank lines, ensuring lines are <80 characters, and adding additional comments. Signed-off-by: Brandon Williams --- pathspec.c | 25 +++-- 1 file changed, 15

[PATCH v3 13/16] pathspec: create parse_element_magic helper

Factor out the logic responsible for the magic in a pathspec element into its own function. Also avoid calling into the parsing functions when `PATHSPEC_LITERAL_PATH` is specified since it causes magic to be ignored and all paths to be treated as literals. Signed-off-by: Brandon Williams

[PATCH v3 01/16] mv: remove use of deprecated 'get_pathspec()'

Convert the 'internal_copy_pathspec()' function to 'prefix_path()' instead of using the deprecated 'get_pathspec()' interface. Also, rename 'internal_copy_pathspec()' to 'internal_prefix_pathspec()' to be more descriptive of what the funciton is actually doing. In addition to this, fix a memory

[PATCH v3 06/16] pathspec: copy and free owned memory

The 'original' string entry in a pathspec_item is only duplicated some of the time, instead always make a copy of the original and take ownership of the memory. Since both 'match' and 'original' string entries in a pathspec_item are owned by the pathspec struct, they need to be freed when

[PATCH v3 07/16] pathspec: remove unused variable from unsupported_magic

Removed unused variable 'n' from the 'unsupported_magic()' function. Signed-off-by: Brandon Williams --- pathspec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pathspec.c b/pathspec.c index 8f367f0..ec0d590 100644 --- a/pathspec.c +++ b/pathspec.c

[PATCH v3 05/16] pathspec: remove the deprecated get_pathspec function

Now that all callers of the old 'get_pathspec' interface have been migrated to use the new pathspec struct interface it can be removed from the codebase. Since there are no more users of the '_raw' field in the pathspec struct it can also be removed. This patch also removes the old functionality

[PATCH v3 09/16] pathspec: simpler logic to prefix original pathspec elements

The logic used to prefix an original pathspec element with 'prefix' magic is more general purpose and can be used for more than just short magic. Remove the extra code paths and rename 'prefix_short_magic' to 'prefix_magic' to better indicate that it can be used in more general situations. Also,

[PATCH v3 08/16] pathspec: always show mnemonic and name in unsupported_magic

For better clarity, always show the mnemonic and name of the unsupported magic being used. This lets users have a more clear understanding of what magic feature isn't supported. And if they supplied a mnemonic, the user will be told what its corresponding name is which will allow them to more

[PATCH v3 03/16] dir: convert fill_directory to use the pathspec struct interface

Convert 'fill_directory()' to use the pathspec struct interface from using the '_raw' entry in the pathspec struct. Signed-off-by: Brandon Williams --- dir.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dir.c b/dir.c index aadf073..15f7c99

[PATCH v3 04/16] ls-tree: convert show_recursive to use the pathspec struct interface

Convert 'show_recursive()' to use the pathspec struct interface from using the '_raw' entry in the pathspec struct. Signed-off-by: Brandon Williams --- builtin/ls-tree.c | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/builtin/ls-tree.c

[PATCH v3 02/16] dir: remove struct path_simplify

Teach simplify_away() and exclude_matches_pathspec() to handle struct pathspec directly, eliminating the need for the struct path_simplify. Also renamed the len parameter to pathlen in exclude_matches_pathspec() to match the parameter names used in simplify_away(). Signed-off-by: Brandon

[PATCH v3 00/16] pathspec cleanup

Differences in v3: * more readable strip submodule slash helper function which conforms to git's style guide. [14/16] * instead of having create_simply() use struct pathspec directly, remove the struct path_simplify entirely and use struct pathspec directly in both simplify_away() and

[PATCHv3] git-p4: support git worktrees

git-p4 would attempt to find the git directory using its own specific code, which did not know about git worktrees. Rework it to use "git rev-parse --git-dir" instead. Add test cases for worktree usage and specifying git directory via --git-dir and $GIT_DIR. Signed-off-by: Luke Diamand

Re: [PATCH 02/17] dir: convert create_simplify to use the pathspec struct interface

On 12/09, Brandon Williams wrote: > On 12/09, Duy Nguyen wrote: > > On Fri, Dec 9, 2016 at 1:19 AM, Brandon Williams wrote: > > > On 12/08, Duy Nguyen wrote: > > >> On Thu, Dec 8, 2016 at 7:03 AM, Brandon Williams > > >> wrote: > > >> > On 12/07, Duy Nguyen

Re: [PATCH] fix pushing to //server/share/dir paths on Windows

Johannes Sixt writes: > There is a change in behavior: \\server\share is not transformed > into //server/share anymore, but all subsequent directory separators > are rewritten to '/'. This should not make a difference; Windows can > handle the mix. I saw Dscho had a similar

Re: [PATCH v2 05/34] sequencer (rebase -i): learn about the 'verbose' mode

Johannes Schindelin writes: > @@ -1493,9 +1498,26 @@ static int pick_commits(struct todo_list *todo_list, > struct replay_opts *opts) > } > > if (is_rebase_i(opts)) { > + struct strbuf buf = STRBUF_INIT; > + > /* Stopped in the

Re: [PATCH v2 02/34] sequencer (rebase -i): implement the 'noop' command

Linus Torvalds writes: > On Tue, Dec 13, 2016 at 12:38 PM, Junio C Hamano wrote: >> Johannes Schindelin writes: >> >>> +/* >>> + * Note that ordering matters in this enum. Not only must it match the >>> mapping >>>

Re: [PATCH v2 06/34] sequencer (rebase -i): write the 'done' file

Johannes Schindelin writes: > In the interactive rebase, commands that were successfully processed are > not simply discarded, but appended to the 'done' file instead. This is > used e.g. to display the current state to the user in the output of > `git status` or the

Re: [PATCH 1/4] doc: add articles (grammar)

Junio C Hamano writes: > I was planning to merge all four from you as-is to 'next' today, > though. Should I wait? I'll definitely defer to whatever you think is best. I guess it depends on whether you are interested in Philip Oakley's suggestions. I sent those emails to inform about what I

Re: [PATCH v2 04/34] sequencer (rebase -i): implement the 'exec' command

Johannes Schindelin writes: > +static int do_exec(const char *command_line) > +{ > + const char *child_argv[] = { NULL, NULL }; > + int dirty, status; > + > + fprintf(stderr, "Executing: %s\n", command_line); > + child_argv[0] = command_line; > +

Re: What's cooking in git.git (Dec 2016, #02; Mon, 12)

On 12/13, Junio C Hamano wrote: > Johannes Schindelin writes: > > > ok 13 - grep tree and more pathspecs > > > > expecting success: > > git init parent && > > test_when_finished "rm -rf parent" && > > echo "foobar" >"parent/fi:le" && > > git -C parent

[PATCH] fix pushing to //server/share/dir paths on Windows

normalize_path_copy() is not prepared to keep the double-slash of a //server/share/dir kind of path, but treats it like a regular POSIX style path and transforms it to /server/share/dir. The bug manifests when 'git push //server/share/dir master' is run, because tmp_objdir_add_as_alternate() uses

Re: [PATCH v2 03/34] sequencer (rebase -i): implement the 'edit' command

Johannes Schindelin writes: > @@ -43,6 +44,20 @@ static GIT_PATH_FUNC(rebase_path_todo, > "rebase-merge/git-rebase-todo") > */ > static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script") > /* It is minor, but please have a blank line to

Re: [PATCH v2 02/34] sequencer (rebase -i): implement the 'noop' command

On Tue, Dec 13, 2016 at 12:38 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> +/* >> + * Note that ordering matters in this enum. Not only must it match the >> mapping >> + * below, it is also divided into several sections that matter.

[PATCHv2 3/5] submodule: add flags to ok_to_remove_submodule

In different contexts the question whether deleting a submodule is ok to remove may be answered differently. In 293ab15eea (submodule: teach rm to remove submodules unless they contain a git directory, 2012-09-26) a case was made that we can safely ignore ignored untracked files for removal as we

[PATCHv2 5/5] rm: add absorb a submodules git dir before deletion

When deleting a submodule, we need to keep the actual git directory around, such that we do not lose local changes in there and at a later checkout of the submodule we don't need to clone it again. Implement `depopulate_submodule`, that migrates the git directory before deletion of a submodule

[PATCHv2 4/5] ok_to_remove_submodule: absorb the submodule git dir

It is a major reason to say no, when deciding if a submodule can be deleted, if the git directory of the submodule being contained in the submodule's working directory. Migrate the git directory into the superproject instead of failing, and proceed with the other checks. Signed-off-by: Stefan

[PATCHv2 2/5] submodule: modernize ok_to_remove_submodule to use argv_array

Instead of constructing the NULL terminated array ourselves, we should make use of the argv_array infrastructure. While at it, adapt the error messages to reflect the actual invocation. Signed-off-by: Stefan Beller --- submodule.c | 14 -- 1 file changed, 4

[PATCHv2 0/5] git-rm absorbs submodule git directory before deletion

v2: * new base where to apply the patch: sb/submodule-embed-gitdir merged with sb/t3600-cleanup. I got merge conflicts and resolved them this way: #@@@ -709,9 -687,10 +687,9 @@@ test_expect_success 'checking out a com # git commit -m "submodule removal" submod && # git

[PATCHv2 1/5] submodule.h: add extern keyword to functions

As the upcoming series will add a lot of functions to the submodule header, let's first make the header consistent to the rest of the project by adding the extern keyword to functions. As per the CodingGuidelines we try to stay below 80 characters per line, so adapt all those functions to stay

Re: [PATCH v2 01/34] sequencer: support a new action: 'interactive rebase'

Johannes Schindelin writes: > static inline int is_rebase_i(const struct replay_opts *opts) > { > - return 0; > + return opts->action == REPLAY_INTERACTIVE_REBASE; > } > > static const char *get_dir(const struct replay_opts *opts) > { > + if

Re: [PATCH v2 02/34] sequencer (rebase -i): implement the 'noop' command

Johannes Schindelin writes: > +/* > + * Note that ordering matters in this enum. Not only must it match the > mapping > + * below, it is also divided into several sections that matter. When adding > + * new commands, make sure you add it in the right section. > + */

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

On Tue, Dec 13, 2016 at 12:09 PM, Stefan Beller wrote: > > So I will reroll it with "absorb" fixing some nits pointed out by David? I got confused there, Davids nits are for this series, the absorb series itself doesn't seem to have nits. So I'll just reroll this series on

Re: [PATCH 2/2] tmp-objdir: quote paths we add to alternates

Jeff King writes: > On Tue, Dec 13, 2016 at 10:10:04AM -0800, Junio C Hamano wrote: > >> > - git clone --bare . xxx:yyy.git && >> > + git clone --bare . xxx${path_sep}yyy.git && >> >> Don't you want to dq the whole thing to prevent the shell from >> splitting this into two

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

On Tue, Dec 13, 2016 at 11:47 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> The desired standard for submodules is to have the git dir inside the >> superprojects git dir (since 501770e, Aug 2011, Move git-dir for >> submodules), which is why I

Re: [RFC/PATCH v3 00/16] Add initial experimental external ODB support

Christian Couder writes: > In general I think that having a lot of refs is really a big problem > right now in Git as many big organizations using Git are facing this > problem in one form or another. > So I think that support for a big number of refs is a separate

Re: git add -p with unmerged files

Stephan Beyer writes: > While we're on the topic that "git add -p" should behave like the > "normal" "git add" (not "git add -u"): what about unmerged changes? > > > When I have merge conflicts, I almost always use my aliases > "edit-unmerged" and "add-unmerged": > > $ git

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

Stefan Beller writes: > I guess the latter is the case, so embedding is actually inside > the working tree and un-embedding is the relocation to the > superproject. Another reason why I personally see a .git in each submodule working tree is "embedded" has nothing to do with

Re: git add -p with unmerged files (was: git add -p with new file)

On Tue, Dec 13, 2016 at 08:21:59PM +0100, Stephan Beyer wrote: > While we're on the topic that "git add -p" should behave like the > "normal" "git add" (not "git add -u"): what about unmerged changes? I agree that's a related part of the workflow, though the implementation is a bit harder. >

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

Stefan Beller writes: > The desired standard for submodules is to have the git dir inside the > superprojects git dir (since 501770e, Aug 2011, Move git-dir for > submodules), which is why I think an "embedded submodule git dir" > is inside the superproject already. Think

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

On Tue, Dec 13, 2016 at 11:11 AM, Junio C Hamano wrote: > Stefan Beller writes: > >>> I do not think there is no dispute about what embedding means. >> >> double negative: You think we have a slight dispute here. > > Sorry, I do not think there is any

Re: [PATCH v2 00/34] Teach the sequencer to act as rebase -i's backend

Johannes Schindelin writes: > This marks the count down to '3': two more patch series after this > (really tiny ones) and we have a faster rebase -i. Nice. > Apart from mostly cosmetic patches (and the occasional odd bug that I > fixed promptly), I used these

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

On Tue, Dec 13, 2016 at 11:13 AM, Stefan Beller wrote: > On Tue, Dec 13, 2016 at 11:11 AM, Junio C Hamano wrote: >> Stefan Beller writes: >> I do not think there is no dispute about what embedding means. >>> >>> double negative:

git add -p with unmerged files (was: git add -p with new file)

Hi, While we're on the topic that "git add -p" should behave like the "normal" "git add" (not "git add -u"): what about unmerged changes? When I have merge conflicts, I almost always use my aliases "edit-unmerged" and "add-unmerged": $ git config --global --list | grep unmerged

Re: What's cooking in git.git (Dec 2016, #02; Mon, 12)

Johannes Schindelin writes: > ok 13 - grep tree and more pathspecs > > expecting success: > git init parent && > test_when_finished "rm -rf parent" && > echo "foobar" >"parent/fi:le" && > git -C parent add "fi:le" && > git -C parent

Re: [PATCH 3/2] t5547-push-quarantine: run the path separator test on Windows, too

Johannes Sixt writes: > To perform the test case on Windows in a way that corresponds to the > POSIX version, inject the semicolon in a directory name. > > Typically, an absolute POSIX style path, such as the one in $PWD, is > translated into a Windows style path by bash when it

Re: What's cooking in git.git (Dec 2016, #02; Mon, 12)

Hi Junio, On Mon, 12 Dec 2016, Junio C Hamano wrote: > * bw/grep-recurse-submodules (2016-11-22) 6 commits > - grep: search history of moved submodules > - grep: enable recurse-submodules to work on objects > - grep: optionally recurse into submodules > - grep: add submodules as a grep

Re: [PATCH 3/2] t5547-push-quarantine: run the path separator test on Windows, too

On Tue, Dec 13, 2016 at 08:09:31PM +0100, Johannes Sixt wrote: > Am 12.12.2016 um 20:53 schrieb Jeff King: > > Johannes, please let me know if I am wrong about skipping the test on > > !MINGW. The appropriate check there would be ";" anyway, but I am not > > sure _that_ is allowed in paths,

Re: git add -p with new file

Jeff King writes: >> Perhaps the latter is not advertised well enough? "add -p" does not >> even page so it is not very useful way to check what is being added >> if you are adding a new file (unless you are doing a toy example to >> add a 7-line file). > > I use "add -p"

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

Stefan Beller writes: >> I do not think there is no dispute about what embedding means. > > double negative: You think we have a slight dispute here. Sorry, I do not think there is any dispute on that. >> A >> submodule whose .git is inside its working tree has its

Re: [PATCH] builtin/commit.c: convert trivial snprintf calls to xsnprintf

On Tue, Dec 13, 2016 at 11:03:53AM -0800, Junio C Hamano wrote: > >> @@ -1525,12 +1526,10 @@ static int git_commit_config(const char *k, const > >> char *v, void *cb) > >> static int run_rewrite_hook(const unsigned char *oldsha1, > >>const unsigned char *newsha1) > >> {

[PATCH 3/2] t5547-push-quarantine: run the path separator test on Windows, too

To perform the test case on Windows in a way that corresponds to the POSIX version, inject the semicolon in a directory name. Typically, an absolute POSIX style path, such as the one in $PWD, is translated into a Windows style path by bash when it invokes git.exe. However, the presence of the

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

On Tue, Dec 13, 2016 at 10:53 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Mon, Dec 12, 2016 at 11:28 PM, Junio C Hamano wrote: >>> Stefan Beller writes: >>> The "checkout --recurse-submodules"

Re: [PATCH] builtin/commit.c: convert trivial snprintf calls to xsnprintf

Jeff King writes: >> +argv_array_pushf(, "GIT_INDEX_FILE=%s", index_file); >> +if (launch_editor(git_path_commit_editmsg(), NULL, env.argv)) { >> fprintf(stderr, >> _("Please supply the message using either -m or -F

Re: git add -p with new file

On Tue, Dec 13, 2016 at 10:48:07AM -0800, Junio C Hamano wrote: > > I think the problem is just that "add -p" does not give the whole story > > of what you might want to do before making a commit. > > The same is shared by "git diff [HEAD]", by the way. It is beyond > me why people use "add

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

Stefan Beller writes: > On Mon, Dec 12, 2016 at 11:28 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> The "checkout --recurse-submodules" series got too large to comfortably send >>> it out for review, so I had to break it up

Re: git add -p with new file

Jeff King writes: >> I am also not really sure what problem this feature is trying to solve. >> If the "problem"(?) is that it should act more like "git add" instead of >> "git add -u", for whatever reason, this may be fine (but the >> configuration option is a must-have then). >

Re: [PATCH 0/2] handling alternates paths with colons

On Tue, Dec 13, 2016 at 10:42:39AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > Right, but we also support relative paths via environment variables. I > > don't think that changes the conclusion though. I'm not convinced > > relative paths via the environment aren't

Re: [PATCH 0/2] handling alternates paths with colons

Jeff King writes: > Right, but we also support relative paths via environment variables. I > don't think that changes the conclusion though. I'm not convinced > relative paths via the environment aren't slightly insane in the first > place, Sorry, a triple negation is above my

Re: [PATCH 0/2] handling alternates paths with colons

On Tue, Dec 13, 2016 at 10:10:54AM -0800, Junio C Hamano wrote: > > We do support non-absolute paths, both in alternates files and > > environment variables. It's a nice feature if you want to have a > > relocatable family of shared repositories. I'd imagine that most cases > > start with "../",

Re: [PATCH 2/2] tmp-objdir: quote paths we add to alternates

On Tue, Dec 13, 2016 at 10:10:04AM -0800, Junio C Hamano wrote: > > - git clone --bare . xxx:yyy.git && > > + git clone --bare . xxx${path_sep}yyy.git && > > Don't you want to dq the whole thing to prevent the shell from > splitting this into two commands at ';'? The other one below is OK.

Re: [PATCH v6 01/16] Git.pm: add subroutines for commenting lines

Vasco Almeida writes: >> We only update comment_line_char from the default "#" when the >> configured value is a single-byte character and we ignore incorrect >> values in the configuration file. So I think the patch you sent is >> correct after all. > > I am still not

Re: [PATCH 1/4] doc: add articles (grammar)

Kristoffer Haugsbakk writes: > Thank you for reviewing this series, Philip. > > Philip Oakley writes: > >> This looks good to me. > > I'll add this header: > > Acked-by: Philip Oakley > > To the commit message of this patch in the next

Re: [PATCH 0/2] handling alternates paths with colons

Jeff King writes: > On Mon, Dec 12, 2016 at 02:37:08PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > So here are patches that do that. It kicks in only when the first >> > character of a path is a double-quote, and then expects the usual >> > C-style

Re: [PATCH 2/2] tmp-objdir: quote paths we add to alternates

Jeff King writes: > The naive conversion is just: > ... > -# MINGW does not allow colons in pathnames in the first place > -test_expect_success !MINGW 'push to repo path with colon' ' > +if test_have_prereq MINGW > +then > + path_sep=';' > +else > + path_sep=':' > +fi >

Re: [PATCH 1/2] alternates: accept double-quoted paths

Duy Nguyen writes: > At least attr has the same problem and is going the same direction > [1]. Cool. (I actually thought the patch was in and evidence that this > kind of backward compatibility breaking was ok, turns out the patch > has stayed around for years) > > [1] >

RE: [PATCH 6/6] rm: add absorb a submodules git dir before deletion

> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Monday, December 12, 2016 8:41 PM > To: gits...@pobox.com > Cc: git@vger.kernel.org; David Turner; bmw...@google.com; Stefan Beller > Subject: [PATCH 6/6] rm: add absorb a submodules git dir before deletion > >

Re: [PATCHv2 1/2] merge: Add '--continue' option as a synonym for 'git commit'

Chris Packham writes: > +'git merge' --continue > > DESCRIPTION > --- > @@ -61,6 +62,9 @@ reconstruct the original (pre-merge) changes. Therefore: > discouraged: while possible, it may leave you in a state that is hard to > back out of in the case of a

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

On Mon, Dec 12, 2016 at 11:28 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> The "checkout --recurse-submodules" series got too large to comfortably send >> it out for review, so I had to break it up into smaller series'; this is the >> first

Re: [PATCH 6/6] rm: add absorb a submodules git dir before deletion

On Mon, Dec 12, 2016 at 7:28 PM, brian m. carlson wrote: > On Mon, Dec 12, 2016 at 05:40:55PM -0800, Stefan Beller wrote: >> When deleting a submodule we need to keep the actual git directory around, >> such that we do not lose local changes in there and at a later

Re: git add -p with new file

On Mon, Dec 12, 2016 at 09:31:03PM +0100, Stephan Beyer wrote: > I am also a "git add -p"-only user (except for new files and merges). > However, I usually keep a lot of untracked files in my repositories. > Files that I do not (git)ignore because I want to see them when I type > "git status". >

  1   2   >