Re: [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing

On Fri, Jun 07, 2013 at 11:50:31PM +0200, benoit.per...@ensimag.fr wrote: The #7 issue on git-mediawiki's issue tracker [1] states that the ability to preview content without pushing would be a nice thing to have. Sounds like a useful goal. The default behaviour for the `preview` subcommand

Re: [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing

On Sat, Jun 08, 2013 at 09:00:30PM +0200, Matthieu Moy wrote: + # Auto-loading in browser + if ($autoload) { + open(my $browser, -|:encoding(UTF-8), xdg-open .$preview_file_name); That could be read from Git's configuration, and default to xdg-open. But you don't want

[PATCH 00/45] struct pathspec conversion and :(glob)

This series finishes off struct pathspec conversion that was started 2 years ago when this struct was added. In the end we can pass more information down the callchain than simply a series of strings. This makes it possible to add more pathspec magic, the :(glob) in the end of this series is an

[PATCH 03/45] pathspec: i18n-ize error strings in pathspec parsing code

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- pathspec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pathspec.c b/pathspec.c index 133f8be..403095b 100644 --- a/pathspec.c +++ b/pathspec.c @@ -167,11 +167,11 @@ static const char *prefix_pathspec(const

[PATCH 02/45] Move struct pathspec and related functions to pathspec.[ch]

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- archive.c | 1 + builtin/grep.c | 1 + builtin/ls-files.c | 1 + builtin/ls-tree.c | 1 + builtin/update-index.c | 1 + cache.h| 22 +--- diff.h | 1 + dir.c

[PATCH 01/45] clean: remove unused variable seen

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/clean.c | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index 04e396b..f955a40 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -155,7 +155,6 @@ int

[PATCH 04/45] pathspec: add copy_pathspec

The function is made to use with free_pathspec() because a simple struct assignment is not enough (free_pathspec wants to free items pointer). Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/mv.c | 13 +++-- pathspec.c | 8 pathspec.h | 1 + 3 files

[PATCH 06/45] parse_pathspec: save original pathspec for reporting

We usually use pathspec_item's match field for pathspec error reporting. However match (or raw) does not show the magic part, which will play more important role later on. Preserve exact user input for reporting. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- dir.c | 1 +

[PATCH 10/45] parse_pathspec: support stripping submodule trailing slashes

This flag is equivalent to builtin/ls-files.c:strip_trailing_slashes() and is intended to replace that function when ls-files is converted to use parse_pathspec. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- pathspec.c | 9 + pathspec.h | 2 ++ 2 files changed, 11

[PATCH 05/45] Add parse_pathspec() that converts cmdline args to struct pathspec

Currently to fill a struct pathspec, we do: const char **paths; paths = get_pathspec(prefix, argv); ... init_pathspec(pathspec, paths); paths can only carry bare strings, which loses information from command line arguments such as pathspec magic or the prefix part's length for each

[PATCH 07/45] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}

We have two ways of dealing with empty pathspec: 1. limit it to current prefix 2. match the entire working directory Some commands go with #1, some #2. get_pathspec() and parse_pathspec() only support #1. Make parse_pathspec() reject empty pathspec by default. #1 and #2 can be specified via new

[PATCH 11/45] parse_pathspec: support stripping/checking submodule paths

PATHSPEC_SYMLINK_LEADING_PATH and _STRIP_SUBMODULE_SLASH_EXPENSIVE are respectively the alternate implementation of pathspec.c:die_if_path_beyond_symlink() and pathspec.c:check_path_for_gitlink(). They are intended to replace those functions when builtin/add.c and builtin/check-ignore.c are

[PATCH 08/45] Convert some get_pathspec() calls to parse_pathspec()

These call sites follow the pattern: paths = get_pathspec(prefix, argv); init_pathspec(pathspec, paths); which can be converted into a single parse_pathspec() call. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/grep.c | 6 +++--- builtin/ls-tree.c | 10

[PATCH 09/45] parse_pathspec: a special flag for max_depth feature

match_pathspec_depth() and tree_entry_interesting() check max_depth field in order to support git grep --max-depth. The feature activation is tied to recursive field, which led to some unwanted activation, e.g. 5c8eeb8 (diff-index: enable recursive pathspec matching in unpack_trees - 2012-01-15).

[PATCH 15/45] commit: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/commit.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index d2f30d9..0efe269 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -279,17 +279,17 @@

[PATCH 16/45] status: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/commit.c | 9 + wt-status.c | 16 +++- wt-status.h | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 0efe269..833c7be 100644 ---

[PATCH 19/45] rm: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/rm.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c index 7b91d52..0b38de3 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -10,6 +10,7 @@ #include

[PATCH 17/45] rerere: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/rerere.c | 8 +--- rerere.c | 9 + rerere.h | 4 +++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index dc1708e..4e51add 100644 ---

[PATCH 12/45] parse_pathspec: support prefixing original patterns

This makes 'original' suitable for passing to an external command because all pathspec magic is left in place, provided that the external command understands pathspec. The prefixing is needed because we usually launch a subcommand at worktree's top directory and the subcommand can no longer

[PATCH 18/45] checkout: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 34 +- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index f5b50e5..197198b 100644 --- a/builtin/checkout.c +++

[PATCH 14/45] clean: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/clean.c | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index f955a40..fdd4980 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -13,6 +13,7 @@ #include

[PATCH 13/45] Guard against new pathspec magic in pathspec matching code

GUARD_PATHSPEC() marks pathspec-sensitive code, basically all those that touch anything in 'struct pathspec' except fields nr and original. GUARD_PATHSPEC() is not supposed to fail. It's mainly to help the designers to catch unsupported codepaths. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH 25/45] line-log: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- line-log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/line-log.c b/line-log.c index 4bbb09b..843a334 100644 --- a/line-log.c +++ b/line-log.c @@ -747,7 +747,7 @@ void line_log_init(struct rev_info *rev, const char

[PATCH 20/45] ls-files: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/ls-files.c | 46 +- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index a0b7e30..1534a39 100644 --- a/builtin/ls-files.c +++

[PATCH 24/45] reset: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/reset.c | 26 -- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index 6032131..da7282e 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -171,7 +171,10

[PATCH 26/45] Convert read_cache_preload() to take struct pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 2 +- builtin/commit.c | 4 ++-- builtin/diff-files.c | 2 +- builtin/diff-index.c | 2 +- builtin/diff.c | 4 ++-- cache.h | 2 +- preload-index.c | 20 +++- 7

[PATCH 22/45] check-ignore: convert to use parse_pathspec

check-ignore (at least the test suite) seems to rely on the pattern order. PATHSPEC_KEEP_ORDER is introduced to explictly express this. The lack of PATHSPEC_MAXDEPTH_VALID is sufficient because it's the only flag that reorders pathspecs, but it's less obvious that way. Cc: Adam Spiers

[PATCH 29/45] checkout: convert read_tree_some to take struct pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 9 +++-- tree.c | 4 ++-- tree.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 0e93af0..be08061 100644 ---

[PATCH 23/45] add: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c | 103 +- pathspec.c| 43 2 files changed, 45 insertions(+), 101 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index

[PATCH 30/45] Convert report_path_error to take struct pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 2 +- builtin/commit.c | 14 ++ builtin/ls-files.c | 19 +++ cache.h| 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/builtin/checkout.c

[PATCH 21/45] archive: convert to use parse_pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- archive.c | 19 +++ archive.h | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/archive.c b/archive.c index c699a2d..99fadc8 100644 --- a/archive.c +++ b/archive.c @@ -5,7 +5,6 @@ #include

[PATCH 28/45] Convert unmerge_cache to take struct pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- rerere.c | 2 +- resolve-undo.c | 4 ++-- resolve-undo.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rerere.c b/rerere.c index 27afbfe..4105bca 100644 --- a/rerere.c +++ b/rerere.c @@ -668,7 +668,7 @@ int

[PATCH 35/45] Remove diff_tree_{setup,release}_paths

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/blame.c | 12 ++-- builtin/reset.c | 9 + diff.h | 2 -- notes-merge.c | 4 ++-- revision.c | 5 +++-- tree-diff.c | 18 -- 6 files changed, 20 insertions(+), 30 deletions(-)

[PATCH 33/45] Convert add_files_to_cache to take struct pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c| 11 +++ builtin/commit.c | 2 +- cache.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index 34c9358..a47aeb4 100644 --- a/builtin/add.c +++

[PATCH 27/45] Convert run_add_interactive to use struct pathspec

This passes the pathspec, more or less unmodified, to git-add--interactive. The command itself does not process pathspec. It simply passes the pathspec to other builtin commands. So if all those commands support pathspec, we're good. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com ---

[PATCH 34/45] Convert common_prefix() to use struct pathspec

The code now takes advantage of nowildcard_len field. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/commit.c | 2 +- builtin/ls-files.c | 2 +- dir.c | 31 +++ dir.h | 2 +- 4 files changed, 18 insertions(+), 19

[PATCH 37/45] Remove match_pathspec() in favor of match_pathspec_depth()

match_pathspec_depth was created to replace match_pathspec (see 61cf282 (pathspec: add match_pathspec_depth() - 2010-12-15). It took more than two years, but the replacement finally happens :-) Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c | 30 +++---

[PATCH 36/45] Remove init_pathspec() in favor of parse_pathspec()

While at there, move free_pathspec() to pathspec.c Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/blame.c| 8 +--- builtin/log.c | 2 +- builtin/ls-files.c | 11 +-- diff-lib.c | 2 +- dir.c | 58

[PATCH 31/45] Convert refresh_index to take struct pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c| 15 +++ builtin/commit.c | 2 +- builtin/rm.c | 2 +- cache.h | 2 +- read-cache.c | 5 +++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/builtin/add.c

[PATCH 32/45] Convert {read,fill}_directory to take struct pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c | 4 +++- builtin/clean.c| 2 +- builtin/grep.c | 2 +- builtin/ls-files.c | 2 +- dir.c | 16 +++- dir.h | 4 ++-- wt-status.c| 2 +- 7 files changed, 20

[PATCH 39/45] parse_pathspec: make sure the prefix part is wildcard-free

Prepending prefix to pathspec is a trick to workaround the fact that commands can be executed in a subdirectory, but all git commands run at worktree's root. The prefix part should always be treated as literal string. Make it so. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache.h

[PATCH 44/45] pathspec: support :(glob) syntax

:(glob)path differs from plain pathspec that it uses wildmatch with WM_PATHNAME while the other uses fnmatch without FNM_PATHNAME. The difference lies in how '*' (and '**') is processed. With the introduction of :(glob) and :(literal) and their global options --[no]glob-pathspecs, the user can:

[PATCH 38/45] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath

Put a checkpoint to guard unsupported pathspec features in future. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- tree-diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tree-diff.c b/tree-diff.c index e1145c6..21a50d8 100644 --- a/tree-diff.c +++

[PATCH 43/45] pathspec: make --literal-pathspecs disable pathspec magic

--literal-pathspecs and its equivalent environment variable are probably used for scripting. In that setting, pathspec magic may be unwanted. Disabling globbing in individual pathspec can be done via :(literal) magic. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com ---

[PATCH 41/45] Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- dir.c | 8 pathspec.c | 8 ++-- pathspec.h | 2 -- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dir.c b/dir.c index 1098133..76a2e1a 100644 --- a/dir.c +++ b/dir.c @@ -1475,14 +1475,6 @@ int

[PATCH 40/45] parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN

The prefix length is passed from one command to another via the new magic 'prefix'. The magic is for parse_pathspec's internal use only, not visible to parse_pathspec's callers. Prefix length is not preserved across commands when --literal-pathspecs is specified (no magic is allowed, including

[PATCH 42/45] pathspec: support :(literal) syntax for noglob pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/glossary-content.txt | 20 builtin/add.c | 2 +- builtin/diff.c | 2 +- dir.c | 15 --- pathspec.c

[PATCH 45/45] Rename field raw to _raw in struct pathspec

This patch is essentially no-op. It helps catching new use of this field though. This field is introduced as an intermediate step for the pathspec conversion and will be removed eventually. At this stage no more access sites should be introduced. Signed-off-by: Nguyễn Thái Ngọc Duy

Re: [PATCH 1/2] core: use env variable instead of config var to turn on logging pack access

On Sun, Jun 9, 2013 at 1:22 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: 5f44324 (core: log offset pack data accesses happened - 2011-07-06) provides a way to observe pack access patterns via a config switch. Setting an environment variable looks more obvious than a config var, especially

Re: [PATCH 1/2] core: use env variable instead of config var to turn on logging pack access

On Sun, Jun 9, 2013 at 1:22 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: 5f44324 (core: log offset pack data accesses happened - 2011-07-06) provides a way to observe pack access patterns via a config switch. Setting an environment variable looks more obvious than a config var, especially

Re: [PATCH 2/2] git.txt: document GIT_TRACE_PACKET

On Sun, Jun 9, 2013 at 1:53 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This can help with debugging object negotiation or other protocol issues. s///g Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a

Re: [PATCH] diff: add --ignore-blank-lines option

On Sat, Jun 8, 2013 at 4:44 PM, Antoine Pelisse apeli...@gmail.com wrote: The goal of the patch is to introduce the GNU diff -B/--ignore-blank-lines as closely as possible. The short option is not available because it's already used for break-rewrites. When this option is used, git-diff will

Re: [PATCH 04/45] pathspec: add copy_pathspec

On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The function is made to use with free_pathspec() because a simple struct assignment is not enough (free_pathspec wants to free items pointer). I had to read this about five or six times before I could parse and

[RFH/PATCH 0/4] git http tests with apache 2.4

Apache 2.4 recently shipped in Debian unstable, and I noticed that all of the git httpd tests stopped working. It turns out that some configuration directives have changed between 2.2 and 2.4, and the httpd server would not start at all. With this series, the tests run again (for me, at least).

[PATCH 1/4] t/lib-httpd/apache.conf: do not use LockFile in apache = 2.4

The LockFile directive from earlier versions of apache has been replaced by the Mutex directive. The latter seems to give sane defaults and does not need any specific customization, so we can get away with just adding a version check to the use of LockFile. Signed-off-by: Jeff King p...@peff.net

[PATCH 3/4] t/lib-httpd/apache.conf: load compat access module in apache 2.4

In apache 2.4, the Order directive has gone away in favor of a new system in mod_authz_host. However, since we want our config file to remain compatible across multiple Apache versions, we can use mod_access_compat to keep using the older style. Signed-off-by: Jeff King p...@peff.net ---

[PATCH 2/4] t/lib-httpd/apache.conf: load extra auth modules in apache 2.4

In apache 2.4, the Auth* and Require directives have moved into the authn_core and authz_core modules, respectively. Signed-off-by: Jeff King p...@peff.net --- t/lib-httpd/apache.conf | 9 + 1 file changed, 9 insertions(+) diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf

[PATCH 4/4] t/lib-httpd/apache.conf: configure an MPM module for apache 2.4

Versions of Apache before 2.4 always had a MultiProcessing Module (MPM) statically built in, which manages the worker threads/processes. We do not care which one, as it is largely a performance issue, and we put only a light load on the server during our testing. As of Apache 2.4, the MPM module

Re: [Administrivia] On ruby and contrib/

Johannes Schindelin wrote: Correct. The opinions of inactive community members and non-contributors are less useful. I humbly suggest to treat other people's contribution with the same respect you want yours' to be treated. What?! When did I disrespect other people's contributions?

Re: [PATCH 2/2] Move sequencer to builtin

Jeff King wrote: Sorry that I cannot show you the source code, but you may interested to know that libgit2 powers: Yes, I'm well aware of these: libgit2 is LGPL, because of which these three proprietary applications have been made possible. Isn't it completely orthogonal to the discussion

[PATCH] Document .git/modules

A note in the begging of this document describe the behavior already. This patch just add where to find the repositories. Signed-off-by: Fredrik Gustafsson iv...@iveqy.com --- Documentation/gitrepository-layout.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git

Re: [PATCH] Document .git/modules

On Sun, Jun 9, 2013 at 6:37 AM, Fredrik Gustafsson iv...@iveqy.com wrote: A note in the begging of this document describe the behavior already. s/begging/beginning/ s/describe/describes/ This patch just add where to find the repositories. s/add/adds/ Signed-off-by: Fredrik Gustafsson

Re: [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing

Jeff King p...@peff.net writes: 1- Find the remote name of the current branch's upstream and check if it's a wiki one with its url (ie: mediawiki://) 2- Parse the content of the local file (given as argument) using the distant wiki's API. Makes sense. 3- Retrieve the current page on the

[PATCH] Document .git/modules

A note in the beginning of this document describes the behavior already. This patch just adds where to find the repositories. Signed-off-by: Fredrik Gustafsson iv...@iveqy.com --- Documentation/gitrepository-layout.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git

Re: [PATCH] Document .git/modules

On Sun, Jun 09, 2013 at 06:59:17AM -0400, Eric Sunshine wrote: On Sun, Jun 9, 2013 at 6:37 AM, Fredrik Gustafsson iv...@iveqy.com wrote: A note in the begging of this document describe the behavior already. s/begging/beginning/ s/describe/describes/ This patch just add where to find the

Re: [PATCH 2/2] Move sequencer to builtin

On Sat, Jun 8, 2013 at 11:34 PM, Jeff King p...@peff.net wrote: On Sat, Jun 08, 2013 at 09:20:54AM -0500, Felipe Contreras wrote: Let the code speak. Show me a script in any language that does something useful using libgit2, doing the equivalent to at least a couple of 'git foo' commands.

Re: [PATCH 2/2] Move sequencer to builtin

On Sun, Jun 9, 2013 at 12:26 AM, Jeff King p...@peff.net wrote: On Sat, Jun 08, 2013 at 09:17:56PM -0500, Felipe Contreras wrote: Definitely, yes. Even if you look at the impact on code alone and don't care about the people, destroying a collegial work environment is harmful enough to the

Re: [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing

Matthieu Moy matthieu@grenoble-inp.fr writes: Same question here. I'd expect git mw preview in a mediawiki workflow to do what pdflatex foo evince foo.pdf do in a latex workflow: see in rendered form what I've been doing. In a latex flow, if I want to see how my local changes merge with

Re: [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing

On 9 June 2013 08:08, Jeff King p...@peff.net wrote: I also wonder if it would be useful to be able to specify not only files in the filesystem, but also arbitrary blobs. So in 4b above, you could git mw preview origin:page.mw to see the rendered version of what upstream has done. Hum, so

Re: git-daemon: needs /root/.config/git/config?

* Ian Kumlien po...@vapor.com [130605 13:31]: Yes, i agree, it's suboptimal but I for one would use getpwuid to get the home directory of the executing user to avoid this - though i don't know how portable it is (or if there is any other issues) It's not only suboptimal but simply wrong.

Re: [PATCH 2/2] Move sequencer to builtin

Jeff King wrote: Definitely, yes. Even if you look at the impact on code alone and don't care about the people, destroying a collegial work environment is harmful enough to the code to outweigh the (admittedly often useful) patches. A collegial work environment is overrated, and proof

Re: [PATCH 2/2] Move sequencer to builtin

On Sun, Jun 9, 2013 at 7:48 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Jeff King wrote: Definitely, yes. Even if you look at the impact on code alone and don't care about the people, destroying a collegial work environment is harmful enough to the code to outweigh the (admittedly

Re: [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing

Benoît Person benoit.per...@ensimag.fr writes: On 9 June 2013 08:08, Jeff King p...@peff.net wrote: I also wonder if it would be useful to be able to specify not only files in the filesystem, but also arbitrary blobs. So in 4b above, you could git mw preview origin:page.mw to see the rendered

Re: [PATCH] build: get rid of the notion of a git library

Felipe Contreras wrote: The plan is simple; make libgit.a a proper library, starting by clarifying what goes into libgit.a, and what doesn't. If there's any hopes of ever having a public library, it's clear what code doesn't belong in libgit.a; code that is meant for builtins, that code

Re: [PATCH] build: get rid of the notion of a git library

On Sun, Jun 09, 2013 at 08:26:32PM +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote: The plan is simple; make libgit.a a proper library, starting by clarifying what goes into libgit.a, and what doesn't. If there's any hopes of ever having a public library, it's clear what code

Re: [PATCH v3 5/9] sequencer: run post-rewrite hook

On Thu, Jun 6, 2013 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: It probably is worth inserting a commit before 4/9 that adds rewrite.[ch], and - introduces struct rewritten_list[_item]; - moves run_rewrite_hook() in builtin/commit.c to rewrite.c; - changes its function

Re: [PATCH] build: get rid of the notion of a git library

On Sun, Jun 9, 2013 at 10:12 AM, John Keeping j...@keeping.me.uk wrote: On Sun, Jun 09, 2013 at 08:26:32PM +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote: The plan is simple; make libgit.a a proper library, starting by clarifying what goes into libgit.a, and what doesn't. If

Re: [PATCH] build: get rid of the notion of a git library

On Sun, Jun 9, 2013 at 9:56 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Felipe Contreras wrote: The plan is simple; make libgit.a a proper library, starting by clarifying what goes into libgit.a, and what doesn't. If there's any hopes of ever having a public library, it's clear what

Re: [PATCH] build: get rid of the notion of a git library

On Sun, Jun 09, 2013 at 10:40:32AM -0500, Felipe Contreras wrote: On Sun, Jun 9, 2013 at 10:12 AM, John Keeping j...@keeping.me.uk wrote: On Sun, Jun 09, 2013 at 08:26:32PM +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote: The plan is simple; make libgit.a a proper library,

Re: [PATCH] build: get rid of the notion of a git library

On Sun, Jun 9, 2013 at 11:02 AM, John Keeping j...@keeping.me.uk wrote: On Sun, Jun 09, 2013 at 10:40:32AM -0500, Felipe Contreras wrote: On Sun, Jun 9, 2013 at 10:12 AM, John Keeping j...@keeping.me.uk wrote: On Sun, Jun 09, 2013 at 08:26:32PM +0530, Ramkumar Ramachandra wrote: Felipe

[PATCH] submodule: remove redundant check for the_index.initialized

read_cache already performs the same check and returns immediately if the cache has already been loaded. Signed-off-by: René Scharfe rene.scha...@lsrfire.ath.cx --- submodule.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/submodule.c b/submodule.c index

Re: [PATCH] build: get rid of the notion of a git library

John Keeping wrote: How is it only useful for builtin commands? By that logic everything belongs in builtin/ because it's all only used by builtin commands (I realise that is what you're arguing towards). sequencer.c is merely a common API for builtins to invoke continuations: i.e. stop the

[PATCH v4 00/45] Massive improvents to rebase and cherry-pick

Hi, These are improvements to 'git rebase' by using a much improved 'git cherry-pick'. I already sent some of these, but they have been revamped. These changes require reorganization of the code in order to have a builtin/lib.a library. A new builtin/rewrite.c helper is added, and

[PATCH v4 10/45] sequencer: trivial fix

We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/sequencer.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/sequencer.c b/builtin/sequencer.c index b2c8c94..23b01b7 100644 --- a/builtin/sequencer.c

[PATCH v4 04/45] build: add builtin lib

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Makefile | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b6cd5a..d2af207 100644 --- a/Makefile +++ b/Makefile @@ -631,6 +631,7 @@ export PERL_PATH export PYTHON_PATH

[PATCH v4 07/45] unpack-trees: plug a memory leak

Before overwriting the destination index, first let's discard its contents. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- unpack-trees.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unpack-trees.c b/unpack-trees.c index 57b4074..abe2576 100644 ---

[PATCH v4 11/45] cherry-pick: don't barf when there's nothing to do

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/sequencer.c | 4 ++-- t/t3510-cherry-pick-sequence.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/sequencer.c b/builtin/sequencer.c index 23b01b7..4d7dc8b 100644 ---

[PATCH v4 12/45] cherry-pick: add --skip-empty option

Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 8 builtin/sequencer.c | 6 ++ builtin/sequencer.h | 1 +

[PATCH v4 09/45] sequencer: remove useless indentation

By using good ol' goto. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/sequencer.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/sequencer.c b/builtin/sequencer.c index e92e039..b2c8c94 100644 --- a/builtin/sequencer.c +++

[PATCH v4 08/45] read-cache: plug a few leaks

We are not freeing 'istate-cache' properly. We can't rely on 'initialized' to keep track of the 'istate-cache', because it doesn't really mean it's initialized. So assume it always has data, and free it before overwriting it. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH v4 03/45] build: trivial cleanup

There's no need to list again the prerequisites. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 34f1240..3b6cd5a 100644 --- a/Makefile +++ b/Makefile @@ -2068,13 +2068,13

[PATCH v4 01/45] build: generate and clean test scripts

Commit 416fda6 (build: do not install git-remote-testpy) made it so git-remote-testpy is not only not installed, but also not generated by default, let's make sure tests scripts (NO_INSTALL) are generated as ell. Comments-by: Junio C Hamano gits...@pobox.com Signed-off-by: Felipe Contreras

[PATCH v4 14/45] revert/cherry-pick: add --skip option

Akin to 'am --skip' and 'rebase --skip'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 1 + Documentation/git-revert.txt | 1 + Documentation/sequencer.txt | 3 +++ builtin/revert.c | 6 ++

[PATCH v4 15/45] builtin: add rewrite helper

So that we can load and store rewrites, as well as other operations on a list of rewritten commits. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Makefile | 1 + builtin/rewrite.c | 74 +++ builtin/rewrite.h | 18

[PATCH v4 35/45] rebase: remove merge mode

The cherrypick mode does the job. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Makefile | 1 - contrib/completion/git-prompt.sh | 4 +- git-rebase--merge.sh | 151 --- git-rebase.sh|

[PATCH v4 22/45] cherry-pick: remember rerere-autoupdate

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/sequencer.c | 8 1 file changed, 8 insertions(+) diff --git a/builtin/sequencer.c b/builtin/sequencer.c index a419387..ddd369f 100644 --- a/builtin/sequencer.c +++ b/builtin/sequencer.c @@ -753,6 +753,8 @@ static int

[PATCH v4 17/45] cherry-pick: don't store skipped commit

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/sequencer.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/sequencer.c b/builtin/sequencer.c index 24034f2..d40fda9 100644 --- a/builtin/sequencer.c +++ b/builtin/sequencer.c @@ -953,7

[PATCH v4 30/45] rebase: cherry-pick: set correct action-name

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherrypick.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index 241cda7..d36b0dc 100644 --- a/git-rebase--cherrypick.sh +++

[PATCH v4 23/45] rebase: split the cherry-pick stuff

They do something completely different from 'git am', it belongs in a different file. No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- .gitignore| 1 + Makefile | 1 + git-rebase--am.sh | 11 +--

[PATCH v4 26/45] rebase: cherry-pick: fix abort of cherry mode

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index 4465daf..0937e2c 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -369,6 +369,7 @@ skip) run_specific_rebase ;;

  1   2   3   4   >