Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pull-all and push-all do squash if option is set #1

Open
wants to merge 2 commits into
base: subtree-updates
Choose a base branch
from
Open

pull-all and push-all do squash if option is set #1

wants to merge 2 commits into from

Conversation

sleicht
Copy link

@sleicht sleicht commented Aug 23, 2012

I needed the ability to set the squash option on the pull-all so only changed remote repositories to generate (squashed) commits.

helmo and others added 2 commits May 7, 2012 21:21
@helmo
Collected subtree updates
f81d2de 
These include:
 * a .gittrees file with meta data
 * new sub commands (push-all, pull-all, from-submodule, prune, diff, list)
 * Documentation updates

Contributers from the git log on https://github.com/helmo/git-subtree
bibendi <[email protected]>
Carl Fürstenberg <[email protected]>
Francesco Delfino <[email protected]>
helmo <[email protected]>
Herman van Rink <[email protected]>
James Roper <[email protected]>
John Yani <[email protected]>
Jonathan 'Wolf' Rentzsch <[email protected]>
mhart <[email protected]>
mhoffman <[email protected]>
Nate Jones <[email protected]>
Paul Cartwright <[email protected]>
Peter Jaros <[email protected]>
rentzsch <[email protected]>
sun <[email protected]>
Thomas Van Doren <[email protected]>
Vanya at notebook <[email protected]>
pull-all and push-all do squash if option is set
40295da
@helmo
Copy link
Owner

helmo commented Aug 23, 2012

It's been awhile since I've played with this... but isn't squash irrelevant for push?

@sleicht
Copy link
Author

sleicht commented Aug 27, 2012

You are probably right. But as --squash is also an option in the 'default' subtree push command I added it to the push-all:

From the git subtree usage info:
"options for 'add', 'merge', 'pull' and 'push'
--squash merge subtree changes as a single commit"

But I'm not dependent on this. So if you don't want it I could remove it from push-all.

NexZhu pushed a commit to daotl/git-subtree that referenced this pull request Jul 7, 2022
@helmo
Merge pull request helmo#1 from rentzsch/patch-1
3dc509b 
[DOC] Mention `git --exec-path` in README.
NexZhu pushed a commit to daotl/git-subtree that referenced this pull request Oct 13, 2022
@peff @gitster
is_promisor_object(): fix use-after-free of tree buffer
1490d7d 
Since commit fcc07e9 (is_promisor_object(): free tree buffer after
parsing, 2021-04-13), we'll always free the buffers attached to a
"struct tree" after searching them for promisor links. But there's an
important case where we don't want to do so: if somebody else is already
using the tree!

This can happen during a "rev-list --missing=allow-promisor" traversal
in a partial clone that is missing one or more trees or blobs. The
backtrace for the free looks like this:

      helmo#1 free_tree_buffer tree.c:147
      helmo#2 add_promisor_object packfile.c:2250
      helmo#3 for_each_object_in_pack packfile.c:2190
      #4 for_each_packed_object packfile.c:2215
      #5 is_promisor_object packfile.c:2272
      git#6 finish_object__ma builtin/rev-list.c:245
      #7 finish_object builtin/rev-list.c:261
      git#8 show_object builtin/rev-list.c:274
      git#9 process_blob list-objects.c:63
      git#10 process_tree_contents list-objects.c:145
      git#11 process_tree list-objects.c:201
      git#12 traverse_trees_and_blobs list-objects.c:344
      [...]

We're in the middle of walking through the entries of a tree object via
process_tree_contents(). We see a blob (or it could even be another tree
entry) that we don't have, so we call is_promisor_object() to check it.
That function loops over all of the objects in the promisor packfile,
including the tree we're currently walking. When we're done with it
there, we free the tree buffer. But as we return to the walk in
process_tree_contents(), it's still holding on to a pointer to that
buffer, via its tree_desc iterator, and it accesses the freed memory.

Even a trivial use of "--missing=allow-promisor" triggers this problem,
as the included test demonstrates (it's just a vanilla --blob:none
clone).

We can detect this case by only freeing the tree buffer if it was
allocated on our behalf. This is a little tricky since that happens
inside parse_object(), and it doesn't tell us whether the object was
already parsed, or whether it allocated the buffer itself. But by
checking for an already-parsed tree beforehand, we can distinguish the
two cases.

That feels a little hacky, and does incur an extra lookup in the
object-hash table. But that cost is fairly minimal compared to actually
loading objects (and since we're iterating the whole pack here, we're
likely to be loading most objects, rather than reusing cached results).

It may also be a good direction for this function in general, as there
are other possible optimizations that rely on doing some analysis before
parsing:

  - we could detect blobs and avoid reading their contents; they can't
    link to other objects, but parse_object() doesn't know that we don't
    care about checking their hashes.

  - we could avoid allocating object structs entirely for most objects
    (since we really only need them in the oidset), which would save
    some memory.

  - promisor commits could use the commit-graph rather than loading the
    object from disk

This commit doesn't do any of those optimizations, but I think it argues
that this direction is reasonable, rather than relying on parse_object()
and trying to teach it to give us more information about whether it
parsed.

The included test fails reliably under SANITIZE=address just when
running "rev-list --missing=allow-promisor". Checking the output isn't
strictly necessary to detect the bug, but it seems like a reasonable
addition given the general lack of coverage for "allow-promisor" in the
test suite.

Reported-by: Andrew Olsen <[email protected]>
Signed-off-by: Jeff King <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
NexZhu pushed a commit to daotl/git-subtree that referenced this pull request Oct 13, 2022
@spnngl @gitster
preload-index: fix memleak
2357890 
Fix a memory leak occuring in case of pathspec copy in preload_index.

Direct leak of 8 byte(s) in 8 object(s) allocated from:
    #0 0x7f0a353ead47 in __interceptor_malloc (/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/libasan.so.6+0xb5d47)
    helmo#1 0x55750995e840 in do_xmalloc /home/anthony/src/c/git/wrapper.c:51
    helmo#2 0x55750995e840 in xmalloc /home/anthony/src/c/git/wrapper.c:72
    helmo#3 0x55750970f824 in copy_pathspec /home/anthony/src/c/git/pathspec.c:684
    #4 0x557509717278 in preload_index /home/anthony/src/c/git/preload-index.c:135
    #5 0x55750975f21e in refresh_index /home/anthony/src/c/git/read-cache.c:1633
    git#6 0x55750915b926 in cmd_status builtin/commit.c:1547
    #7 0x5575090e1680 in run_builtin /home/anthony/src/c/git/git.c:466
    git#8 0x5575090e1680 in handle_builtin /home/anthony/src/c/git/git.c:720
    git#9 0x5575090e284a in run_argv /home/anthony/src/c/git/git.c:787
    git#10 0x5575090e284a in cmd_main /home/anthony/src/c/git/git.c:920
    git#11 0x5575090dbf82 in main /home/anthony/src/c/git/common-main.c:56
    git#12 0x7f0a348230ab  (/lib64/libc.so.6+0x290ab)

Signed-off-by: Anthony Delannoy <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
NexZhu pushed a commit to daotl/git-subtree that referenced this pull request Oct 13, 2022
@bitigchi
l10n: tr: Update translations for v2.38.0 round helmo#1
365891d 
Signed-off-by: Emir SARI <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sleicht @helmo