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

this patch adds a header in the same style as the one provided by the --branch option when the user supplies both --show-stash and --short.  My attempt at creating a new test is broken[1], and I assume my changes could (and, likely need to) be improved.  Any assistance would be greatly

Re: [PATCH 1/3] stash: add test for stash create with no files

Joel Teichroeb writes: > On Sat, Aug 19, 2017 at 1:55 PM, Junio C Hamano wrote: >> >> Are you documenting an existing breakage? Are you extending test >> coverage for some breakage we recently fixed without adding tests to >> ensure that the fix will stay

Re: [PATCH 1/3] stash: add test for stash create with no files

Hi Junio, I was just too lazy to write a cover letter, and thought these would make sense on their own. I'll make sure to include a cover letter next time. I just ripped them out of my patch series on implementing stash as a builtin[1]. Since I haven't had time, I figured I could at least get

Re: [PATCH] progress: simplify "delayed" progress API

Junio C Hamano writes: > We used to expose the full power of the delayed progress API to the > callers, so that they can specify, not just the message to show and > expected total amount of work that is used to compute the percentage > of work performed so far, the

Re: [PATCH 1/3] stash: add test for stash create with no files

I see three patches that add tests, but it is hard to judge them without any explanation on what the point of them are. Are you documenting an existing breakage? Are you extending test coverage for some breakage we recently fixed without adding tests to ensure that the fix will stay unbroken?

[PATCH 1/2] 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 0/2] 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. Here is a pair of patches that attempt to improve the situation. Junio C Hamano (2): rerere: represent time duration in timestamp_t internally

[PATCH 2/2] 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 3/3] stash: add test for stashing in a detached state

All that we are really testing here is that the message is correct when we are not on any branch. All other functionality is already tested elsewhere. Signed-off-by: Joel Teichroeb --- t/t3903-stash.sh | 12 1 file changed, 12 insertions(+) diff --git

[PATCH 1/3] stash: add test for stash create with no files

Ensure the command suceeds and outputs nothing Signed-off-by: Joel Teichroeb --- t/t3903-stash.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 4046817d70..f0708ced27 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh

[PATCH 2/3] stash: Add a test for when apply fails during stash branch

If the return value of merge recursive is not checked, the stash could end up being dropped even though it was not applied properly Signed-off-by: Joel Teichroeb --- t/t3903-stash.sh | 14 ++ 1 file changed, 14 insertions(+) diff --git a/t/t3903-stash.sh

Re: Please fix the useless email prompts

Why you can't just set username as name and username@hostname as mail? You'll do it once and it will be preserved for future. If you use various accounts for testing, use --system flag for config to store the values in /etc. If you don't want to modify the environment, use --local (or no flag) to

SMTP FOR SALE

FRESH SMTP FOR SALE AT $1.25 PER ONE(1) SMTP LOGIN THAT HAS THE CAPACITY TO SEND OUT 10,000 EMAILS AT A GO. PLS DO NOTE THE LEAST PURCHASE ORDER IS 20 SMTP LOGINS(1 PACK) AND ABOVE AT AN ACCUMALTED COST OF $25. * BEST USED WITH TURBO MAILER. * ONE(1) SMTP LOGIN CAN ALSO BE GIVEN OUT TO FIRST

Re: Submodule regression in 2.14?

> On 18 Aug 2017, at 19:16, Stefan Beller wrote: > >> In the past "submodule..update=none" was an easy way >> to selectively disable certain Submodules. >> >> How would I do this with Git 2.14? > >submodule..active = false That's what I thought after your first

Re: Please fix the useless email prompts

On Sat, Aug 19, 2017 at 12:36 PM, Junio C Hamano wrote: > Jeffrey Walton writes: > >> Is it possible to fix the issue shown below? >> >> I'm on a test machine. All I do is update to the latest code, build >> the library and run the self tests. >> >> The

Re: [PATCH 4/4] archive: queue directories for all types of pathspecs

René Scharfe writes: > No, it's "archive empty subtree by direct pathspec" that's broken. Gah! > >> omitting the empty directory from the archive. Sorry for missing that! >> >> This is kind of a bonus patch, so please discard it for now; the first >> three are OK IMHO. Ah, our

[PATCH] progress: simplify "delayed" progress API

We used to expose the full power of the delayed progress API to the callers, so that they can specify, not just the message to show and expected total amount of work that is used to compute the percentage of work performed so far, the percent-threshold parameter P and the delay-seconds parameter

Re: [PATCH 4/4] archive: queue directories for all types of pathspecs

Am 19.08.2017 um 18:53 schrieb René Scharfe: > Am 19.08.2017 um 07:33 schrieb René Scharfe: >> When read_tree_recursive() encounters a directory excluded by a pathspec >> then it enters it anyway because it might contain included entries. It >> calls the callback function before it is able to

Re: [PATCH 4/4] archive: queue directories for all types of pathspecs

René Scharfe writes: > When read_tree_recursive() encounters a directory excluded by a pathspec > then it enters it anyway because it might contain included entries. It > calls the callback function before it is able to decide if the directory > is actually needed. > > For that

Re: [PATCH 4/4] archive: queue directories for all types of pathspecs

Am 19.08.2017 um 07:33 schrieb René Scharfe: > When read_tree_recursive() encounters a directory excluded by a pathspec > then it enters it anyway because it might contain included entries. It > calls the callback function before it is able to decide if the directory > is actually needed. > >

Re: [PATCH] commit: remove unused inline function single_parent()

Thanks.

Re: Please fix the useless email prompts

Jeffrey Walton writes: > Is it possible to fix the issue shown below? > > I'm on a test machine. All I do is update to the latest code, build > the library and run the self tests. > > The test user account does not have a name and does not have an email > address. There's

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

Torsten Bögershausen writes: >> * tb/apply-with-crlf (2017-08-17) 3 commits >> - SQUASH??? >> - apply: file commited with CRLF should roundtrip diff and apply >> - convert: add SAFE_CRLF_KEEP_CRLF >> (this branch is tangled with jc/apply-with-crlf.) >> >> Will merge to

Please fix the useless email prompts

Is it possible to fix the issue shown below? I'm on a test machine. All I do is update to the latest code, build the library and run the self tests. The test user account does not have a name and does not have an email address. There's nothing to provide. There's no reason to break my workflows

Re: git svn show-externals output format

> My practical solution was to skip the man in the middle and ask the SVN > server directly for the property values Thanks, that helped a lot! Alex Beste Grüße, Alex -- Alexander Groß http://therightstuff.de/ On Sat, Aug 19, 2017 at 12:14 PM, Andreas Heiduk wrote: > Am

git-svn: Handling of branches created from subfolders

Hello, I’m trying to do a one-time conversion of a large SVN repository to git using git-svn. Unfortunately, this SVN repo contains a substantial amount of non-standard branches created from a subfolder of trunk/. Users that only need to work on part of the code inside the repo usually create

[PATCH v4 2/2] File commited with CRLF should roundtrip diff and apply

From: Torsten Bögershausen When a file had been commited with CRLF but now .gitattributes say "* text=auto" (or core.autocrlf is true), the following does not roundtrip, `git apply` fails: printf "Added line\r\n" >>file && git diff >patch && git checkout -- . && git apply patch

[PATCH v4 1/2] convert: Add SAFE_CRLF_KEEP_CRLF

From: Torsten Bögershausen When convert_to_git() is called, the caller may want to keep CRLF to be kept as CRLF (and not converted into LF). This will be used in the next commit, when apply works with files that have CRLF and patches are applied onto these files. Add the new

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

> * tb/apply-with-crlf (2017-08-17) 3 commits > - SQUASH??? > - apply: file commited with CRLF should roundtrip diff and apply > - convert: add SAFE_CRLF_KEEP_CRLF > (this branch is tangled with jc/apply-with-crlf.) > > "git apply" that is used as a better "patch -p1" failed to apply a >

Re: git svn show-externals output format

Am 19.08.2017 um 10:24 schrieb Alexander Groß: > $ git svn show-externals > > # /trunk/ > /trunk/https://svn.code.sf.net/p/gc-webdav/svn webdav > /trunk/https://svn.code.sf.net/p/gc-webdav/svn@1 webdav-at-revision This is the (bugged) output of `git svn show-externals` for "new style"

git svn show-externals output format

Hi all, I am playing with svn-to-git conversion and wanted to have a look at the svn:externals of a test SVN repository. $ git svn clone svn://svn.code.sf.net/p/svn-to-git/code/ svn-to-git-code The SVN repo in HEAD revision contains three externals: $ cd svn-to-git-code $ git svn

[PATCH] commit: remove unused inline function single_parent()

53b2c823f6 (revision walker: mini clean-up) added the function in 2007, but it was never used, so we should be able to get rid of it now. Signed-off-by: Rene Scharfe --- commit.h | 5 - 1 file changed, 5 deletions(-) diff --git a/commit.h b/commit.h index

Re: [PATCH v3 00/23] Move exported packfile funcs to its own file

Jonathan Tan writes: >> You'd need to double check, but I think the topics that cause >> trouble are rs/find-apck-entry-bisection and jk/drop-sha1-entry-pos; >> you can start from v2.14.1 and merge these topics on top and then >> build your change on top. That would

Re: Submodule regression in 2.14?

Stefan Beller writes: > Jonathan brought up the following very long term vision: > Eventually the everyday git commands do not treat submodules > any special than trees, even the submodules git directory > may be non existent (everything is absorbed into the superproject); >

Re: [PATCH] pull: respect submodule update configuration

Stefan Beller writes: > From: Lars Schneider > > Do not override the submodule configuration in the call to update > the submodules, but give a weaker default. > > Reported-by: Lars Schneider > Signed-off-by: Stefan Beller

Re: [PATCH] pull: respect submodule update configuration

Stefan Beller writes: > On Fri, Aug 18, 2017 at 3:04 PM, Stefan Beller wrote: >> From: Lars Schneider > > eh, that is what I get for amending to Lars patch. Sorry, I do not understand this remark. If you started from a patch