Re: Advice needed for basic setup for home user

On Tue, Aug 22, 2017 at 10:11 PM, Harry Putnam wrote: > > I run 5-10 vbox vms' on this host with various OS's involved. > With each host, I've kept a local repo of some key OS rc files. > and a couple of hundred home made scripts. > > They all follow the same pattern of setup,

Re: "Your branch is up-to-date ..." is incorrect English grammar

Thank you, Martin and Junio. I'd be happy to review any patches. Thank you both for your help! :) (incidentally, I've had a devil of a time sending my two emails on this topic--a total of 5 bounced mails for various reasons: didn't like my email format, didn't like my email address, mail client,

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

Jonathan Nieder writes: > Junio C Hamano wrote: > ... >> It looks to me that this is a reduced duplicate of what brian posted >> yesterday. The first two patches in the 6-patch series that you >> commented on, I think, covers what this change wants to achieve and >> probably

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

On 08/22, Junio C Hamano wrote: > > * bw/submodule-config-cleanup (2017-08-03) 17 commits > - submodule: remove gitmodules_config > - unpack-trees: improve loading of .gitmodules > - submodule-config: lazy-load a repository's .gitmodules file > - submodule-config: move submodule-config

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

The documentation for pack-objects describes that it creates "a packed archive of objects", which is confusing because it may create multiple packs if --max-pack-size is set. Update the documentation to clarify this, and explaining in which cases such a feature would be useful. Signed-off-by:

[PATCH v2 4/4] vcs-svn: move remaining repo_tree functions to fast_export.h

These used to be for manipulating the in-memory repo_tree structure, but nowadays they are convenience wrappers to handle a few git-vs-svn mismatches: 1. Git does not track empty directories but Subversion does. When looking up a path in git that Subversion thinks exists and finding

[PATCH v2 3/4] vcs-svn: remove repo_delete wrapper function

Since v1.7.10-rc0~118^2~4^2~4^2~3 (vcs-svn: pass paths through to fast-import, 2010-12-13) this is an alias for fast_export_delete. Remove the unnecessary layer of indirection. No functional change intended. Signed-off-by: Jonathan Nieder --- Unchanged. vcs-svn/repo_tree.c

[PATCH v2 2/4] vcs-svn: remove custom mode constants

In the rest of Git, these modes are spelled as S_IFDIR, S_IFREG | 0644, S_IFREG | 0755, and S_IFLNK. Use the same constants in svn-fe for simplicity and consistency. No functional change intended. Signed-off-by: Jonathan Nieder --- Unchanged. vcs-svn/fast_export.c | 6

[PATCH v2 1/4] vcs-svn: remove more unused prototypes and declarations

I forgot to remove these in v1.7.10-rc0~118^2~4^2~5^2~4 (vcs-svn: eliminate repo_tree structure, 2010-12-10). This finishes what was started in commit 36f63b50 (vcs-svn: remove unused prototypes, 2017-08-21). Signed-off-by: Jonathan Nieder --- vcs-svn/repo_tree.h | 3 --- 1

[PATCH v2 bc/vcs-svn-cleanup] vcs-svn: remove repo_tree library

Hi again, Jonathan Nieder wrote: > This is an alternative to bc/vcs-svn-cleanup from 'next'. Those > patches weren't cc-ed to me and I missed them --- sorry about that. I > can rebase on top of them if that is more convenient. Here is the same series rebased on top of bc/vcs-svn-cleanup.

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

Junio C Hamano wrote: > Stefan Beller writes: >> The svn specific declaration of repo_init was not used since 723b7a2789 >> (vcs-svn: eliminate repo_tree structure, 2010-12-10). >> >> This was noticed when including repository.h via cache.h as that has the >> same function

Re: [PATCH 0/4] vcs-svn: remove repo_tree library

On Tue, Aug 22, 2017 at 4:37 PM, Jonathan Nieder wrote: > Hi, > > Stefan noticed that repo_init from vcs-svn/repo_tree.h conflicts with > repository.h[1]. Earlier brian m. carlson noticed the same thing[2]. > > Originally repo_tree.h was used to manage an in-memory

[PATCH 4/4] vcs-svn: move remaining repo_tree functions to fast_export.h

These used to be for manipulating the in-memory repo_tree structure, but nowadays they are convenience wrappers to handle a few git-vs-svn mismatches: 1. Git does not track empty directories but Subversion does. When looking up a path in git that Subversion thinks exists and finding

[PATCH 3/4] vcs-svn: remove repo_delete wrapper function

Since v1.7.10-rc0~118^2~4^2~4^2~3 (vcs-svn: pass paths through to fast-import, 2010-12-13) this is an alias for fast_export_delete. Remove the unnecessary layer of indirection. No functional change intended. Signed-off-by: Jonathan Nieder --- vcs-svn/repo_tree.c | 5 -

[PATCH 2/4] vcs-svn: remove custom mode constants

In the rest of Git, these modes are spelled as S_IFDIR, S_IFREG | 0644, S_IFREG | 0755, and S_IFLNK. Use the same constants in svn-fe for simplicity and consistency. No functional change intended. Signed-off-by: Jonathan Nieder --- vcs-svn/fast_export.c | 6 +++---

[PATCH 1/4] vcs-svn: remove prototypes for missing functions

I forgot to remove these prototypes when removing these functions in v1.7.10-rc0~118^2~4^2~5^2~4 (vcs-svn: eliminate repo_tree structure, 2010-12-10). Noticed by building a new file that included both repo_tree.h and repository.h ("error: conflicting types for 'repo_init'"). Reported-by: brian

[PATCH 0/4] vcs-svn: remove repo_tree library

Hi, Stefan noticed that repo_init from vcs-svn/repo_tree.h conflicts with repository.h[1]. Earlier brian m. carlson noticed the same thing[2]. Originally repo_tree.h was used to manage an in-memory representation of the state of the svn tree being imported. When that in-memory representation

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

+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 wrote: >>> Hi, >>> >>> I recently found

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

On Tue, Aug 22, 2017 at 4:18 PM, Stefan Beller wrote: > On Tue, Aug 22, 2017 at 4:15 PM, Jacob Keller wrote: >> Hi, >> >> I recently found an issue with git-send-email where it does not >> properly remove the cruft of an email address when sending

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

On Tue, Aug 22, 2017 at 4:15 PM, Jacob Keller wrote: > Hi, > > I recently found an issue with git-send-email where it does not > properly remove the cruft of an email address when sending using a Cc: > line. > > The specific example is with a commit containing the

git send-email Cc with cruft not working as expected

Hi, I recently found an issue with git-send-email where it does not properly remove the cruft of an email address when sending using a Cc: line. The specific example is with a commit containing the following Cc line, Cc: sta...@vger.kernel.org # 4.10+ which is the standard way Linux upstream

[BUG] rebase -i with empty commits + exec

Currently I am working on a longer series, for which I decided to keep track of progress in an empty commit. This empty commit is in the middle of the series (to divide the commits into two sets, the foundation that I consider stable and the later parts that are not as stable for my development,

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

Junio C Hamano wrote: > Stefan Beller writes: >> The svn specific declaration of repo_init was not used since 723b7a2789 >> (vcs-svn: eliminate repo_tree structure, 2010-12-10). >> >> This was noticed when including repository.h via cache.h as that has the >> same function

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

Prathamesh Chavan writes: > -static void init_submodule(const char *path, const char *prefix, int quiet) > +static void for_each_submodule_list(const struct module_list list, > + submodule_list_func_t fn, void *cb_data) It may not be wrong

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

Prathamesh Chavan writes: > Introduce function get_submodule_displaypath() to replace the code > occurring in submodule_init() for generating displaypath of the > submodule with a call to it. Looks like a quite straight-forward refactoring. > +static char

Re: How to force a push to succeed?

Commit seems to be the wrong command as Git appears to be trying to do something I don't want. How do I force the push to succeed? Thanks in advance. >>> >>> Checkout the --force[-with-lease] argument. > > Thanks again Stefan, > > From another testing machine, it

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

On Tue, Aug 22, 2017 at 3:18 PM, Junio C Hamano wrote: > Stefan Beller writes: > > >> The svn specific declaration of repo_init was not used since 723b7a2789 >> (vcs-svn: eliminate repo_tree structure, 2010-12-10). >> >> This was noticed when including

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

Stefan Beller writes: > The svn specific declaration of repo_init was not used since 723b7a2789 > (vcs-svn: eliminate repo_tree structure, 2010-12-10). > > This was noticed when including repository.h via cache.h as that has the > same function with a different signature. >

Re: How to force a push to succeed?

On Tue, Aug 22, 2017 at 6:03 PM, Jeffrey Walton wrote: > On Tue, Aug 22, 2017 at 5:57 PM, Stefan Beller wrote: >> On Tue, Aug 22, 2017 at 2:55 PM, Jeffrey Walton wrote: >>> I tested some changes that lead to a dead end. The changes

Re: How to force a push to succeed?

On Tue, Aug 22, 2017 at 5:57 PM, Stefan Beller wrote: > On Tue, Aug 22, 2017 at 2:55 PM, 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

Re: How to force a push to succeed?

On Tue, Aug 22, 2017 at 2:55 PM, 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

How to force a push to succeed?

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 559fc3b Fix benchmark selection code (GH #464) When I attempted to push:

[PATCH v2 6/6] rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved

These two configuration variables are described in the documentation to take an expiry period expressed in the number of days: gc.rerereResolved:: Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. The

[PATCH v2 5/6] rerere: represent time duration in timestamp_t internally

The two configuration variables, gc.rerereResolved and gc.rerereUnresolved, are measured in days and are passed as such into the prune_one() helper function, which worked in time_t to see if an entry in the rerere database is past its expiry. Instead, have the caller turn the number of days into

[PATCH v2 3/6] t4200: gather "rerere gc" together

Move the "rerere gc with custom expiry" test up, so that it is close to the more "rerere gc" tests. Signed-off-by: Junio C Hamano --- t/t4200-rerere.sh | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git

[PATCH v2 4/6] t4200: parameterize "rerere gc" custom expiry test

The test creates a rerere database entry that is two days old, and tries to expire with three different custom expiry configuration (keep ones less than 5 days old, keep ones used less than 5 days ago, and expire everything right now). We'll be introducing a different way to spell the same "5

[PATCH v2 2/6] t4200: make "rerere gc" test more robust

The test blindly trusted that there may be _some_ entries left in the rerere database, and used them by updating their timestamps to see if the gc threshold variables are honoured correctly. This won't work if there is no entries in the database when the test begins. Instead, clear the rerere

[PATCH v2 0/6] accept non-integer for "this many days" expiry specification

About a month ago, we wondered why [gc] rerereResolved = 5.days does not work and if we want to do something better. This is an update to my first attempt. It turns out that I needed more patches to clean up the tests before I can write new tests for this feature.

[PATCH v2 1/6] t4200: give us a clean slate after "rerere gc" tests

The "multiple identical conflicts" test counts the number of entries in the rerere database after trying a handful of mergy operations and recording their resolutions, but without initializing the rerere database to a known state, allowing the state left by previous tests to trigger a false

[PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

The svn specific declaration of repo_init was not used since 723b7a2789 (vcs-svn: eliminate repo_tree structure, 2010-12-10). This was noticed when including repository.h via cache.h as that has the same function with a different signature. Helped-by: Jonathan Nieder

Re: [git-for-windows] Re: Revision resolution for remote-helpers?

Hi, On Fri, 18 Aug 2017, Jonathan Nieder wrote: > Mike Hommey wrote[1]: > > On Fri, Aug 18, 2017 at 03:06:37PM -0700, Jonathan Nieder wrote: > >> Mike Hommey wrote: > > >>> The reason for the :: prefix is that it matches the :: > >>> prefix used for remote helpers. > >>> > >>> Now, there are a

Advice needed for basic setup for home user

Setup: Running openindian/hipster updated as of Aug 20 '17 Hardware: HP xw8600 - 2x Xeon CPU X5450 @ 3.00GHz - 32 GB ram I used cvs for several yrs before moving to git about yr ago. In both cases I've barely scratched the surface with my usage. I run 5-10 vbox vms' on this host with various

Re: [PATCH] Add 'raw' blob_plain link in history overview

Job Snijders writes: > For people that work with very large plain text files it may be easier > if one can bypass viewing the htmlized blob and instead click directly > to the raw file (rather then click through 'blob' and then to 'raw'). > > Reviewed-by: Giuseppe Bilotta

Re: Best way to check whether working tree matches a commit's tree

On Tue, Aug 22, 2017 at 9:34 PM, Junio C Hamano wrote: >> While this works, it feels sub-optimal. Is there a better / smarter way? > > I do not think so; you want three things to match and you have a way > to compare two things at a time. Right. I was just thinking if there's

Re: [PATCH] Add 'raw' blob_plain link in history overview

For people that work with very large plain text files it may be easier if one can bypass viewing the htmlized blob and instead click directly to the raw file (rather then click through 'blob' and then to 'raw'). Reviewed-by: Giuseppe Bilotta Signed-off-by: Job

Re: [PATCH] Add 'raw' blob_plain link in history overview

Job Snijders writes: > On Tue, Aug 22, 2017 at 12:22:43PM -0700, Junio C Hamano wrote: >> Job Snijders writes: >> > Add 'raw' blob_plain link in history overview >> > >> > Reviewed-by: Giuseppe Bilotta >> > Signed-off-by: Job

Re: Cannot checkout after setting the eol attribute

Torsten Bögershausen writes: > The following would solve your problem: >git init >echo $'dos\r' > dos >git add dos >git commit -m "dos newlines" >echo "dos -crlf" > .gitattributes >git add .gitattributes >git commit -m "add attributes" >echo "dos

Re: [PATCH] Add 'raw' blob_plain link in history overview

On Tue, Aug 22, 2017 at 9:35 PM, Job Snijders wrote: > We often work with very large plain text files in our repositories and > found it friendlier to the users if we can click directly to the raw > version of such files. It might be worth it to add this information to the

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

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The second batch of topics are

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

Jonathan Tan writes: > The documentation for pack-objects describes that it creates "a packed > archive of objects", which is confusing because it may create multiple > packs if --max-pack-size is set. Update the documentation to clarify > this. > > Signed-off-by:

Re: Cannot checkout after setting the eol attribute

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 (technically speaking the index) This seems like a special case that

Re: [PATCH] Add 'raw' blob_plain link in history overview

On Tue, Aug 22, 2017 at 12:22:43PM -0700, Junio C Hamano wrote: > Job Snijders writes: > > Add 'raw' blob_plain link in history overview > > > > Reviewed-by: Giuseppe Bilotta > > Signed-off-by: Job Snijders > > > > --- > >

Re: Best way to check whether working tree matches a commit's tree

Sebastian Schuberth writes: > Hi, > > I'd like to check whether my working tree exactly matches the tree of a given > commit. That is, there should not be any untracked, staged or modified files > (including ignored files). > > Currently, I'm doing this in two steps: > >

Re: mk-dontmerge/size-t-on-next test failure

Johannes Sixt writes: > I observe the test failure below in t0040-parse-options.sh. It bisects > to 1a7909b25eb4ab3071ce4290115618e2582eadaa "Convert pack-objects to > size_t". It looks like git_parse_size_t() needs a fix. This is on > Windows, 32 bit. size_t, int and long are all

Re: [PATCH] Add 'raw' blob_plain link in history overview

Job Snijders writes: > Add 'raw' blob_plain link in history overview > > Reviewed-by: Giuseppe Bilotta > Signed-off-by: Job Snijders > > --- Thanks; I somehow thought that your earlier one not just said what it does

Re: Cannot checkout after setting the eol attribute

On Tue, Aug 22, 2017 at 01:49:18PM -0400, Ben Boeckel wrote: > Hi, > > I specified the `eol` attribute on some files recently and the behavior > of Git is very strange. > > Here is the set of commands to set up the repository used for the > discussion: > > git init > echo $'dos\r' > dos

Re: [PATCH] pull: respect submodule update configuration

On 08/22, Stefan Beller wrote: > On Tue, Aug 22, 2017 at 7:50 AM, Lars Schneider > wrote: > > > > OK. I change my scripts to use ".active" and it seems to work nicely. > > > > I noticed one oddity, though: > > > > If I clone a repo using `git clone --recursive ` then the

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

The documentation for pack-objects describes that it creates "a packed archive of objects", which is confusing because it may create multiple packs if --max-pack-size is set. Update the documentation to clarify this. Signed-off-by: Jonathan Tan --- It took me quite some

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

This was sadly kind of expected... I need to look for another way to handle this on Windows. Thanks for the test Nicolas Le 22/08/2017 à 19:10, Johannes Sixt a écrit : > 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

Re: [PATCH] repository: fix a sparse 'using integer a NULL pointer' warning

René Scharfe writes: >> diff --git a/repository.c b/repository.c >> index 01af20dee..ceef73614 100644 >> --- a/repository.c >> +++ b/repository.c >> @@ -5,7 +5,7 @@ >> >> /* The main repository */ >> static struct repository the_repo = { >> -NULL, NULL, NULL, NULL, NULL,

Re: Submodule regression in 2.14?

On Tue, Aug 22, 2017 at 8:33 AM, Heiko Voigt wrote: > On Mon, Aug 21, 2017 at 09:42:54AM -0700, Stefan Beller wrote: >> On Mon, Aug 21, 2017 at 9:05 AM, Heiko Voigt wrote: >> > On Fri, Aug 18, 2017 at 11:51:13PM -0700, Junio C Hamano wrote: >> >> As long as

Best way to check whether working tree matches a commit's tree

Hi, I'd like to check whether my working tree exactly matches the tree of a given commit. That is, there should not be any untracked, staged or modified files (including ignored files). Currently, I'm doing this in two steps: - check for success and empty output of "git status --ignored

Re: [PATCH] pull: respect submodule update configuration

On Tue, Aug 22, 2017 at 7:50 AM, Lars Schneider wrote: > > OK. I change my scripts to use ".active" and it seems to work nicely. > > I noticed one oddity, though: > > If I clone a repo using `git clone --recursive ` then the local > Git config of the repo gets the

Cannot checkout after setting the eol attribute

Hi, I specified the `eol` attribute on some files recently and the behavior of Git is very strange. Here is the set of commands to set up the repository used for the discussion: git init echo $'dos\r' > dos git add dos git commit -m "dos newlines" echo "dos -crlf" >

Re: [PATCH] repository: fix a sparse 'using integer a NULL pointer' warning

Am 21.08.2017 um 17:48 schrieb Ramsay Jones: > > Commit 67a9dfcc00 ("hash-algo: integrate hash algorithm support with > repo setup", 21-08-2017) added a 'const struct git_hash_algo *hash_algo' > field to the repository structure, without modifying the initializer > of the 'the_repo' variable.

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

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: https://github.com/nmorey/git/tree/dev/curl-tunnel The series had been stlighly changed since the patch were posted,

mk-dontmerge/size-t-on-next test failure

I observe the test failure below in t0040-parse-options.sh. It bisects to 1a7909b25eb4ab3071ce4290115618e2582eadaa "Convert pack-objects to size_t". It looks like git_parse_size_t() needs a fix. This is on Windows, 32 bit. size_t, int and long are all 32 bits wide. expecting success:

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

hIpPy writes: > I think 'git merge --continue' should be advertised more that 'git > commit' as typically one is familiar with 'git rebase --continue' and > 'git cherry-pick --continue'. I for a long time did not know I could > also use 'git commit' to continue a merge but

Re: [PATCH v2 3/3] merge: save merge state earlier

Michael J Gruber writes: >> Can squash ever be true in this function? >> >> This function has two callsites: merge_trivial() and >> finish_automerge(). >> >> I think merge_trivial() will not be called under "--squash", which >> turns option_commit off and the only callsite

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

Now that curl is enable by default, use the curl implementation for imap too. The goal is to validate feature parity between the legacy and the curl implementation, deprecate thee legacy implementation later on and in the long term, hopefully drop it altogether. Signed-off-by: Nicolas

Re: What's cooking in git.git (Aug 2017, #04; Fri, 18)

Duy Nguyen writes: > On Sat, Aug 19, 2017 at 4:26 AM, Junio C Hamano wrote: >> [Discarded] >> >> * nd/prune-in-worktree (2017-04-24) 12 commits >> . rev-list: expose and document --single-worktree >> . revision.c: --reflog add HEAD reflog from all

[PATCH v3 3/4] imap_send: setup_curl: retreive credentials if not set in config file

Up to this point, the curl mode only supported getting the username and password from the gitconfig file while the legacy mode could also fetch them using the credential API. Signed-off-by: Nicolas Morey-Chaisemartin --- imap-send.c | 18 -- 1

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

Signed-off-by: Nicolas Morey-Chaisemartin --- imap-send.c | 34 -- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/imap-send.c b/imap-send.c index 09f29ea95..448a4a0b3 100644 --- a/imap-send.c +++ b/imap-send.c @@

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

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 --- imap-send.c | 2 +- 1 file changed, 1

[PATCH v3 0/4] imap-send: Fix and enable curl by default

Changes since v2: Patch 3 reject credit when curl failed: - when a login error is returned (curl >= 7.13.1) - for any curl error in older versions Nicolas Morey-Chaisemartin (4): imap-send: return with error if curl failed imap-send: add wrapper to get server credentials if needed

Re: [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase

Phillip Wood writes: >> In other words, instead of >> >> git add -u && git rebase --continue >> >> you would want a quicker way to say >> >> git rebase --continue $something_here > > Exactly > ... > rebase --continue -a > > behaves like commit -a in that

Re: Submodule regression in 2.14?

On Mon, Aug 21, 2017 at 09:48:51AM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > > So I think it is important that there are commits in the submodule so > > its history makes sense independently for others. > > I was trying to push the "just like trees" to the

Re: Submodule regression in 2.14?

On Mon, Aug 21, 2017 at 09:42:54AM -0700, Stefan Beller wrote: > On Mon, Aug 21, 2017 at 9:05 AM, Heiko Voigt wrote: > > On Fri, Aug 18, 2017 at 11:51:13PM -0700, Junio C Hamano wrote: > >> As long as we are talking about idealized future world (well, at > >> least an idea of

Re: [PATCH 0/1] Add stash entry count summary to short status output

I am just bumping this thread; I presume there is something amiss with my submissions, so if someone can let me know how to fix any issues, I will gladly re-submit the patch. Thanks! - Sonny

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

I think 'git merge --continue' should be advertised more that 'git commit' as typically one is familiar with 'git rebase --continue' and 'git cherry-pick --continue'. I for a long time did not know I could also use 'git commit' to continue a merge but that's just me. Now, 'git commit' is easier to

Re: t5551 hangs ?

> No concurrency. > That's what I do: ./t5551-http-fetch-smart.sh Oh ok! I was just trying to weed out what could out of place. Just to make sure, your old compute is also running debian 8 latest? > > > - You probably want to see the version of apache this is running/etc. > > The one that

Re: [PATCH] pull: respect submodule update configuration

> On 21 Aug 2017, at 20:21, Brandon Williams wrote: > > On 08/21, Stefan Beller wrote: >> On Mon, Aug 21, 2017 at 10:20 AM, Lars Schneider >> wrote: >>> On 21 Aug 2017, at 18:55, Stefan Beller wrote: On Mon, Aug

Re: t5551 hangs ?

On Tue, Aug 22, 2017 at 01:26:25AM -0400, Santiago Torres wrote: > Hello, Torsten. > > On Tue, Aug 22, 2017 at 07:10:59AM +0200, Torsten Bögershausen wrote: > > Hej, > > I found 2 threads about hanging t5551, one in 2016, and one question > > from Junio somewhen in 2017. > > I have it

Re: [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase

On 21/08/17 23:41, Junio C Hamano wrote: > Phillip Wood writes: > >> ... I prefer >> having to pass --autostage with --continue so that it is a concious >> decision by the user to stage unstaged changes when they continue rather >> than rebase just doing it each time

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

On 22 August 2017 at 11:26, Michael J Gruber wrote: > Martin Ågren venit, vidit, dixit 21.08.2017 18:43: >> On 21 August 2017 at 14:53, Michael J Gruber wrote: >>> Currently, 'git merge --continue' is mentioned but not explained. >>> >>> Explain it. >>> >>>

Re: [PATCH v2 3/3] merge: save merge state earlier

Junio C Hamano venit, vidit, dixit 22.08.2017 02:38: > Michael J Gruber writes: > >> static void prepare_to_commit(struct commit_list *remoteheads) >> { >> struct strbuf msg = STRBUF_INIT; >> @@ -767,6 +768,8 @@ static void prepare_to_commit(struct commit_list >>

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

Martin Ågren venit, vidit, dixit 21.08.2017 18:43: > On 21 August 2017 at 14:53, Michael J Gruber wrote: >> Currently, 'git merge --continue' is mentioned but not explained. >> >> Explain it. >> >> Signed-off-by: Michael J Gruber >> --- >>

Re: What's cooking in git.git (Aug 2017, #04; Fri, 18)

On Sat, Aug 19, 2017 at 4:26 AM, Junio C Hamano wrote: > [Discarded] > > * nd/prune-in-worktree (2017-04-24) 12 commits > . rev-list: expose and document --single-worktree > . revision.c: --reflog add HEAD reflog from all worktrees > . files-backend: make reflog iterator go