[RFC/PATCH] worktree: replace "checkout --to" with "worktree new"

2015-06-29 Thread Eric Sunshine
The command "git checkout --to " is something of an anachronism, encompassing functionality somewhere between "checkout" and "clone". The introduction of the git-worktree command, however, provides a proper and intuitive place to house such functionality. Consequently, re-implement "git checkout --

Re: [PATCH v4 00/44] Make git-am a builtin

2015-06-29 Thread Stefan Beller
On Sun, Jun 28, 2015 at 10:01 PM, Stefan Beller wrote: >> This is a re-roll of [WIP v3]. This patch series is now out of WIP, as ... > >> This WIP patch series rewrites git-am.sh into optimized C builtin/am.c, and >> is >> part of my GSoC project to rewrite git-pull and git-am into C builtins[1].

Re: [PATCH v4 19/44] builtin-am: implement --3way, am.threeway

2015-06-29 Thread Stefan Beller
> +/** > + * Builds a index that contains just the blobs needed for a 3way merge. an index -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 28/44] builtin-am: pass git-apply's options to git-apply

2015-06-29 Thread Stefan Beller
On Sun, Jun 28, 2015 at 7:05 AM, Paul Tan wrote: > git-am.sh recognizes some of git-apply's options, and would pass them to > git-apply: > > * --whitespace, since 8c31cb8 (git-am: --whitespace=x option., > 2006-02-28) > > * -C, since 67dad68 (add -C[NUM] to git-am, 2007-02-08) > > * -p, since 20

Re: [PATCH v4 31/44] builtin-am: implement -S/--gpg-sign, commit.gpgsign

2015-06-29 Thread Stefan Beller
On Sun, Jun 28, 2015 at 7:05 AM, Paul Tan wrote: > Since 3b4e395 (am: add the --gpg-sign option, 2014-02-01), git-am.sh > supported the --gpg-sign option, and would pass it to git-commit-tree, > thus GPG-signing the commit object. > > Re-implement this option in builtin/am.c. > > git-commit-tree w

What's cooking in git.git (Jun 2015, #07; Mon, 29)

2015-06-29 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Some of the topics in flight have overlaps with each other and have been excluded from 'pu'; most notably, I think the remainder of bc/object-id

Re: [PATCH 3/3] introduce "format" date-mode

2015-06-29 Thread Eric Sunshine
On Thu, Jun 25, 2015 at 12:55:45PM -0400, Jeff King wrote: > This feeds the format directly to strftime. Besides being a > little more flexible, the main advantage is that your system > strftime may know more about your locale's preferred format > (e.g., how to spell the days of the week). > > Sig

Re: [PATCH 13/17] engine.pl: provide more debug print statements

2015-06-29 Thread Sebastian Schuberth
On 25.06.2015 02:03, Philip Oakley wrote: --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -41,6 +41,7 @@ EOM # Parse command-line options while (@ARGV) { my $arg = shift @ARGV; + #print "Arg: $arg \n"; if ("$arg" eq "-h" || "$arg" eq "--help" ||

Re: [PATCH v4 38/44] builtin-am: support and auto-detect StGit patches

2015-06-29 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, Jun 29, 2015 at 4:42 PM, Stefan Beller wrote: >> On Sun, Jun 28, 2015 at 7:06 AM, Paul Tan wrote: >>> +/** >>> + * Returns true if `str` consists of only whitespace, false otherwise. >>> + */ >>> +static int str_isspace(const char *str) >>> +{ >>> + while (

Re: [PATCH] --count feature for git shortlog

2015-06-29 Thread Lawrence Siebert
My apologies, I misunderstood and thought rev-list didn't take filenames. Lawrence Siebert On Mon, Jun 29, 2015 at 10:04 AM, Junio C Hamano wrote: > Lawrence Siebert writes: > >> I was using it to sort files >> by commit count when provided a list of files, which git rev-list >> doesn't really

Re: [PATCH v6 7/7] git-stash: use git-reflog instead of creating files

2015-06-29 Thread Junio C Hamano
OK, I'll squash in the last bit and restart today's integration run. Everything looks much nicer than any previous versions ;-) Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel

Re: [PATCH v4 38/44] builtin-am: support and auto-detect StGit patches

2015-06-29 Thread Eric Sunshine
On Mon, Jun 29, 2015 at 4:42 PM, Stefan Beller wrote: > On Sun, Jun 28, 2015 at 7:06 AM, Paul Tan wrote: >> +/** >> + * Returns true if `str` consists of only whitespace, false otherwise. >> + */ >> +static int str_isspace(const char *str) >> +{ >> + while (*str) >> + if (!iss

Re: [PATCH v6 0/7] refs backend preamble

2015-06-29 Thread David Turner
On Mon, 2015-06-29 at 13:31 -0700, Junio C Hamano wrote: > David Turner writes: > > > Minor formatting fixes from Junio Hamano. > > There is another. Would it be simpler for me to push this sort of fixup to github and and just mention that a new patchset is available? If so, here it is: htt

Re: [PATCH v4 38/44] builtin-am: support and auto-detect StGit patches

2015-06-29 Thread Stefan Beller
On Sun, Jun 28, 2015 at 7:06 AM, Paul Tan wrote: > Since c574e68 (git-am foreign patch support: StGIT support, 2009-05-27), > git-am.sh supported converting StGit patches into RFC2822 mail patches > that can be parsed with git-mailinfo. > > Implement this by introducing two functions in builtin/am

Re: [PATCH v4 40/44] builtin-am: support and auto-detect mercurial patches

2015-06-29 Thread Stefan Beller
On Mon, Jun 29, 2015 at 1:32 PM, Stefan Beller wrote: > On Sun, Jun 28, 2015 at 7:06 AM, Paul Tan wrote: >> + tz = tz / (60 * 60) * 100 + tz % (60 * 60); > > What happens if we have a negative input not matching a full hour, say -5400 ? > (would equate to 0130 in git) > > fo

Re: [PATCH v4 40/44] builtin-am: support and auto-detect mercurial patches

2015-06-29 Thread Stefan Beller
On Sun, Jun 28, 2015 at 7:06 AM, Paul Tan wrote: > Since 0cfd112 (am: preliminary support for hg patches, 2011-08-29), > git-am.sh could convert mercurial patches to an RFC2822 mail patch > suitable for parsing with git-mailinfo, and queue them in the state > directory for application. > > Since 1

Re: [PATCH v6 0/7] refs backend preamble

2015-06-29 Thread Junio C Hamano
David Turner writes: > Minor formatting fixes from Junio Hamano. There is another. By the way, "unused variable" is not a formatting fix. git-bisect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-bisect.sh b/git-bisect.sh index dddcc89..2fd8ea6 100755 --- a/git-bi

Re: [PATCH v11 06/10] bisect: don't mix option parsing and non-trivial code

2015-06-29 Thread Junio C Hamano
Matthieu, are you allowing your editor to corrupt the number of lines in the hunk on the @@ ... @@ hunk header? "diff" mode in Emacs does that, and there may be other editors that has the same bug, but please be careful---they make the patch unapplicable. Count the preimage lines in the hunk belo

[PATCHv7 1/3] git-rebase -i: add command "drop" to remove a commit

2015-06-29 Thread Galan Rémi
Instead of removing a line to remove the commit, you can use the command "drop" (just like "pick" or "edit"). It has the same effect as deleting the line (removing the commit) except that you keep a visual trace of your actions, allowing a better control and reducing the possibility of removing a c

[PATCHv7 2/3] git rebase -i: warn about removed commits

2015-06-29 Thread Galan Rémi
Check if commits were removed (i.e. a line was deleted) and print warnings or stop git rebase depending on the value of the configuration variable rebase.missingCommitsCheck. This patch gives the user the possibility to avoid silent loss of information (losing a commit through deleting the line in

[PATCHv7 3/3] git rebase -i: add static check for commands and SHA-1

2015-06-29 Thread Galan Rémi
Check before the start of the rebasing if the commands exists, and for the commands expecting a SHA-1, check if the SHA-1 is present and corresponds to a commit. In case of error, print the error, stop git rebase and prompt the user to fix with 'git rebase --edit-todo' or to abort. This allows to

rebase -i: drop, missing commits and static checks

2015-06-29 Thread Galan Rémi
Changes between versions: In t3404: Changed 'test_rebase_end' to 'rebase_setup_and_clean'. Changed the indentation in 'rebase_setup_and_clean'. Changed the names of the branches created in my tests (avoid names like 'tmp'). Added 'test_might_fail' in front of 'git branch -D'. Remove 'test_config

[PATCH v6 5/7] refs: new public ref function: safe_create_reflog

2015-06-29 Thread David Turner
The safe_create_reflog function creates a reflog, if it does not already exist. The log_ref_setup function becomes private and gains a force_create parameter to force the creation of a reflog even if log_all_ref_updates is false or the refname is not one of the special refnames. The new parameter

[PATCH v6 2/7] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs

2015-06-29 Thread David Turner
Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD and REVERT_HEAD. Signed-off-by: David Turner --- branch.c | 4 ++-- builtin/commit.c | 6 +++--- builtin/merge.c | 2 +- co

[PATCH v6 7/7] git-stash: use git-reflog instead of creating files

2015-06-29 Thread David Turner
This is in support of alternate ref backends which don't necessarily store reflogs as files. Signed-off-by: David Turner --- git-stash.sh | 4 ++-- refs.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 8e9e2cd..27155bc 100755 --- a/g

[PATCH v6 3/7] bisect: treat BISECT_HEAD as a ref

2015-06-29 Thread David Turner
Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with BISECT_HEAD. Signed-off-by: David Turner --- git-bisect.sh | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index ae3fec2..dddcc89 100755 --

[PATCH v6 4/7] refs: Break out check for reflog autocreation

2015-06-29 Thread David Turner
This is just for clarity. Signed-off-by: David Turner --- refs.c | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index c97ca02..30e81ba 100644 --- a/refs.c +++ b/refs.c @@ -3118,6 +3118,16 @@ static int copy_msg(char *buf, const char *msg)

[PATCH v6 6/7] git-reflog: add create and exists functions

2015-06-29 Thread David Turner
These are necessary because alternate ref backends might store reflogs somewhere other than .git/logs. Code that now directly manipulates .git/logs should instead go through git-reflog. In a moment, we will use these functions to make git stash work with alternate ref backends. Signed-off-by: Da

[PATCH v6 1/7] refs.c: add err arguments to reflog functions

2015-06-29 Thread David Turner
Add an err argument to log_ref_setup that can explain the reason for a failure. This then eliminates the need to manage errno through this function since we can just add strerror(errno) to the err string when meaningful. No callers relied on errno from this function for anything else than the error

[PATCH v6 0/7] refs backend preamble

2015-06-29 Thread David Turner
Minor formatting fixes from Junio Hamano. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 42/44] builtin-am: implement legacy -b/--binary option

2015-06-29 Thread Stefan Beller
On Sun, Jun 28, 2015 at 7:06 AM, Paul Tan wrote: > The -b/--binary option was initially implemented in 087b674 (git-am: > --binary; document --resume and --binary., 2005-11-16). The option will > pass the --binary flag to git-apply to allow it to apply binary patches. > > However, in 2b6eef9 (Make

Re: [PATCH v4 43/44] builtin-am: check for valid committer ident

2015-06-29 Thread Stefan Beller
On Sun, Jun 28, 2015 at 7:06 AM, Paul Tan wrote: > When commit_tree() is called, if the user does not have an explicit > committer ident configured, it will attempt to construct a default > committer ident based on the user's and system's info (e.g. gecos field, > hostname etc.) However, if a defa

Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)

2015-06-29 Thread Torsten Bögershausen
> * js/rebase-i-clean-up-upon-continue-to-skip (2015-06-23) 2 commits > - rebase -i: do not leave a CHERRY_PICK_HEAD file behind > - t3404: demonstrate CHERRY_PICK_HEAD bug > > Abandoning an already applied change in "git rebase -i" with > "--continue" left CHERRY_PICK_HEAD and confused later

Re: [PATCH v6 04/11] for-each-ref: add '--points-at' option

2015-06-29 Thread Karthik Nayak
On Mon, Jun 29, 2015 at 11:16 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> Add the '--points-at' option provided by 'ref-filter'. The option >> lets the user to pick only refs which point to a particular >> commit. > > It somehow feels strange that the option name is points-at and all >

Re: [PATCH v6 03/11] ref-filter: implement '--points-at' option

2015-06-29 Thread Karthik Nayak
On Mon, Jun 29, 2015 at 11:10 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> +/* >> + * Given a ref (sha1, refname) see if it points to one of the sha1s >> + * in a sha1_array. >> + */ >> +static int match_points_at(struct sha1_array *points_at, const unsigned >> char *sha1, >> +

Re: [PATCH v6 04/11] for-each-ref: add '--points-at' option

2015-06-29 Thread Karthik Nayak
On Tue, Jun 30, 2015 at 12:08 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> +test_expect_success 'check signed tags with --points-at' ' >> + cat >expect <<-\EOF && >> + refs/heads/side >> + refs/tags/four >> + refs/tags/signed-tag four >> + EOF >> + git for-each-r

Re: [PATCH v5 0/7] refs backend preamble

2015-06-29 Thread Junio C Hamano
There might be other issues but from cursory read, at least the following needs to be split and squashed into patches that introduce them. Otherwise, it was a very pleasant read. Thanks. Documentation/git-reflog.txt | 4 ++-- builtin/reflog.c | 2 +- refs.c | 2

Re: [PATCH v6 01/11] t6302: for-each-ref tests for ref-filter APIs

2015-06-29 Thread Karthik Nayak
On Mon, Jun 29, 2015 at 11:44 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> t/t6302-for-each-ref-filter.sh | 19 +++ >> 1 file changed, 19 insertions(+) >> create mode 100644 t/t6302-for-each-ref-filter.sh > > non-executable tests: t6302-for-each-ref-filter.sh Renaming

Re: [PATCH v6 04/11] for-each-ref: add '--points-at' option

2015-06-29 Thread Junio C Hamano
Karthik Nayak writes: > +test_expect_success 'check signed tags with --points-at' ' > + cat >expect <<-\EOF && > + refs/heads/side > + refs/tags/four > + refs/tags/signed-tag four > + EOF > + git for-each-ref --format="%(refname) %(*subject)" --points-at=side > >actual &&

Re: [PATCH v6 06/11] ref-filter: implement '--merged' and '--no-merged' options

2015-06-29 Thread Junio C Hamano
Junio C Hamano writes: > Karthik Nayak writes: > >> +static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata) >> +{ >> ... >> +for (i = 0; i < array->nr; i++) { >> +struct ref_array_item *item = array->items[i]; >> +add_pending_object(&revs, &item->commit->ob

Re: [RFC/PATCH 5/9] ref-filter: add option to match literal pattern

2015-06-29 Thread Junio C Hamano
Karthik Nayak writes: > Since 'ref-filter' only has an option to match path names. That is not a whole sentence ;-) > Add an option for regular pattern matching. > Mentored-by: Christian Couder > Mentored-by: Matthieu Moy > Signed-off-by: Karthik Nayak > - if (flag & REF_BAD_NAME) { >

Re: [PATCH v6 01/11] t6302: for-each-ref tests for ref-filter APIs

2015-06-29 Thread Junio C Hamano
Karthik Nayak writes: > t/t6302-for-each-ref-filter.sh | 19 +++ > 1 file changed, 19 insertions(+) > create mode 100644 t/t6302-for-each-ref-filter.sh non-executable tests: t6302-for-each-ref-filter.sh -- To unsubscribe from this list: send the line "unsubscribe git" in the bo

Re: [PATCH v6 06/11] ref-filter: implement '--merged' and '--no-merged' options

2015-06-29 Thread Junio C Hamano
Karthik Nayak writes: > +static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata) > +{ > + struct rev_info revs; > + int i, old_nr; > + struct ref_filter *filter = ref_cbdata->filter; > + struct ref_array *array = ref_cbdata->array; > + struct commit **to_clear = xcal

[PATCH v5 0/7] refs backend preamble

2015-06-29 Thread David Turner
This splits v4's patch 4/6 into two patches. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v5 7/7] git-stash: use git-reflog instead of creating files

2015-06-29 Thread David Turner
This is in support of alternate ref backends which don't necessarily store reflogs as files. Signed-off-by: David Turner --- git-stash.sh | 4 ++-- refs.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 8e9e2cd..27155bc 100755 --- a/g

[PATCH v5 2/7] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs

2015-06-29 Thread David Turner
Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD and REVERT_HEAD. Signed-off-by: David Turner --- branch.c | 4 ++-- builtin/commit.c | 6 +++--- builtin/merge.c | 2 +- co

[PATCH v5 4/7] refs: Break out check for reflog autocreation

2015-06-29 Thread David Turner
This is just for clarity. Signed-off-by: David Turner --- refs.c | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index b34a54a..dd76721 100644 --- a/refs.c +++ b/refs.c @@ -3118,6 +3118,16 @@ static int copy_msg(char *buf, const char *msg)

[PATCH v5 5/7] refs: new public ref function: safe_create_reflog

2015-06-29 Thread David Turner
The safe_create_reflog function creates a reflog, if it does not already exist. The log_ref_setup function becomes private and gains a force_create parameter to force the creation of a reflog even if log_all_ref_updates is false or the refname is not one of the special refnames. The new parameter

[PATCH v5 6/7] git-reflog: add create and exists functions

2015-06-29 Thread David Turner
These are necessary because alternate ref backends might store reflogs somewhere other than .git/logs. Code that now directly manipulates .git/logs should instead go through git-reflog. In a moment, we will use these functions to make git stash work with alternate ref backends. Signed-off-by: Da

[PATCH v5 1/7] refs.c: add err arguments to reflog functions

2015-06-29 Thread David Turner
Add an err argument to log_ref_setup that can explain the reason for a failure. This then eliminates the need to manage errno through this function since we can just add strerror(errno) to the err string when meaningful. No callers relied on errno from this function for anything else than the error

[PATCH v5 3/7] bisect: treat BISECT_HEAD as a ref

2015-06-29 Thread David Turner
Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with BISECT_HEAD. Signed-off-by: David Turner --- git-bisect.sh | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index ae3fec2..dddcc89 100755 --

Re: [PATCH v6 04/11] for-each-ref: add '--points-at' option

2015-06-29 Thread Junio C Hamano
Karthik Nayak writes: > Add the '--points-at' option provided by 'ref-filter'. The option > lets the user to pick only refs which point to a particular > commit. It somehow feels strange that the option name is points-at and all the explanation (like the above and also in the doc) talks about po

Re: [PATCH v6 03/11] ref-filter: implement '--points-at' option

2015-06-29 Thread Junio C Hamano
Karthik Nayak writes: > +/* > + * Given a ref (sha1, refname) see if it points to one of the sha1s > + * in a sha1_array. > + */ > +static int match_points_at(struct sha1_array *points_at, const unsigned char > *sha1, > +const char *refname) > +{ > + struct object *ob

Re: [PATCH v4 01/44] wrapper: implement xopen()

2015-06-29 Thread Junio C Hamano
Torsten Bögershausen writes: >> +int xopen(const char *path, int oflag, ...) >> +{ >> +mode_t mode = 0; >> +va_list ap; >> + >> +va_start(ap, oflag); >> +if (oflag & O_CREAT) >> +mode = va_arg(ap, mode_t); >> +va_end(ap); >> + >> +assert(path); >> + > 2 remarks

Re: [PATCH] --count feature for git shortlog

2015-06-29 Thread Junio C Hamano
Lawrence Siebert writes: > I was using it to sort files > by commit count when provided a list of files, which git rev-list > doesn't really work for. What makes you say rev-list does not work (perhaps 'really' is the key word there?) git rev-list --no-merges maint..master -- Makefile g

Re: [PATCH] http: always use any proxy auth method available

2015-06-29 Thread Junio C Hamano
Enrique Tobis writes: > You did guess correctly. As you said you are not an expert in this > area, should I wait until someone else chimes in or is this enough to > resubmit for inclusion? Assuming my revised explanation is acceptable, > of course. I'll queue the patch as-is with your updated lo

Re: [PATCH] --count feature for git shortlog

2015-06-29 Thread Lawrence Siebert
Junio, I appreciate your help. Okay, That all makes sense. I would note that something like: git shortlog -s "$FILENAME: | cut -f 1 | paste -sd+ - | bc seems like it run much faster then: git log --oneline "$FILENAME" | wc -l Which was why I was looking at shortlog. I was using it to sort

Re: [PATCH v11 00/10] bisect terms

2015-06-29 Thread Junio C Hamano
Matthieu Moy writes: > So, here's a reroll that tries to address the ongoing discussion. > > The first patches are preparatory steps, which are IMHO good > regardless of the features. I kept the user-interface to chose terms > at the end, and tried to keep the UI patches as small as possible. > >

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Junio C Hamano
Matthieu Moy writes: > So, my proposal would be to remove the "old/new" patch from the series, > and keep the other patches. > > What do you think? Let me answer after reading v11 through. >> but now it would be more clear that $name_good and $name_bad is a bad >> way to name internal variables

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> I moderately hate to see both from aesthetics point of view, but can >> we at least lose "--name-" prefix? > > I changed it to --term- prefix, but I'd rather not drop it. When reading > "--old=foo", it is not clear to me whether the meaning shou

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Johannes Schindelin
Hi Konstantin, On 2015-06-29 17:54, Konstantin Khomoutov wrote: > I've finally took time to switch from my old "msys1" release to this > RC4, and immediately got hit by the fact Git is now speaking to me in > Russian, which is not what I want (previously this behaviour was only > exhibited by `gi

Re: [PATCH] worktree: new place for "git prune --worktrees"

2015-06-29 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Commit 23af91d (prune: strategies for linked checkouts - 2014-11-30) > adds "--worktrees" to "git prune" without realizing that "git prune" is > for object database only. This patch moves the same functionality to a > new command "git worktree". > > Signed-off-by:

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Konstantin Khomoutov
On Mon, 29 Jun 2015 16:37:54 +0200 Johannes Schindelin wrote: > >> I just uploaded the 4th release candidate for the upcoming Git for > >> Windows 2.x release. Please find the download link here: > >> > >> https://git-for-windows.github.io/#download > >> > >> The most important changes are the up

[PATCH v11 03/10] Documentation/bisect: revise overall content

2015-06-29 Thread Matthieu Moy
From: Michael Haggerty Thoroughly revise the "git bisect" manpage, including: * Beef up the "Description" section. * Make the first long example less specific to kernel development. * De-emphasize implementation details in a couple of places. * Add "(roughly N steps)" in the places where exam

[PATCH v11 00/10] bisect terms

2015-06-29 Thread Matthieu Moy
Hi, So, here's a reroll that tries to address the ongoing discussion. The first patches are preparatory steps, which are IMHO good regardless of the features. I kept the user-interface to chose terms at the end, and tried to keep the UI patches as small as possible. I have the feeling that "bise

[PATCH v11 07/10] bisect: sanity check on terms

2015-06-29 Thread Matthieu Moy
This is currently only a defensive check since the only terms are bad/good and new/old, which pass it, but this is a preparation step for accepting user-supplied terms. Signed-off-by: Matthieu Moy --- git-bisect.sh | 33 + 1 file changed, 33 insertions(+) diff --

[PATCH v11 06/10] bisect: don't mix option parsing and non-trivial code

2015-06-29 Thread Matthieu Moy
As-is, the revisions that appear on the command-line are processed in order. This would mix badly with code that changes the configuration (e.g. change $TERM_GOOD and $TERM_BAD) while processing the options. Signed-off-by: Matthieu Moy --- git-bisect.sh | 30 +- 1 fil

[PATCH v11 09/10] bisect: add 'git bisect terms' to view the current terms

2015-06-29 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- Documentation/git-bisect.txt | 10 ++ git-bisect.sh| 39 ++- t/t6030-bisect-porcelain.sh | 20 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/Documentation/git-bisect.

[PATCH v11 08/10] bisect: add the terms old/new

2015-06-29 Thread Matthieu Moy
From: Antoine Delaite When not looking for a regression during a bisect but for a fix or a change in another given property, it can be confusing to use 'good' and 'bad'. This patch introduce `git bisect new` and `git bisect old` as an alternative to 'bad' and good': the commits which have a cert

[PATCH v11 10/10] bisect: allow setting any user-specified in 'git bisect start'

2015-06-29 Thread Matthieu Moy
This allows a natural user-interface when looking for any change in the code, not just regression. For example: git bisect start --term-old fast --term-new slow git bisect fast git bisect slow ... There were several proposed user-interfaces for this feature. This patch implements it as options to

[PATCH v11 05/10] bisect: simplify the addition of new bisect terms

2015-06-29 Thread Matthieu Moy
From: Antoine Delaite We create a file BISECT_TERMS in the repository .git to be read during a bisection. There's no user-interface yet, but "git bisect" works if terms other than old/new or bad/good are set in .git/BISECT_TERMS. The fonctions to be changed if we add new terms are quite few. In

[PATCH v11 04/10] bisect: replace hardcoded "bad|good" by variables

2015-06-29 Thread Matthieu Moy
From: Antoine Delaite To add new tags like old/new and have keywords less confusing, the first step is to avoid hardcoding the keywords. The default mode is still bad/good. Signed-off-by: Antoine Delaite Signed-off-by: Louis Stuber Signed-off-by: Valentin Duperray Signed-off-by: Franck Jonas

[PATCH v11 01/10] bisect: correction of typo

2015-06-29 Thread Matthieu Moy
From: Antoine Delaite Signed-off-by: Antoine Delaite Signed-off-by: Matthieu Moy --- bisect.c| 2 +- t/t6030-bisect-porcelain.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bisect.c b/bisect.c index 03d5cd9..5b8357d 100644 --- a/bisect.c +++ b/bis

[PATCH v11 02/10] Documentation/bisect: move getting help section to the end

2015-06-29 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- Documentation/git-bisect.txt | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 4cb52a7..2bdc3b8 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Matthieu Moy
Christian Couder writes: > On Mon, Jun 29, 2015 at 11:32 AM, Matthieu Moy > wrote: >> bisect is all about finding the commit where a property has changed, > > That is your interpretation of this command. On the man page there is: > > git-bisect - Find by binary search the change that introdu

Re: [PATCH] fsck: it is OK for a tag and a commit to lack the body

2015-06-29 Thread Johannes Schindelin
Hi Junio, On 2015-06-29 07:42, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Hmm. Maybe we should still warn when there is no empty line finishing >> the header explicitly, or at least make it FSCK_IGNORE by default so >> that maintainers who like a stricter check can upgrade the cond

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Stefan Näwe
Am 29.06.2015 um 16:37 schrieb Johannes Schindelin: > Hi Stefan, > > On 2015-06-29 11:07, Stefan Näwe wrote: >> Am 29.06.2015 um 10:30 schrieb Johannes Schindelin: > >>> I just uploaded the 4th release candidate for the upcoming Git for >>> Windows 2.x release. Please find the download link here:

Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)

2015-06-29 Thread Tony Finch
What can I do to help un-stall my gitweb patches? > [Stalled] > > * tf/gitweb-project-listing (2015-03-19) 5 commits > - gitweb: make category headings into links when they are directories > - gitweb: optionally set project category from its pathname > - gitweb: add a link under the search box

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Johannes Schindelin
Hi Stefan, On 2015-06-29 11:07, Stefan Näwe wrote: > Am 29.06.2015 um 10:30 schrieb Johannes Schindelin: >> I just uploaded the 4th release candidate for the upcoming Git for >> Windows 2.x release. Please find the download link here: >> >> https://git-for-windows.github.io/#download >> >> The mo

[PATCH] worktree: new place for "git prune --worktrees"

2015-06-29 Thread Nguyễn Thái Ngọc Duy
Commit 23af91d (prune: strategies for linked checkouts - 2014-11-30) adds "--worktrees" to "git prune" without realizing that "git prune" is for object database only. This patch moves the same functionality to a new command "git worktree". Signed-off-by: Nguyễn Thái Ngọc Duy --- In future I prob

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Christian Couder
On Mon, Jun 29, 2015 at 11:32 AM, Matthieu Moy wrote: > Christian Couder writes: [...] > I find it particularly frustrating that we issue the message: > > "The merge base %s is bad.\n" > "This means the bug has been fixed " > "between %s and [%s].\n" I find it a good safety feature. > b

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Matthieu Moy
Junio C Hamano writes: > I moderately hate to see both from aesthetics point of view, but can > we at least lose "--name-" prefix? I changed it to --term- prefix, but I'd rather not drop it. When reading "--old=foo", it is not clear to me whether the meaning should be "the term used for old is f

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Matthieu Moy
Christian Couder writes: > On Mon, Jun 29, 2015 at 9:34 AM, Matthieu Moy > >> As a user, when I >> discovered "git bisect", I was actually surprised that it expected one >> particular order between good and bad. I would have expected to be able >> to say "this is good, this is bad, tell me where

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Stefan Näwe
Am 29.06.2015 um 10:30 schrieb Johannes Schindelin: > Hi all, > > I just uploaded the 4th release candidate for the upcoming Git for > Windows 2.x release. Please find the download link here: > > https://git-for-windows.github.io/#download > > The most important changes are the update to Git 2.

4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Johannes Schindelin
Hi all, I just uploaded the 4th release candidate for the upcoming Git for Windows 2.x release. Please find the download link here: https://git-for-windows.github.io/#download The most important changes are the update to Git 2.4.5 and a fix for the crash when running Git Bash with a legacy `TE

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Christian Couder
On Mon, Jun 29, 2015 at 9:34 AM, Matthieu Moy wrote: > Christian Couder writes: > >> On Sun, Jun 28, 2015 at 8:46 AM, Michael Haggerty >> wrote: >>> I understand that the user might make a mistake when marking the initial >>> commits, but as soon as bisect says >>> >>> Commit is an ancesto

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Matthieu Moy
Christian Couder writes: > On Sun, Jun 28, 2015 at 8:46 AM, Michael Haggerty > wrote: >> I understand that the user might make a mistake when marking the initial >> commits, but as soon as bisect says >> >> Commit is an ancestor of , so I >> will look for the commit that caused the tra

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-29 Thread Matthieu Moy
Junio C Hamano writes: > I _think_ bulk of Antoine and Matthieu's work can be salvaged/reused > to implement the proposal, I'm obviously biaised since I already spent time on the "bisect terms" idea, and I would hate to see my work and Antoine & Louis' thrown away. But I have to admit that I do