[BUG] rebase -i with only empty commits

Hi, On 08/23/2017 01:08 AM, Stefan Beller wrote: > The editor opened proposing the following instruction sheet, > which in my opinion is buggy: > > pick 1234 some commit > exec make > pick 2345 another commit > exec make > pick 3456 third commit > # pick 4567 empty commit

sequencer status

Hi, I've created a small tool to display the current sequencer status. It mimics what Magit does to display what was done and what is left to do. As someone who often rebase large series of patches (also works with am, revert, cherry-pick), I really needed the feature and use this daily. It's

[PATCH/RFC] push: anonymize URL in error output

Commits 47abd85 (fetch: Strip usernames from url's before storing them, 2009-04-17) and later 882d49c (push: anonymize URL in status output, 2016-07-14) made fetch and push strip the authentication part of the remote URLs when used in the merge-commit messages or status outputs. The URLs that are

Re: How to force a push to succeed?

On Tue, Aug 22, 2017 at 05:55:25PM -0400, Jeffrey Walton wrote: > I tested some changes that lead to a dead end. The changes need to be > removed. The changes were added in 7 commits. > > I went back in time to the point before the changes: > > $ git reset --hard HEAD~7 > HEAD is now at

Re: git send-email Cc with cruft not working as expected

Stefan Beller writes: > +cc people from that thread > > On Tue, Aug 22, 2017 at 4:30 PM, Jacob Keller wrote: >> On Tue, Aug 22, 2017 at 4:18 PM, Stefan Beller wrote: >>> On Tue, Aug 22, 2017 at 4:15 PM, Jacob Keller

Re: [PATCH/RFC] push: anonymize URL in error output

> On 23 Aug 2017, at 11:49, Ivan Vyshnevskyi wrote: > > Commits 47abd85 (fetch: Strip usernames from url's before storing them, > 2009-04-17) and later 882d49c (push: anonymize URL in status output, > 2016-07-14) made fetch and push strip the authentication part of the >

[RFC PATCH 1/2] send-email: fix garbage removal after address

This is a followup over 9d33439 (send-email: only allow one address per body tag, 2017-02-20). The first iteration did allow writting Cc: # garbage but did so by matching the regex ([^>]*>?), i.e. stop after the first instance of '>'. However, it did not properly deal with

[RFC PATCH 2/2] send-email: don't use Mail::Address, even if available

Using Mail::Address made sense when we didn't have a proper parser. We now have a reasonable address parser, and using Mail::Address _if available_ causes much more trouble than it gives benefits: * Developers typically test one version, not both. * Users may not be aware that installing

[PATCH v3 1/4] Documentation/git-merge: explain --continue

Currently, 'git merge --continue' is mentioned but not explained. Explain it. Signed-off-by: Michael J Gruber --- Documentation/git-merge.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index

[PATCH v3 4/4] merge: save merge state earlier

If the `git merge` process is killed while waiting for the editor to finish, the merge state is lost but the prepared merge msg and tree is kept. So, a subsequent `git commit` creates a squashed merge even when the user asked for proper merge commit originally. Demonstrate the problem with a test

[PATCH v3 2/4] merge: clarify call chain

prepare_to_commit() cannot be reached in the non-squash case: It is called by merge_trivial() and finish_automerge() only, but the calls to the latter are somewhat hard to track: If option_commit is not set, the code in cmd_merge() uses a fake conflict return code (ret=1) to avoid writing the

[PATCH v3 0/4] Keep merge during kills

Compared to the 3-item v2: 1/4 == 1/3 2/4 is new as per Junio's suggestion: clarify the call-chain leading up to prepare_to_commit() 3/4 == 2/3 with amended subject 4/4 is 3/3 rebased, squash-if removed Michael J Gruber (4): Documentation/git-merge: explain --continue merge: clarify call

[PATCH v3 3/4] merge: split write_merge_state in two

write_merge_state() writes out the merge heads, mode, and msg. But we may want to write out heads, mode without the msg. So, split out heads (+mode) into a separate function write_merge_heads() that is called by write_merge_state(). No funtional change so far, except when these non-atomic writes

[PATCH v4 00/16] Fix git-gc losing objects in multi worktree

"git gc" when used in multiple worktrees ignore some per-worktree references: object references in the index, HEAD and reflog. This series fixes it by making the revision walker include these from all worktrees by default (and the series is basically split in three parts in the same order).

[PATCH v4 01/16] revision.h: new flag in struct rev_info wrt. worktree-related refs

The revision walker can walk through per-worktree refs like HEAD or SHA-1 references in the index. These currently are from the current worktree only. This new flag is added to change rev-list behavior in this regard: When single_worktree is set, only current worktree is considered. When it is

[PATCH v4 05/16] refs.c: refactor get_submodule_ref_store(), share common free block

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 17 ++--- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/refs.c b/refs.c index dec899a57a..522c4ab74f 100644 --- a/refs.c +++ b/refs.c @@ -1636,7 +1636,6 @@ struct ref_store

[PATCH v4 04/16] revision.c: --indexed-objects add objects from all worktrees

This is the result of single_worktree flag never being set (no way to up until now). To get objects from current index only, set single_worktree. The other add_index_objects_to_pending's caller is mark_reachable_objects() (e.g. "git prune") which also mark objects from all indexes.

[PATCH v4 03/16] revision.c: refactor add_index_objects_to_pending()

The core code is factored out and take 'struct index_state *' instead so that we can reuse it to add objects from index files other than .git/index in the next patch. Signed-off-by: Nguyễn Thái Ngọc Duy --- revision.c | 18 -- 1 file changed, 12 insertions(+),

[PATCH v4 02/16] refs.c: use is_dir_sep() in resolve_gitlink_ref()

The "submodule" argument in this function is a path, which can have either '/' or '\\' as a separator. Use is_dir_sep() to support both. Noticed-by: Johannes Sixt Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 2 +- 1 file changed, 1 insertion(+), 1

Re: splitting off shell test framework

I got a helpful response to the following question almost 5 years ago: On 12 November 2012 at 23:09, Adam Spiers wrote: > On Mon, Nov 12, 2012 at 6:18 PM, Drew Northup wrote: >> On Mon, Nov 12, 2012 at 11:37 AM, Adam Spiers

[PATCH v4 16/16] refs.c: reindent get_submodule_ref_store()

With the new "if (!submodule) return NULL;" code added in the previous commit, we don't need to check if submodule is not NULL anymore. Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/refs.c

[PATCH v4 08/16] revision.c: use refs_for_each*() instead of for_each_*_submodule()

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 9 - refs.h | 6 +++--- revision.c | 48 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/refs.c b/refs.c index b3a0a24469..cd61509bc8 100644 ---

[PATCH v4 12/16] files-backend: make reflog iterator go through per-worktree reflog

refs/bisect is unfortunately per-worktree, so we need to look in per-worktree logs/refs/bisect in addition to per-repo logs/refs. The current iterator only goes through per-repo logs/refs. Use merge iterator to walk two ref stores at the same time and pick per-worktree refs from the right

[PATCH v4 13/16] revision.c: --reflog add HEAD reflog from all worktrees

Note that add_other_reflogs_to_pending() is a bit inefficient, since it scans reflog for all refs of each worktree, including shared refs, so the shared ref's reflog is scanned over and over again. We could update refs API to pass "per-worktree only" flag to avoid that. But long term we should be

[PATCH v4 09/16] refs.c: move for_each_remote_ref_submodule() to submodule.c

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 6 -- refs.h | 2 -- submodule.c | 7 +++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/refs.c b/refs.c index cd61509bc8..7fa19e9309 100644 --- a/refs.c +++ b/refs.c @@ -368,12 +368,6 @@ int

[PATCH v4 11/16] revision.c: --all adds HEAD from all worktrees

Unless single_worktree is set, --all now adds HEAD from all worktrees. Since reachable.c code does not use setup_revisions(), we need to call other_head_refs_submodule() explicitly there to have the same effect on "git prune", so that we won't accidentally delete objects needed by some other

[PATCH v4 06/16] refs: move submodule slash stripping code to get_submodule_ref_store

This is a better place that will benefit all submodule callers instead of just resolve_gitlink_ref() Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/refs.c b/refs.c index

[PATCH v4 15/16] refs.c: remove fallback-to-main-store code get_submodule_ref_store()

At this state, there are three get_submodule_ref_store() callers: - for_each_remote_ref_submodule() - handle_revision_pseudo_opt() - resolve_gitlink_ref() The first two deal explicitly with submodules (and we should never fall back to the main ref store as a result). They are only called from

[PATCH v4 14/16] rev-list: expose and document --single-worktree

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/rev-list-options.txt | 8 revision.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index

[PATCH v4 07/16] refs: add refs_head_ref()

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 23 +-- refs.h | 2 ++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/refs.c b/refs.c index ea8e6b9f42..b3a0a24469 100644 --- a/refs.c +++ b/refs.c @@ -1248,27 +1248,30 @@ int

[PATCH v4 10/16] refs: remove dead for_each_*_submodule()

These are used in revision.c. After the last patch they are replaced with the refs_ version. Delete them. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/technical/api-ref-iteration.txt | 7 ++ refs.c| 33

Re: sequencer status

Hi, On Wed, Aug 23, 2017 at 10:10 AM, Nicolas Morey-Chaisemartin wrote: > Hi, > > I've created a small tool to display the current sequencer status. > It mimics what Magit does to display what was done and what is left to do. > > As someone who often rebase large

Re: How to force a push to succeed?

Hi Jeffrey, Jeffrey Walton wrote: > From another testing machine, it looks like the changes have not been > backed out. The previous operation un-did the ADX gear because it was > an evolutionary dead-end. > > via$ git pull > From https://github.com/noloader/cryptopp > + 66654dd...559fc3b

Re

Aufmerksamkeit, Bewerben Sie sich für eine schnelle und bequeme Darlehen zu bezahlen Rechnungen, persönliche Darlehen, Studenten Darlehen, Weihnachtsdarlehen, Hypothekendarlehen, Konsolidierungsdarlehen und ein Neugeschäft zu starten oder Ihre Projekte mit einem günstigsten Zinssatz von 3%

Re: sequencer status

Nicolas Morey-Chaisemartin writes: > Two questions: > - Could this be a candidate for contrib/ ? > - Would it be interesting to add the relevant code to sequencer.c > so that all sequencer based commands could have a --status option I actually think we would want

Re: [BUG] rebase -i with only empty commits

On Wed, Aug 23, 2017 at 8:19 AM, Stephan Beyer wrote: > Hi, > > On 08/23/2017 04:40 PM, Johannes Schindelin wrote: >> These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe >> you want to do that, too? > > That's a very valuable hint, thank you very much!

Re: Please fix the useless email prompts

Jeff King writes: > If we could reliably tell the difference between those two cases, it > might be worth doing the up-front check. But I'm not sure we can do that > without declaring that people in the ff-only case should be using a > different workflow (e.g., fetch + "reset

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

On 23 August 2017 at 19:24, Junio C Hamano wrote: > Martin Ågren writes: > >> strbuf_setlen(., 0) writes '\0' to sb.buf[0], where buf is either >> allocated and unique to sb, or the global slopbuf. The slopbuf is meant >> to provide a guarantee that buf

[PATCH 2/2] treewide: correct several "up-to-date" to "up to date"

Follow the Oxford style, which says to use "up-to-date" before the noun, but "up to date" after it. Don't change plumbing (specifically send-pack.c, but transport.c (git push) also has the same string). This was produced by grepping for "up-to-date" and "up to date". It turned out we only had to

[PATCH 1/2] Documentation/user-manual: update outdated example output

Since commit f7673490 ("more terse push output", 2007-11-05), git push has a completely different output format than the one shown in the user manual for a non-fast-forward push. Signed-off-by: Martin Ågren --- I'd say it's "not very many read this and immediately tried

Re: [BUG] rebase -i with only empty commits

On 08/23/2017 07:29 PM, Stefan Beller wrote: > On Wed, Aug 23, 2017 at 8:19 AM, Stephan Beyer wrote: >> On 08/23/2017 04:40 PM, Johannes Schindelin wrote: >>> These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe >>> you want to do that, too? >> >> That's a

Re: [PATCH/RFC] push: anonymize URL in error output

On Wed, Aug 23, 2017 at 12:49:29PM +0300, Ivan Vyshnevskyi wrote: > Commits 47abd85 (fetch: Strip usernames from url's before storing them, > 2009-04-17) and later 882d49c (push: anonymize URL in status output, > 2016-07-14) made fetch and push strip the authentication part of the > remote URLs

Re: How to force a push to succeed?

Am 23.08.2017 um 00:26 schrieb Jeffrey Walton: You know, I look at how fucked up yet another simple workflow is, and all I can do is wonder. It is absolutely amazing. Its like the project goes out of its way to make simple tasks difficult. No, no. So simple your task might look, in the end you

[GSoC][PATCH v2 0/4] submodule: Incremental rewrite of git-submodules

Changes in v2: * In the function get_submodule_displaypath(), I tried avoiding the extra memory allocation, but it rather invoked test 5 from t7406-submodule-update. The details of the test failiure can be seen in the build report as well. (Build #162) This failure occured as even though

Re: [PATCH 0/2] http: handle curl with vendor backports

On Sun, Aug 20, 2017 at 09:28:20AM -0700, Junio C Hamano wrote: > > Yes, I agree that these are an improvement regardless. If we follow > > through on the cut-off to 7.19.4, then the CURLPROTO ones all go away. > > But I don't mind rebasing any cut-off proposal on top of this work. > > Yeah I

[GSoC][PATCH v2 1/4] submodule--helper: introduce get_submodule_displaypath()

Introduce function get_submodule_displaypath() to replace the code occurring in submodule_init() for generating displaypath of the submodule with a call to it. This new function will also be used in other parts of the system in later patches. Mentored-by: Christian Couder

[GSoC][PATCH v2 3/4] submodule: port set_name_rev() from shell to C

Function set_name_rev() is ported from git-submodule to the submodule--helper builtin. The function compute_rev_name() generates the value of the revision name as required. The function get_rev_name() calls compute_rev_name() and receives the revision name, and later handles its formating and

[GSoC][PATCH v2 4/4] submodule: port submodule subcommand 'status' from shell to C

This aims to make git-submodule 'status' a built-in. Hence, the function cmd_status() is ported from shell to C. This is done by introducing three functions: module_status(), submodule_status() and print_status(). The function module_status() acts as the front-end of the subcommand. It parses

[GSoC][PATCH v2 2/4] submodule--helper: introduce for_each_submodule()

Introduce function for_each_submodule() and replace a loop in module_init() with a call to it. The new function will also be used in other parts of the system in later patches. Mentored-by: Christian Couder Mentored-by: Stefan Beller

Re: Please fix the useless email prompts

On Sun, Aug 20, 2017 at 04:56:50PM -0700, Junio C Hamano wrote: > Andrew Ardill writes: > > > Is there any reason `git pull` can't delay that check until the point > > where it actually tries to create a new commit? It's fair enough to > > error if a new commit needs to

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

Martin Ågren writes: > strbuf_setlen(., 0) writes '\0' to sb.buf[0], where buf is either > allocated and unique to sb, or the global slopbuf. The slopbuf is meant > to provide a guarantee that buf is not NULL and that a freshly > initialized buffer contains the empty

Re: splitting off shell test framework

On Wed, Aug 23, 2017 at 02:46:30PM +0100, Adam Spiers wrote: > >> Done at least once already: > >> > >> http://comments.gmane.org/gmane.comp.version-control.git/201591 > [...] > > but sadly since then gmane has shuffled off its mortal coil and I can't > remember / find what this URL referred to.

Re: [PATCH] Documentation: mention that `eol` can change the dirty status of paths

On Wed, Aug 23, 2017 at 17:17:41 -0400, Ben Boeckel wrote: > diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt > index c4f2be2..3044b71 100644 > --- a/Documentation/gitattributes.txt > +++ b/Documentation/gitattributes.txt > @@ -151,7 +151,11 @@ unspecified. > >

Re: What's cooking in git.git (Aug 2017, #05; Tue, 22)

On 22 Aug 2017, at 21:56, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration

Re: [GSoC][PATCH v2 2/4] submodule--helper: introduce for_each_submodule()

Prathamesh Chavan writes: > +typedef void (*submodule_list_func_t)(const struct cache_entry *list_item, > + void *cb_data); > + > static char *get_default_remote(void) > { > char *dest = NULL, *ret; > @@ -353,17 +356,30 @@ static int

Should rerere auto-update a merge resolution?

Hi List! Let's say... - git v2.9.4 - rerere is enabled. - I merge maint into master, resolve erroneously, commit - I publish my merge in a temp branch, a reviewer points out my mistake - I reset hard, retry the merge, using --no-commit, rerere applies what it knows - I fix things up, then

Re: [PATCH v4 10/16] refs: remove dead for_each_*_submodule()

On Wed, Aug 23, 2017 at 5:36 AM, Nguyễn Thái Ngọc Duy wrote: > These are used in revision.c. After the last patch they are replaced > with the refs_ version. Delete them. > > Signed-off-by: Nguyễn Thái Ngọc Duy The refactoring up to this patch looks good to

Re: [GSoC][PATCH v2 2/4] submodule--helper: introduce for_each_submodule()

Stefan Beller writes: > On Wed, Aug 23, 2017 at 12:13 PM, Junio C Hamano wrote: >> Prathamesh Chavan writes: >> >>> +typedef void (*submodule_list_func_t)(const struct cache_entry *list_item, >>> + void

Re: [PATCH v3 1/4] imap-send: return with error if curl failed

Nicolas Morey-Chaisemartin writes: > curl_append_msgs_to_imap always returned 0, whether curl failed or not. > Return a proper status so git imap-send will exit with an error code > if womething wrong happened. > > Signed-off-by: Nicolas Morey-Chaisemartin

Re: [PATCH v3 4/4] imap-send: use curl by default

Nicolas Morey-Chaisemartin writes: > Now that curl is enable by default, s/enable//; But it is unclear what the above really means. You certainly do not mean that [PATCH 1-3/4] somewhere tweaked our Makefile to always use libcurl and makes Git fail to build

Re: Cannot checkout after setting the eol attribute

On Wed, Aug 23, 2017 at 21:43:15 +0200, Torsten Bögershausen wrote: > git reset does it's job - please see below. > > The problem is that we need a "git commit" here. > After applying .gitattributes, it may be neccessary to "normalize" the > files. If there is something in the documentation, that

[PATCH] Documentation: mention that `eol` can change the dirty status of paths

When setting the `eol` attribute, paths can change their dirty status without any change in the working directory. This can cause confusion and should at least be mentioned with a remedy. Signed-off-by: Ben Boeckel --- Documentation/gitattributes.txt | 6 +- 1 file

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

On Wed, Aug 23, 2017 at 2:04 PM, Junio C Hamano wrote: > Brandon Casey writes: > >> So is there any reason why didn't do something like the following in >> the first place? > > My guess is that we didn't bother; if we cared, we would have used a > single

Re: [PATCH] Doc: clarify that pack-objects makes packs, plural

On Tue, Aug 22, 2017 at 12:56:25PM -0700, Junio C Hamano wrote: > - There should be an update to say max-pack-size is not something >normal users would ever want. Agreed. > diff --git a/Documentation/git-pack-objects.txt > b/Documentation/git-pack-objects.txt > index

Re: [RFC 0/3] imap-send curl tunnelling support

On Mon, Aug 21, 2017 at 09:34:19AM +0200, Nicolas Morey-Chaisemartin wrote: > >> It appears curl do not support the PREAUTH tag. > > Too bad. IMHO preauth is the main reason to use a tunnel in the first > > place. > > It shouldn't be too hard to add support for this in curl. > If it's the main

Re: [PATCH] Retry acquiring reference locks for 100ms

Michael Haggerty writes: > The philosophy of reference locking has been, "if another process is > changing a reference, then whatever I'm trying to do to it will > probably fail anyway because my old-SHA-1 value is probably no longer > current". But this argument falls down

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

Brandon Casey writes: > So is there any reason why didn't do something like the following in > the first place? My guess is that we didn't bother; if we cared, we would have used a single instance of const char in a read-only segment, instead of such a macro. > diff --git

Re: Should rerere auto-update a merge resolution?

On Wed, Aug 23, 2017 at 4:34 PM, Junio C Hamano wrote: > Between these two steps: > >> - I reset hard, retry the merge, using --no-commit, rerere applies what it >> knows >> - I fix things up, then commit > > You'd tell rerere to forget what it knows because it is wrong. Hi

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

On Wed, Aug 23, 2017 at 2:20 PM, Brandon Casey wrote: > On Wed, Aug 23, 2017 at 2:04 PM, Junio C Hamano wrote: >> Brandon Casey writes: >> >>> So is there any reason why didn't do something like the following in >>> the first place? >> >>

Re: [RFC PATCH 1/2] send-email: fix garbage removal after address

On Wed, Aug 23, 2017 at 3:21 AM, Matthieu Moy wrote: > This is a followup over 9d33439 (send-email: only allow one address > per body tag, 2017-02-20). The first iteration did allow writting > > Cc: # garbage > > but did so by matching the regex

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

On Wed, Aug 23, 2017 at 2:54 PM, Brandon Casey wrote: > On Wed, Aug 23, 2017 at 2:20 PM, Brandon Casey wrote: >> On Wed, Aug 23, 2017 at 2:04 PM, Junio C Hamano wrote: >>> Brandon Casey writes: >>> So is there any

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

Brandon Casey writes: > On Wed, Aug 23, 2017 at 2:04 PM, Junio C Hamano wrote: >> Brandon Casey writes: >> >>> So is there any reason why didn't do something like the following in >>> the first place? >> >> My guess is that we didn't

Re: [RFC 0/3] imap-send curl tunnelling support

Hi Hannes, On Tue, 22 Aug 2017, Johannes Sixt wrote: > Am 21.08.2017 um 09:27 schrieb Nicolas Morey-Chaisemartin: > > (Sent a reply from my phone while out of town but couldn't find it so here > > it is again) > > > > It's available on my github: > >

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

On Wed, Aug 23, 2017 at 3:24 PM, Junio C Hamano wrote: > Brandon Casey writes: > >> On Wed, Aug 23, 2017 at 2:04 PM, Junio C Hamano wrote: >>> Brandon Casey writes: >>> So is there any reason why didn't do

Re: splitting off shell test framework

On 23 August 2017 at 16:47, Jeff King wrote: > On Wed, Aug 23, 2017 at 02:46:30PM +0100, Adam Spiers wrote: >> >> Done at least once already: >> >> >> >> http://comments.gmane.org/gmane.comp.version-control.git/201591 >> [...] >> >> but sadly since then gmane has shuffled off its

Re: [BUG] rebase -i with only empty commits

From: "Johannes Schindelin" So the problem seems to be that rebase -i (like rebase without -i) considers "empty commits" as commits to be ignored. However, when using rebase -i one expects that you can include the empty commit... Also, the behavior is odd. When I

Re: git send-email Cc with cruft not working as expected

On Wed, Aug 23, 2017 at 3:02 AM, Matthieu Moy wrote: >> On Tue, Aug 22, 2017 at 4:30 PM, Jacob Keller wrote: >>> Additionally I just discovered that the behavior here changes pretty >>> drastically if you have Email::Validate installed, now it splits

Re: [PATCH 2/2] treewide: correct several "up-to-date" to "up to date"

These corrections all look great (English-language-wise). :) On Wed, Aug 23, 2017 at 10:49 AM, Martin Ågren wrote: > Follow the Oxford style, which says to use "up-to-date" before the noun, > but "up to date" after it. Don't change plumbing (specifically > send-pack.c,

Re: Undocumented change in `git branch -M` behavior

On Wed, Aug 23, 2017 at 01:13:34PM -0700, Nish Aravamudan wrote: > Hello, > > Hopefully, I've got this right -- I noticed a change in behavior in git > with Ubuntu 17.10, which recently got 2.14.1. Specifically, that when in > an orphaned branch, -M ends up moving HEAD to the new branch name, >

Re: [PATCH] Documentation: mention that `eol` can change the dirty status of paths

On Wed, Aug 23, 2017 at 05:17:41PM -0400, Ben Boeckel wrote: > When setting the `eol` attribute, paths can change their dirty status > without any change in the working directory. This can cause confusion > and should at least be mentioned with a remedy. > > Signed-off-by: Ben Boeckel

Re: [BUG] rebase -i with only empty commits

Stephan Beyer writes: > On 08/23/2017 07:29 PM, Stefan Beller wrote: >> On Wed, Aug 23, 2017 at 8:19 AM, Stephan Beyer wrote: >>> On 08/23/2017 04:40 PM, Johannes Schindelin wrote: These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe

Re: [PATCH v4 02/16] refs.c: use is_dir_sep() in resolve_gitlink_ref()

On Wed, Aug 23, 2017 at 5:36 AM, Nguyễn Thái Ngọc Duy wrote: > The "submodule" argument in this function is a path, which can have > either '/' or '\\' as a separator. Use is_dir_sep() to support both. > > Noticed-by: Johannes Sixt > Signed-off-by: Nguyễn Thái

Re: [PATCH v3 1/4] imap-send: return with error if curl failed

Nicolas Morey-Chaisemartin writes: > curl_append_msgs_to_imap always returned 0, whether curl failed or not. > Return a proper status so git imap-send will exit with an error code > if womething wrong happened. womething? No need to resend only to fix if this is

Re: Should rerere auto-update a merge resolution?

Martin Langhoff writes: > Hi List! > > Let's say... > - git v2.9.4 > - rerere is enabled. > - I merge maint into master, resolve erroneously, commit > - I publish my merge in a temp branch, a reviewer points out my mistake > - I reset hard, retry the merge, using

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

Martin Ågren writes: > On 23 August 2017 at 19:24, Junio C Hamano wrote: >> Martin Ågren writes: >> >>> strbuf_setlen(., 0) writes '\0' to sb.buf[0], where buf is either >>> allocated and unique to sb, or the global slopbuf.

Re: [PATCH v4 04/16] revision.c: --indexed-objects add objects from all worktrees

On Wed, Aug 23, 2017 at 5:36 AM, Nguyễn Thái Ngọc Duy wrote: > This is the result of single_worktree flag never being set (no way to up > until now). To get objects from current index only, set single_worktree. > > The other add_index_objects_to_pending's caller is

Re: [PATCH v4 11/16] revision.c: --all adds HEAD from all worktrees

> +int other_head_refs(each_ref_fn fn, void *cb_data) > +{ > + struct worktree **worktrees, **p; > + int ret = 0; > + > + worktrees = get_worktrees(0); > + for (p = worktrees; *p; p++) { > + struct worktree *wt = *p; > + struct ref_store *refs; >

Re: [PATCH v2 3/4] strbuf_setlen: don't write to strbuf_slopbuf

On Mon, Aug 21, 2017 at 10:43 AM, Martin Ågren wrote: > strbuf_setlen(., 0) writes '\0' to sb.buf[0], where buf is either > allocated and unique to sb, or the global slopbuf. The slopbuf is meant > to provide a guarantee that buf is not NULL and that a freshly >

Re: [PATCH v4 05/16] refs.c: refactor get_submodule_ref_store(), share common free block

On Wed, Aug 23, 2017 at 5:36 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > refs.c | 17 ++--- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/refs.c b/refs.c > index dec899a57a..522c4ab74f

Re: [GSoC][PATCH v2 2/4] submodule--helper: introduce for_each_submodule()

On Wed, Aug 23, 2017 at 12:13 PM, Junio C Hamano wrote: > Prathamesh Chavan writes: > >> +typedef void (*submodule_list_func_t)(const struct cache_entry *list_item, >> + void *cb_data); >> + >> static char

Re: Cannot checkout after setting the eol attribute

On Tue, Aug 22, 2017 at 03:44:41PM -0400, Ben Boeckel wrote: > On Tue, Aug 22, 2017 at 21:13:18 +0200, Torsten Bögershausen wrote: > > When you set the text attribute (in your case "eol=crlf" implies text) > > then the file(s) -must- be nomalized and commited so that they have LF > > in the repo

Undocumented change in `git branch -M` behavior

Hello, Hopefully, I've got this right -- I noticed a change in behavior in git with Ubuntu 17.10, which recently got 2.14.1. Specifically, that when in an orphaned branch, -M ends up moving HEAD to the new branch name, clobbering the working tree. As far as I know, from the manpages, orphaned

Re: [PATCH v3 2/4] imap-send: add wrapper to get server credentials if needed

Nicolas Morey-Chaisemartin writes: > Signed-off-by: Nicolas Morey-Chaisemartin > --- > imap-send.c | 34 -- > 1 file changed, 20 insertions(+), 14 deletions(-) > > diff --git a/imap-send.c

Re: [PATCH v4 14/16] rev-list: expose and document --single-worktree

On Wed, Aug 23, 2017 at 5:37 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > Documentation/rev-list-options.txt | 8 > revision.c | 2 ++ > 2 files changed, 10 insertions(+) > > diff --git

Re: [PATCH 1/2] Documentation/user-manual: update outdated example output

Martin Ågren writes: > Since commit f7673490 ("more terse push output", 2007-11-05), git push > has a completely different output format than the one shown in the user > manual for a non-fast-forward push. > > Signed-off-by: Martin Ågren > --- >

Re: [BUG] rebase -i with only empty commits

Hi, On 08/23/2017 04:40 PM, Johannes Schindelin wrote: > These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe > you want to do that, too? That's a very valuable hint, thank you very much! Best Stephan

Re: [BUG] rebase -i with only empty commits

Hi, On Wed, 23 Aug 2017, Stephan Beyer wrote: > On 08/23/2017 01:08 AM, Stefan Beller wrote: > > The editor opened proposing the following instruction sheet, > > which in my opinion is buggy: > > > > pick 1234 some commit > > exec make > > pick 2345 another commit > > exec make