Re: Tracking down a segfault in delta_base_cache

2016-09-15 Thread Jonathon Mah
> On 2016-09-14, at 17:56, Jeff King wrote: > > On Wed, Sep 14, 2016 at 05:42:29PM -0700, Jonathon Mah wrote: > >> Hi git, I've been seeing git segfault over the past few days. I'm on Mac OS >> X 10.12, 64-bit, compiling with clang (Apple LLVM

Tracking down a segfault in delta_base_cache

2016-09-14 Thread Jonathon Mah
Hi git, I've been seeing git segfault over the past few days. I'm on Mac OS X 10.12, 64-bit, compiling with clang (Apple LLVM version 8.0.0 (clang-800.0.40)). I first noticed it during a checkout, then also during `log -u`. I'm still debugging, but wanted to give a heads-up in case anyone else i

RFC: Renaming "git rebase --onto"

2015-03-30 Thread Jonathon Mah
# “Rebase HEAD onto new-base, excluding commit old-base (and its parents)" In all cases this would change the order of the arguments compared to --onto, making it more consistent with the no-option rebase. What do others think? Is my view of “onto” common or unusual? Jonathon Mah

[PATCHv5] sha1_file: fix iterating loose alternate objects

2015-02-02 Thread Jonathon Mah
ng the bug in some common cases. Additionally the descendent for_each_file_in_obj_subdir function swallows ENOENT, so an error only shows if the alternate's path was last filled with a valid object (where statting /path/to/existing/00/0bjectfile/00 fails). Signed-off-by: Jonathon Mah --- Simplified t

[PATCHv4] sha1_file: fix iterating loose alternate objects

2015-02-02 Thread Jonathon Mah
ng the bug in some common cases. Additionally the descendent for_each_file_in_obj_subdir function swallows ENOENT, so an error only shows if the alternate's path was last filled with a valid object (where statting /path/to/existing/00/0bjectfile/00 fails). Signed-off-by: Jonathon Mah --- Squashed te

[PATCHv3 2/2] sha1_file: fix iterating loose alternate objects

2015-02-02 Thread Jonathon Mah
ng the bug in some common cases. Additionally the descendent for_each_file_in_obj_subdir function swallows ENOENT, so an error only shows if the alternate's path was last filled with a valid object (where statting /path/to/existing/00/0bjectfile/00 fails). Signed-off-by: Jonathon Mah --- sha1_fil

[PATCHv3 1/2] t5304-prune: demonstrate bug in pruning alternates

2015-02-02 Thread Jonathon Mah
Signed-off-by: Jonathon Mah --- Messed up the v2 patch, sorry. t/t5304-prune.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index e32e46d..e825be7 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -253,4 +253,17

Re: [PATCH 2/2] sha1_file: fix iterating loose alternate objects

2015-02-02 Thread Jonathon Mah
e it's more robust to use alt->base consistently inside each function, rather than have this a more fragile special case to save allocation of only one path. Updated the test patch. Jonathon Mah m...@jonathonmah.com -- To unsubscribe from this list: send the line "unsubscribe g

[PATCHv2 2/2] sha1_file: fix iterating loose alternate objects

2015-02-02 Thread Jonathon Mah
ng the bug in some common cases. Additionally the descendent for_each_file_in_obj_subdir function swallows ENOENT, so an error only shows if the alternate's path was last filled with a valid object (where statting /path/to/existing/00/0bjectfile/00 fails). Signed-off-by: Jonathon Mah --- sha1_fil

[PATCHv2 1/2] t5304-prune: demonstrate bug in pruning alternates

2015-02-02 Thread Jonathon Mah
Signed-off-by: Jonathon Mah --- Adjust prune test directly, much nicer. t/t5304-prune.sh | 13 + t/t5710-info-alternate.sh | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index e32e46d..e825be7 100755 --- a/t

[PATCH 2/2] sha1_file: fix iterating loose alternate objects

2015-02-01 Thread Jonathon Mah
ng the bug in some common cases. Additionally the descendent for_each_file_in_obj_subdir function swallows ENOENT, so an error only shows if the alternate's path was last filled with a valid object (where statting /path/to/existing/00/0bjectfile/00 fails). Signed-off-by: Jonathon Mah --- sha1_fil

[PATCH 1/2] t5710-info-alternate: demonstrate bug in unpacked pruning

2015-02-01 Thread Jonathon Mah
Signed-off-by: Jonathon Mah --- t/t5710-info-alternate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5710-info-alternate.sh b/t/t5710-info-alternate.sh index 5a6e49d..d82844a 100755 --- a/t/t5710-info-alternate.sh +++ b/t/t5710-info-alternate.sh @@ -18,6 +18,7

Re: [PATCH 2/2] grep: use slash for path delimiter, not colon

2013-09-22 Thread Jonathon Mah
he results, and then "git-show"ing interesting files. Having a real object name in the grep output allows copy-and-paste of the object path. Jonathon Mah m...@jonathonmah.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: git tag usability issue: Lightweight vs Annotated confusion for the end user (ex. git describe default)

2013-07-24 Thread Jonathon Mah
nt behavior with just a little digging. Jonathon Mah m...@jonathonmah.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v2 2/2] Documentation: fix git-prune example usage

2013-07-18 Thread Jonathon Mah
Signed-off-by: Jonathon Mah --- Documentation/git-prune.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt index 80d01b0..bf82410 100644 --- a/Documentation/git-prune.txt +++ b/Documentation/git-prune.txt @@ -59,7

[PATCH v2 1/2] Documentation: remove --prune from pack-refs examples

2013-07-18 Thread Jonathon Mah
The option has been the default for a while, and doesn't otherwise appear in the page. Signed-off-by: Jonathon Mah --- Forgot sign-off in v1. Also, I was unsure whether to rewrap the lines (and if so, to how many columns); erred on the side of minimal changes. Documentation/git-pack-ref

[PATCH 1/2] Documentation: remove --prune from pack-refs examples

2013-07-18 Thread Jonathon Mah
y the currently active branch heads will become unpacked, -- 1.8.3.3.754.g9c3c367 Jonathon Mah m...@jonathonmah.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kerne

[PATCH 2/2] Documentation: fix git-prune example usage

2013-07-18 Thread Jonathon Mah
repository via its `.git/objects/info/alternates`: -$ git prune $(cd ../another && $(git rev-parse --all)) +$ git prune $(cd ../another && git rev-parse --all) Notes -- 1.8.3.3.754.g9c3c367 Jonathon Mah m...@jonathonmah.com -- To unsubscribe from

[PATCH] branch: give better message when no names specified for rename

2013-03-30 Thread Jonathon Mah
Signed-off-by: Jonathon Mah --- The previous message was incorrect when not enough arguments were specified: $ git branch -m fatal: too many branches for a rename operation I changed to "branch name required" instead of "new branch name required" in th

Re: segmentation fault (nullpointer) with git log --submodule -p

2013-01-24 Thread Jonathon Mah
ill see NULL despite it being in a 'protected scope'. Are the objections to using a reference count? Jonathon Mah m...@jonathonmah.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] parse_object: clear "parsed" when freeing buffers

2013-01-24 Thread Jonathon Mah
On 2013-01-23, at 23:07, Jeff King wrote: > On Wed, Jan 23, 2013 at 01:25:04PM -0800, Jonathon Mah wrote: > >> Several areas of code would free buffers for object structs that >> contained them ("struct tree" and "struct commit"), but without clearing &g

Re: [PATCH] parse_object: clear "parsed" when freeing buffers

2013-01-24 Thread Jonathon Mah
On 2013-01-23, at 23:07, Jeff King wrote: > On Wed, Jan 23, 2013 at 01:25:04PM -0800, Jonathon Mah wrote: > >> Several areas of code would free buffers for object structs that >> contained them ("struct tree" and "struct commit"), but without clearing &g

Re: [PATCH] parse_object: clear "parsed" when freeing buffers

2013-01-23 Thread Jonathon Mah
[Adding Jeff King to CC; I meant to copy you in the original but forgot, sorry] On 2013-01-23, at 14:19, Junio C Hamano wrote: > Jonathon Mah writes: > >> Add a new function "free_object_buffer", which marks the object as >> un-parsed and frees the buffer. Only tr

[PATCH] parse_object: clear "parsed" when freeing buffers

2013-01-23 Thread Jonathon Mah
cache ref was evaluated first by cmd_log_walk, a subsequent notes_cache_match_validity call would dereference NULL. Signed-off-by: Jonathon Mah --- I found an old email where Jeff noted that this would be bad (yet the buffer manipulation remained). <http://permalink.gmane.org/gmane.comp.vers

Re: Revert option for git add --patch

2012-11-08 Thread Jonathon Mah
someone does want to add this feature to "git add -p" (or named differently), I'll add a request for another letter (perhaps '!') to edit the hunk in the working tree. Jonathon Mah m...@jonathonmah.com -- To unsubscribe from this list: send the line &q

Bug: write-tree corrupts intent-to-add index state

2012-11-06 Thread Jonathon Mah
git add -N dir/baz && + cat >expect <<-\EOF && + AM dir/baz + AM foo + EOF + git status --untracked-files=no --porcelain >actual && + test_cmp actual expect && + git write-tree && + git status --un