Signed-off-by: Carlo Marcelo Arenas Belón
Signed-off-by: Johan Herland
> ---
> builtin/notes.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/builtin/notes.c b/builtin/notes.c
> index c05cd004ab..68062f7475 100644
> --- a/builtin/notes.c
> +++
On Tue, Nov 14, 2017 at 5:17 PM, Todd Zullinger wrote:
> All other error messages from notes use stderr. Do the same when
> alerting users of an unresolved notes merge.
>
> Fix the output redirection in t3310 and t3320 as well. Previously, the
> tests directed output to a file,
ored, I prepared a commit with these changes and confirmed the
> test suite passes, in case we get an ACK from Johan.
ACK :-)
Error messages should go to stderr, and redirection in the tests
should be fixed.
...Johan
--
Johan Herland, <jo...@herland.net>
www.herland.net
On Sat, Aug 26, 2017 at 10:28 AM, Michael Haggerty wrote:
[...]
> plenty that could be cleaned up in the area:
>
> * Make macro `GIT_NIBBLE` safer by adding some parentheses
> * Remove some dead code
> * Fix some memory leaks
> * Fix some obsolete and incorrect comments
> *
p && (GET_PTR_TYPE(p) == PTR_TYPE_INTERNAL))
+ return -2; /* Cannot move int_nodes within the tree. */
for a more optimal handling of subtree nodes in this scenario.
Have fun! :)
...Johan
> /* replace tree with p in parent[index] */
> parent->a[index] = p;
> free(tree);
> --
> 2.12.1.dirty
>
--
Johan Herland, <jo...@herland.net>
www.herland.net
this.
>From git-config(1):
branch..description
Branch description, can be edited with git branch
--edit-description. Branch description is automatically added
in the format-patch cover letter or request-pull summary.
...Johan
--
Johan Herland, <jo...@herland.net>
www.herland.net
t behaviour happens when using the filemodify command to import
> subdirectories.
>
> This change makes do_change_note_fanount call load_tree() whenever the
> tree_entry it is given has no tree loaded, making all cases handled
> equally.
>
> Signed-off-by: Mike Hommey <m...@glandium.org>
Acked-by: Johan Herland <jo...@herland.net>
t does. This patch does the latter.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>
Acked-by: Johan Herland <jo...@herland.net>
--
Johan Herland, <jo...@herland.net>
www.herland.net
On Mon, Apr 4, 2016 at 9:46 AM, Sebastian Schuberth
<sschube...@gmail.com> wrote:
> On Fri, Apr 1, 2016 at 2:16 PM, Johan Herland <jo...@herland.net> wrote:
>>> 3) Recursively list all blobs / trees (git-ls-tree) and look whether an
>>> object's hash is conati
uot;)
if test "$type" != "commit"
then
echo "$annotated_obj: $type"
fi
done
done
Can probably be made even faster by using the --batch option to cat-file...
...Johan
--
Johan Herland, <jo...@herland.net>
www.herland.net
--
To unsubs
On Fri, Apr 1, 2016 at 2:16 PM, Johan Herland <jo...@herland.net> wrote:
> for notes_ref in $(git for-each-ref refs/notes | cut -c 49-)
> do
> echo "--- $notes_ref ---"
> for annotated_obj in $(git notes --ref=$notes_ref list | cut -c 41-)
> do
&
refs (e.g.
try "git log heads/master" or "git log tags/v2.6.3" in git.git).
...Johan
--
Johan Herland, <jo...@herland.net>
www.herland.net
--
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
read-only_ operations - on notes trees outside
refs/notes/. I believe this should also become possible, although I
haven't thoroughly examined all implications.
...Johan
--
Johan Herland, <jo...@herland.net>
www.herland.net
--
To unsubscribe from this list: send the line &
On Mon, Nov 16, 2015 at 12:23 AM, Jacob Keller <jacob.kel...@gmail.com> wrote:
> On Sun, Nov 15, 2015 at 2:14 PM, Johan Herland <jo...@herland.net> wrote:
>> A related topic that has been discussed (although I cannot remember if
>> any conclusion was reached) is
Herland jo...@herland.net
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
/changed again.
...Johan
Add tests for the new synonyms.
Teaching rewrite how to understand merge terminology is left for a
following patch.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line
, the series (except possibly #4/#5, see separate discussion)
looks good to me.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
::
Which ref (or refs, if a glob or specified more than once), in
addition to the default set by `core.notesRef` or
[...]
Otherwise, looks good to me.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git
refs/notes/, e.g. for
configuring
the merge strategy for refs/notes/commits, notes.commits.mergeStrategy must
be set.
Otherwise, the patch looks good to me.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body
.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
: Split notes ref DWIMmery into a
separate function)
--
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
--
Johan Herland, jo...@herland.net
www.herland.net
/remotes/$O in
place, you're AFAICS only adding functionality, not (visibly) changing
existing behavior.
BTW, thanks for resurrecting this topic!
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
On Wed, Aug 12, 2015 at 4:26 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
I know that we don't yet have a proper place to put remote notes refs,
but the ref in notes.ref.merge _must_ be a local notes ref (you even
use the localref notation
...@gmail.com
Reviewed-by: Johan Herland jo...@herland.net
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
On Tue, Aug 11, 2015 at 10:57 PM, Jacob Keller jacob.e.kel...@intel.com wrote:
From: Jacob Keller jacob.kel...@gmail.com
Add new tests to ensure that --commit, --abort, and --strategy are
mutually exclusive.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
Reviewed-by: Johan Herland jo
Turner dtur...@twopensource.com
Still looks good to me, AFAICS. Feel free to add my Reviewed-by.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
merge strategy: %s, configured_strategy);
} /* else o.strategy = NOTES_MERGE_RESOLVE_MANUAL; */
Otherwise, this patch looks good to me.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
amount of future-
proofing as well.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
://vger.kernel.org/majordomo-info.html
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
, as those do not jump
around quite as much as pu does.
Jacob Keller (2):
notes: document cat_sort_uniq rewriteMode
notes: add notes.merge option to select default strategy
Both patches Acked-by: Johan Herland jo...@herland.net
...Johan
Documentation/config.txt | 11
On Wed, Jul 29, 2015 at 6:37 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
On Wed, Jul 29, 2015 at 7:01 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
I believe it is a bad compromise. It complicates the code
On Wed, Jul 29, 2015 at 7:58 PM, David Turner dtur...@twopensource.com wrote:
+ specially by git. Psuedorefs both have names that are all-caps,
s/Psuedo/Pseudo/
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git
On Wed, Jul 29, 2015 at 7:01 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
I believe it is a bad compromise. It complicates the code, and it
provides a concurrent notes merges that is unnecessarily tied to (and
dependent on) worktrees. For example, if I
this language is new to me. My apologies).
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
On Wed, Jul 29, 2015 at 12:12 AM, Junio C Hamano gits...@pobox.com wrote:
David Turner dtur...@twopensource.com writes:
Prevent merges to the same notes branch from different worktrees.
Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
code we use to check that two HEADs in
On Wed, Jul 29, 2015 at 2:56 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Johan Herland jo...@herland.net writes:
Here is where we start to differ. I would say that starting a notes
merge is completely unrelated to your worktree. Consider this:
It sounds like what a notes merge really
are always per _repo_ and never per
_worktree_, so this is all unrelated to the current patch/discussion
AFAICS.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
On Wed, Jul 29, 2015 at 12:52 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
However, in any case, notes merges are always per _repo_ and never per
_worktree_, so this is all unrelated to the current patch/discussion
AFAICS.
Thanks for chiming in, but I
On Wed, Jul 29, 2015 at 2:33 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
Here is where we start to differ. I would say that starting a notes
merge is completely unrelated to your worktree. Consider this:
...
This is not the case for notes merges. If I
unrelated notes merges as a wholly independent, separate topic.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
of tests thrown in there to verify
correctness; e.g. reading notes from refs/notes/commits^{tree} shall
succeed, and trying to write notes to refs/notes/commits^{tree} shall fail.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe
to be used for reads only, or will be updated,
a flag is added.
This has the side effect of enabling the use of committish as notes refs
in commands allowing them, e.g. git log --notes=foo@{1}.
Signed-off-by: Mike Hommey m...@glandium.org
Reviewed-by: Johan Herland jo...@herland.net
...modulo some
/c), so there might be
room for more consolidation/refactoring here...
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
to
find out all the current notes?
Yes. (if not, that's a bug and should be fixed).
...Johan
It looks like it is from the documentation.
Anyway let's add some people in Cc in case they could help.
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send
be copied to the new commit during an ammend/rebase?
It depends. Which notes do you want copied? (i.e. from which notes
ref?) Please have a look at the notes.rewriteRef config option
(documented in the git-config and git-notes manual pages)
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
of iterations. We can bump it into the conditional of
the loop to make this more obvious.
Signed-off-by: Jeff King p...@peff.net
Acked-by: Johan Herland jo...@herland.net
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git
On Sat, Feb 28, 2015 at 2:19 PM, Mårten Kongstad
marten.kongs...@gmail.com wrote:
[...]
Signed-off-by: Mårten Kongstad marten.kongs...@gmail.com
Acked-by: Johan Herland jo...@herland.net
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line
it.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
Acked-by: Johan Herland jo...@herland.net
---
t/t3301-notes.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 245406a..433f925 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
failed to work out
of the box for me.
Thanks a lot for any pointer.
--
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
--
Johan Herland, jo...@herland.net
', to explicitly disable the
safety checks for experimental use.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
(This addresses some smaller specific questions from Kyle, and is not an
attempt to take focus away from the main direction of this thread)
On Jan 6, 2015 1:27 PM, Kyle J. McKay mack...@gmail.com wrote:
On Jan 6, 2015, at 02:20, Junio C Hamano wrote:
[...]
At the point the dropped line runs,
at the top of fast-import.c needs corresponding updates.
Signed-off-by: Johan Herland jo...@herland.net
---
fast-import.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index b6df00b..4ef7a95 100644
--- a/fast-import.c
+++ b/fast
the existing notes tree without using it as a parent:
M 04 refs/notes/foo^{tree} \n
Discovered-by: Mike Hommey m...@glandium.org
Signed-off-by: Johan Herland jo...@herland.net
---
fast-import.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fast-import.c b/fast
git notes allows adding notes to non-commit objects, but fast-import
restricts the 'notemodify' command to only add notes for commit objects.
Remove that silly restriction from fast-import.
Suggested-by: Mike Hommey m...@glandium.org
Signed-off-by: Johan Herland jo...@herland.net
---
fast
looked closely at this, and I'm not sure it is
as easy as it sounds.
Have fun! :)
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
at the end of the for loop body, which is ugly and brittle.
Simply use root-tree directly instead, and remote the t shorthand.
Signed-off-by: Johan Herland jo...@herland.net
---
fast-import.c | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/fast-import.c b/fast-import.c
? NO
+CCC
Stage this hunk? YES
+DDD
Stage this hunk? NO
This would allow me to stage the following:
-AAA
+CCC
and leave the following unstaged:
-BBB
+DDD
but would also allow any other combination.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from
that this is probably the best workaround for now.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
|B pulls, they will find most
objects are already present in repo-master.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
On Wed, Nov 12, 2014 at 2:57 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Tue, Nov 11, 2014 at 7:40 PM, Johan Herland jo...@herland.net wrote:
+ test_line_count = 1 actual
Broken -chain. This problem is repeated each place use invoke
test_line_count().
Thanks. Fixed in the next
On Wed, Nov 12, 2014 at 10:18 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
On Wed, Nov 12, 2014 at 2:57 AM, Eric Sunshine sunsh...@sunshineco.com
wrote:
On Tue, Nov 11, 2014 at 7:40 PM, Johan Herland jo...@herland.net wrote:
+ test_line_count = 1
On Tue, Nov 11, 2014 at 3:41 AM, Jeff King p...@peff.net wrote:
On Tue, Nov 11, 2014 at 02:40:19AM +0100, Johan Herland wrote:
This and all other failures are due to the output of 'wc -l', which on
Mac is {whitespace}1 rather than just 1 as it is on other
platforms. fbe4f748 added quotes
! :)
...Johan
Johan Herland (9):
builtin/notes: Fix premature failure when trying to add the empty blob
t3301: Verify that 'git notes' removes empty notes by default
builtin/notes: Improve naming
builtin/notes: Refactor note file path into struct note_data
builtin/notes: Simplify early exit code
Move the 'path' variable from create_note() and into the
note_data struct. Unify cleanup of note_data objects with
a free_note_data() function.
This might not make too much sense on its own, but it makes the
future refactoring of create_note() considerably cleaner.
Signed-off-by: Johan Herland
write_note_data() to copy_obj_to_fd(), which more aptly
describes what it actually does: Copying the contents of a git object
(given by its SHA1) into a given file descriptor.
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 109
1
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-notes.txt | 12
builtin/notes.c | 17 +++--
t/t3301-notes.sh| 10 +-
3 files changed, 28 insertions(+), 11 deletions(-)
diff
was given (e.g. using -m or -F /dev/null).
The next patch contains a test that verifies the fixed behavior.
Found-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin
If the user has gone through the trouble of explicitly adding an empty
note, then git log should not silently skip it (as if it didn't exist).
Signed-off-by: Johan Herland jo...@herland.net
---
notes.c | 3 +--
t/t3301-notes.sh | 12
2 files changed, 13 insertions(+), 2
Remove the need for 'retval' and the unnecessary goto. Also reorganize
to only call free_note_data() is actually needed.
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 35 +--
1 file changed, 17
()), keeping the logic for writing the actual note
object in a separate function: write_note_data().
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 103 +---
1 file changed, 54
Add test cases documenting the current behavior when trying to
add/append/edit empty notes. This is in preparation for adding
--allow-empty; to allow empty notes to be stored.
Improved-by: Eric Sunshine sunsh...@sunshineco.com
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan
and verification.
Improved-by: Eric Sunshine sunsh...@sunshineco.com
Improved-by: Junio C Hamano gits...@pobox.com
Improved-by: Michael Blume blume.m...@gmail.com
Improved-by: Jeff King p...@peff.net
Signed-off-by: Johan Herland jo...@herland.net
---
t/t3301-notes.sh | 1300
On Mon, Nov 10, 2014 at 9:36 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/builtin/notes.c b/builtin
On Mon, Nov 10, 2014 at 9:42 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
Make this test script appear somewhat less old-fashioned:
- Use test helper functions:
- write_script
- test_commit
- test_write_lines
- test_config
^
test_must_fail git notes show HEAD^
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
On Tue, Nov 11, 2014 at 2:07 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Nov 10, 2014 at 8:04 PM, Johan Herland jo...@herland.net wrote:
On Mon, Nov 10, 2014 at 9:42 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
Make this test script appear
! :)
...Johan
Johan Herland (9):
builtin/notes: Fix premature failure when trying to add the empty blob
t3301: Verify that 'git notes' removes empty notes by default
builtin/notes: Improve naming
builtin/notes: Refactor note file path into struct note_data
builtin/notes: Simplify early exit
was given (e.g. using -m or -F /dev/null).
The next patch contains a test that verifies the fixed behavior.
Found-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin
()), keeping the logic for writing the actual note
object in a separate function: write_note_data().
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 103 +---
1 file changed, 54
On Fri, Nov 7, 2014 at 7:04 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
[...]
Assuming that it is a good idea to allow empty notes, I think
there are two issues involved here:
* Traditionally, feeding an empty note is taken as a request to
remove
If the user has gone through the trouble of explicitly adding an empty
note, then git log should not silently skip it (as if it didn't exist).
Signed-off-by: Johan Herland jo...@herland.net
---
notes.c | 3 +--
t/t3301-notes.sh | 12
2 files changed, 13 insertions(+), 2
Add test cases documenting the current behavior when trying to
add/append/edit empty notes. This is in preparation for adding
--allow-empty; to allow empty notes to be stored.
Improved-by: Eric Sunshine sunsh...@sunshineco.com
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan
...@sunshineco.com
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland jo...@herland.net
---
t/t3301-notes.sh | 1148 +-
1 file changed, 522 insertions(+), 626 deletions(-)
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 416ed9e
Move the 'path' variable from create_note() and into the
note_data struct. Unify cleanup of note_data objects with
a free_note_data() function.
This might not make too much sense on its own, but it makes the
future refactoring of create_note() considerably cleaner.
Signed-off-by: Johan Herland
write_note_data() to copy_obj_to_fd(), which more aptly
describes what it actually does: Copying the contents of a git object
(given by its SHA1) into a given file descriptor.
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 109
1
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index 1017472..f1480cf 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -399,7 +399,7 @@ static int
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-notes.txt | 12
builtin/notes.c | 17 +++--
t/t3301-notes.sh| 10 +-
3 files changed, 28 insertions(+), 11 deletions(-)
diff
On Wed, Nov 5, 2014 at 8:00 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
+verify_missing() {
+ git log -1 actual
Hmph, it was unclear what exactly you are trying to check with this
one and the other git log -1 expect_missing.
Perhaps a comment
(#4)
- Add a final (optional) patch with some whitespace and other
cleanups in t3301. Feel free to drop this if it's too much
churn.
Have fun! :)
...Johan
Johan Herland (5):
builtin/notes: Fix premature failure when trying to add the empty blob
t3301: Verify that 'git notes' removes
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-notes.txt | 12
builtin/notes.c | 23 ++-
t/t3301-notes.sh| 10 +-
3 files changed, 31 insertions(+), 14 deletions
Add test cases documenting the current behavior when trying to
add/append/edit empty notes. This is in preparation for adding
--allow-empty; to allow empty notes to be stored.
Improved-by: Eric Sunshine sunsh...@sunshineco.com
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan
was given (e.g. using -m or -F /dev/null).
The next patch contains a test that verifies the fixed behavior.
Found-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin
If the user has gone through the trouble of explicitly adding an empty
note, then git log should not silently skip it (as if it didn't exist).
Signed-off-by: Johan Herland jo...@herland.net
---
notes.c | 3 +--
t/t3301-notes.sh | 12
2 files changed, 13 insertions(+), 2
Signed-off-by: Johan Herland jo...@herland.net
---
Drop this if it's too much churn.
...Johan
t/t3301-notes.sh | 254 +++
1 file changed, 126 insertions(+), 128 deletions(-)
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index f5d8193
was given (e.g. using -m or -F /dev/null).
The next patch contains a test that verifies the fixed behavior.
Found-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin
[...]
Each -c/-C case fails for me when trying to read $empty_object. For example:
fatal: Failed to read object 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'.
not ok 5 - 'git notes add -c $empty_blob' removes empty note
These are all fixed in the re-roll.
Thanks for the feedback!
...Johan
--
Johan
Add test cases documenting the current behavior when trying to
add/append/edit empty notes. This is in preparation for adding
--allow-empty; to allow empty notes to be stored.
Improved-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Johan Herland jo...@herland.net
---
t/t3312-notes
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-notes.txt | 12
builtin/notes.c | 23 ++-
notes.c | 3 +--
t/t3312-notes-empty.sh | 17 -
4 files changed, 39 insertions(+), 16 deletions
Add test cases documenting the current behavior when trying to
add/append/edit empty notes. This is in preparation for adding
--allow-empty; to allow empty notes to be stored.
Signed-off-by: Johan Herland jo...@herland.net
---
t/t3312-notes-empty.sh | 58
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-notes.txt | 12
builtin/notes.c | 25 +++--
notes.c | 3 +--
t/t3312-notes-empty.sh | 20 +++-
4 files changed, 43 insertions(+), 17 deletions
1 - 100 of 329 matches
Mail list logo