Re: [bug] Possible Windows 'git mv' bug

On Sun, Jan 31, 2016 at 8:50 AM, Johannes Sixt wrote: > Am 31.01.2016 um 15:03 schrieb Aaron Gray: >> >> Hi, >> >> I think I have found a possible difference in behaviour between >> Windows git commandline distro and Linux git >> >> basically If I do a :- >> >> git mv logger.h

[PATCH 2/3] t5304: Add test for .bitmap garbage files

When checking for pack garbage, .bitmap files are now detected as garbage when not associated with another .pack/.idx file. Signed-off-by: Doug Kelly <dougk@gmail.com> --- t/t5304-prune.sh | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/t

[PATCH 3/3] gc: Clean garbage .bitmap files from pack dir

Similar to cleaning up excess .idx files, clean any garbage .bitmap files that are not otherwise associated with any .idx/.pack files. Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/gc.c | 12 ++-- t/t5304-prune.sh | 2 +- 2 files changed, 11 insertions(+), 3 del

[PATCH v3 0/3] prepare_packed_git(): find more garbage

, and the second half would also match. Doug Kelly (3): prepare_packed_git(): find more garbage t5304: Add test for .bitmap garbage files gc: Clean garbage .bitmap files from pack dir builtin/count-objects.c | 16 ++-- builtin/gc.c| 12 ++-- cache.h

[PATCH 1/3] prepare_packed_git(): find more garbage

.bitmap and .keep files without .idx/.pack don't make much sense, so make sure these are reported as garbage as well. At the same time, refactoring report_garbage to handle extra bits. Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/count-objects.c | 16 ++-- c

[PATCH 1/3] prepare_packed_git(): find more garbage

.bitmap and .keep files without .idx/.pack don't make much sense, so make sure these are reported as garbage as well. At the same time, refactoring report_garbage to handle extra bits. Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/count-objects.c | 16 ++-- c

Re: [PATCH 1/3] prepare_packed_git(): find more garbage

for catching that, Stefan! On Wed, Nov 25, 2015 at 12:43 PM, Stefan Beller <sbel...@google.com> wrote: > On Fri, Nov 13, 2015 at 4:46 PM, Doug Kelly <dougk@gmail.com> wrote: >> return "no corresponding .idx"; >> - case PACKDIR_FI

[PATCH 1/3] prepare_packed_git(): find more garbage

.bitmap and .keep files without .idx/.pack don't make much sense, so make sure these are reported as garbage as well. At the same time, refactoring report_garbage to handle extra bits. Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/count-objects.c | 16 ++-- c

[PATCH 0/3] Add cleanup for garbage .bitmap files

Following Peff and Junio's comments when adding support for cleaning garbage .idx files left in the pack directory, this patch introduces the ability to detect garbage .bitmap files. Additionally, .keep files are still reported, but no action is taken to clean them. This includes some refactor

[PATCH 3/3] gc: Clean garbage .bitmap files from pack dir

Similar to cleaning up excess .idx files, clean any garbage .bitmap files that are not otherwise associated with any .idx/.pack files. Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/gc.c | 12 ++-- t/t5304-prune.sh | 2 +- 2 files changed, 11 insertions(+), 3 del

[PATCH 2/3] t5304: Add test for .bitmap garbage files

When checking for pack garbage, .bitmap files are now detected as garbage when not associated with another .pack/.idx file. Signed-off-by: Doug Kelly <dougk@gmail.com> --- t/t5304-prune.sh | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/t

[PATCH 3/3] gc: Clean garbage .bitmap files from pack dir

Similar to cleaning up excess .idx files, clean any garbage .bitmap files that are not otherwise associated with any .idx/.pack files. Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/gc.c | 12 ++-- t/t5304-prune.sh | 2 +- 2 files changed, 11 insertions(+), 3 del

[PATCH 2/3] t5304: Add test for .bitmap garbage files

When checking for pack garbage, .bitmap files are now detected as garbage when not associated with another .pack/.idx file. Signed-off-by: Doug Kelly <dougk@gmail.com> --- t/t5304-prune.sh | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/t

[PATCH 1/3] prepare_packed_git(): find more garbage

.bitmap and .keep files without .idx/.pack don't make much sense, so make sure these are reported as garbage as well. At the same time, refactoring report_garbage to handle extra bits. Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/count-objects.c | 16 ++-- c

Re: [PATCH 1/3] prepare_packed_git(): find more garbage

Yes, without a doubt. I think I'm blaming this one on being late on a Friday afternoon, and really not thinking out the logic clearly. :) On Fri, Nov 13, 2015 at 4:43 PM, Stefan Beller wrote: >> + else if (seen_bits & PACKDIR_FILE_PACK && seen_bits ^ >>

Re: [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory

On Wed, Nov 4, 2015 at 1:35 PM, Junio C Hamano <gits...@pobox.com> wrote: > Doug Kelly <dougk@gmail.com> writes: > >> I think the patches I sent (a bit prematurely) address the >> remaining comments... I did find there was a relevant test in >> t5304 alread

Re: [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory

On Wed, Nov 4, 2015 at 2:02 PM, Jeff King <p...@peff.net> wrote: > On Wed, Nov 04, 2015 at 01:56:38PM -0600, Doug Kelly wrote: > >> > I did wonder if we want to say anything about .bitmap files, though. >> > If there is one without matching .idx and .pack, shouldn

[PATCH 1/3] prepare_packed_git(): refactor garbage reporting in pack directory

gits...@pobox.com> Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/count-objects.c | 26 -- cache.h | 7 +-- path.c | 2 +- sha1_file.c | 23 ++- 4 files changed, 36 insertions(+),

Re: [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory

On Wed, Oct 28, 2015 at 5:43 PM, Doug Kelly <dougk@gmail.com> wrote: > On Wed, Oct 28, 2015 at 12:48 PM, Junio C Hamano <gits...@pobox.com> wrote: >> Junio C Hamano <gits...@pobox.com> writes: >> >>> Eric Sunshine <sunsh...@sunshineco.com> wr

[PATCH 2/3] t5304: Add test for cleaning pack garbage

. Signed-off-by: Doug Kelly <dougk@gmail.com> --- t/t5304-prune.sh | 21 + 1 file changed, 21 insertions(+) diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 023d7c6..0297515 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -219,6 +219,7 @@ test_expect_s

[PATCH 3/3] gc: Remove garbage .idx files from pack dir

Add a custom report_garbage handler to collect and remove garbage .idx files from the pack directory. Signed-off-by: Doug Kelly <dougk@gmail.com> --- builtin/gc.c | 20 t/t5304-prune.sh | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/b

Re: [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory

On Wed, Oct 28, 2015 at 12:48 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Eric Sunshine writes: >> -static void real_report_garbage(const char *desc, const char *path) +const char *bits_to_msg(unsigned

[PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory

From: Junio C Hamano gits...@pobox.com The hook to report garbage files in $GIT_OBJECT_DIRECTORY/pack/ could be generic but is too specific to count-object's needs. Move the part to produce human-readable messages to count-objects, and refine the interface to callback with the bits with values

[PATCH 2/2] gc: Remove garbage .idx files from pack dir

Add a custom report_garbage handler to collect and remove garbage .idx files from the pack directory. Signed-off-by: Doug Kelly dougk@gmail.com --- builtin/gc.c | 21 + 1 file changed, 21 insertions(+) diff --git a/builtin/gc.c b/builtin/gc.c index bcc75d9..8352616

Re: Question: .idx without .pack causes performance issues?

On Mon, Aug 3, 2015 at 8:27 PM, Junio C Hamano gits...@pobox.com wrote: Doug Kelly dougk@gmail.com writes: Here's a change to prune.c that at least addresses the issue by removing .idx files without an associated pack, but it's by no means pretty. If anyone has any feedback before I

Re: Question: .idx without .pack causes performance issues?

On Tue, Jul 21, 2015 at 4:37 PM, Doug Kelly dougk@gmail.com wrote: On Tue, Jul 21, 2015 at 3:48 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: While I still think that it is more important to prevent such a situation from occurring in the first place

Question: .idx without .pack causes performance issues?

Hi all, I just wanted to relay an issue we've seen before at my day job (and it just recently cropped up again). When moving users from Git for Windows 1.8.3 to 1.9.5, we found a few users started having operations take an excruciatingly long amount of time. At some point, we traced the issue

Re: Question: .idx without .pack causes performance issues?

On Tue, Jul 21, 2015 at 1:57 PM, Junio C Hamano gits...@pobox.com wrote: I wouldn't be surprised if such a configuration to have leftover .idx files that lack .pack affected performance, but I think you really have to work on getting into such a situation (unless your operating system is very

Re: Question: .idx without .pack causes performance issues?

On Tue, Jul 21, 2015 at 3:48 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: While I still think that it is more important to prevent such a situation from occurring in the first place, ignoring .idx that lack corresponding .pack should be fairly simple,

Re: Windows path limites, was Re: [PATCH v5 2/5] setup: sanity check file size in read_gitfile_gently

On Tue, Apr 28, 2015 at 2:23 AM Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Peff, On 2015-04-28 08:02, Jeff King wrote: My understanding is that PATH_MAX is set absurdly low on Windows systems (and doesn't actually represent the real limit of a path!). Well, yes and no.

Re: submodule.$name.url is ignored during submodule update

On Thu, Mar 19, 2015 at 4:27 AM, Dmitry Neverov dmitry.neve...@gmail.com wrote: Hi, I've noticed that the 'submodule.$name.url' config parameter from the main repository is ignored when a submodule needs to be updated, the submodule's 'remote.origin.url' is used instead. Is there any way to

Re: Git with Lader logic

On Wed, Mar 18, 2015 at 2:53 PM, Randall S. Becker rsbec...@nexbridge.com wrote: On March 17, 2015 7:34 PM, Bharat Suvarna wrote: I am trying to find a way of using version control on PLC programmers like Allen Bradley PLC. I can't find a way of this. Could you please give me an idea if it

Re: Need help deciding between subtree and submodule

On Wed, Mar 18, 2015 at 3:20 AM, Chris Packham judge.pack...@gmail.com wrote: My $0.02 based on $dayjob (disclaimer I've never used subtree) On Wed, Mar 18, 2015 at 11:14 AM, Robert Dailey rcdailey.li...@gmail.com wrote: At my workplace, the team is using Atlassian Stash + git We have a

[PATCH v5 1/2] t4255: test am submodule with diff.submodule

and ensure without diff.submodule this works. Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Doug Kelly dougk@gmail.com --- Added a comment for why test_might_fail is used to abort merges in progress. t/t4255-am-submodule.sh | 72

[PATCH v5 2/2] format-patch: ignore diff.submodule setting

diff.submodule when set to log produces output which git-am cannot handle. Ignore this setting when generating patch output. Signed-off-by: Doug Kelly dougk@gmail.com --- builtin/log.c | 2 +- t/t4255-am-submodule.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff

[PATCH v4 1/2] t4255: test am submodule with diff.submodule

and ensure without diff.submodule this works. Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Doug Kelly dougk@gmail.com --- Updated to remove test_ticks and clean the commit message. t/t4255-am-submodule.sh | 70

[PATCH v4 2/2] format-patch: ignore diff.submodule setting

diff.submodule when set to log produces output which git-am cannot handle. Ignore this setting when generating patch output. Signed-off-by: Doug Kelly dougk@gmail.com --- builtin/log.c | 2 +- t/t4255-am-submodule.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff

[PATCH v3 2/2] format-patch: ignore diff.submodule setting

diff.submodule when set to log produces output which git-am cannot handle. Ignore this setting when generating patch output. Signed-off-by: Doug Kelly dougk@gmail.com --- builtin/log.c | 2 +- t/t4255-am-submodule.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff

[PATCH v3 1/2] t4255: test am submodule with diff.submodule

and ensure without diff.submodule this works. Signed-off-by: Doug Kelly dougk@gmail.com Thanks-to: Eric Sunshine sunsh...@sunshineco.com Thanks-to: Junio C Hamano gits...@pobox.com --- Updated with Eric Sunshine's comments and changes to reduce complexity, and also changed to include Junio's

Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

On Mon, Dec 29, 2014 at 9:42 AM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: + (git am --abort || true) Why (x || y)? Is 'x' so unreliable that we do not know how should exit? Should this be test_must_fail git am --abort? Updated to

Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

On Sat, Dec 27, 2014 at 6:37 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Dec 26, 2014 at 6:11 PM, Doug Kelly dougk@gmail.com wrote: git am will break when using diff.submodule=log; add some test cases to illustrate this breakage as simply as possible. There are currently

[PATCH v2 1/2] t4255: test am submodule with diff.submodule

and ensure without diff.submodule this works. Signed-off-by: Doug Kelly dougk@gmail.com --- t/t4255-am-submodule.sh | 84 + 1 file changed, 84 insertions(+) diff --git a/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh index 8bde7db..a2dc083

[PATCH v2 2/2] format-patch: ignore diff.submodule setting

diff.submodule when set to log produces output which git-am cannot handle. Ignore this setting when generating patch output. Signed-off-by: Doug Kelly dougk@gmail.com --- builtin/log.c | 2 +- t/t4255-am-submodule.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff

[PATCH 0/2] Fix issue with format-patch and diff.submodule

is appreciated. Doug Kelly (2): t4255: test am submodule with diff.submodule format-patch: ignore diff.submodule setting builtin/log.c | 2 +- t/t4255-am-submodule.sh | 83 + 2 files changed, 84 insertions(+), 1 deletion(-) -- 2.0.5

[PATCH 2/2] format-patch: ignore diff.submodule setting

diff.submodule when set to log produces output which git-am cannot handle. Ignore this setting when generating patch output. Signed-off-by: Doug Kelly dougk@gmail.com --- builtin/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index

[PATCH 1/2] t4255: test am submodule with diff.submodule

and ensure without diff.submodule this works. Signed-off-by: Doug Kelly dougk@gmail.com --- t/t4255-am-submodule.sh | 83 + 1 file changed, 83 insertions(+) diff --git a/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh index 8bde7db..d9a1d79