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 allow you to start cooking
>>
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 6d857f06c1..1283d2a51f 100644
--- a
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 show-externals
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" svn:extern
> * 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
> ta
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 value "SAFE_CRLF_KE
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
Before applying
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 s
> 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 19.08.2017 um 10:24 sc
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
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 'next' after squashin
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 nothing to provide.
>
>
Thanks.
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.
>
> For
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 reason git archiv
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 deci
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 N.
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 mails crossed.
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 test user account does not have a name and
> 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 response. However,
this tes
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 T
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 p
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 a/t/t3903-stash.sh b/t/t3903-s
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
@@ -444,6 +444,14 @@
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 b/t/t3903-stash.sh
index f07
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 d
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
rerer
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 t
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? Ar
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 percent-threshold parameter P a
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
the
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 unbroken? Are you planning to touch
>>
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 appreciat
Junio C Hamano writes:
> I have to say that this was a painful topic to integrate.
>
> As you may know, the mk/use-size-t-in-zlib topic is being retracted
> and getting rerolled as a larger size_t series, most of which still
> needs help in reviewing.
>
> The jt/sha1-file-cleanup topic is the onl
34 matches
Mail list logo
