Re: [PATCH] contrib/subtree: Remove --annotate

Sebastian Schuberth writes: > On Sat, Jan 2, 2016 at 9:36 PM, David Greene wrote: > >> commit messages. git has other tools more suited to rewriting >> commit messages and it's easy enough to use them after a subtree >> split. > > For completeness,

Detecting redundant commits

I am attempting to teach cherry-pick to handle redundant commits gracefully (via a new --skip-redundant-commits option) instead of aborting. However, I'm struggling a bit with how to check if the changes in a commit will become redundant when appied to the new HEAD. I found diff_tree_sha1 which

Subtree: My Status

Hi folks, I apologize for being off the grid for a while. We had a baby and unexpectedly ended up in the NICU. We just got him home a week ago. Everyone is doing fine but I had to pretty much drop all non-essential work for a month or so. Rest assured that I have all of the git-subtree-related

Re: [PATCH 11/13] contrib/subtree: Make each test self-contained

Junio C Hamano gits...@pobox.com writes: I also think it would be a good idea for you to learn to push back to the original authors; fixing problems in patches by others, while is a good way to learn how their thinking process went, is not necessarily fun. Sure, but in this case I said I'd

Re: [PATCH 13/13] contrib/subtree: Remove --annotate

James Nylen jny...@gmail.com writes: I don't agree that removing `--annotate` obviates the need for `--unannotate`. I responded on 1/17 with what I think is a typical and normal use case for that option: Sorry, I must have missed that reply. - add fancylib as a subtree of myprog -

Re: Rebased git-subtree changes

Junio C Hamano gits...@pobox.com writes: This looks to be of mixed quality. The earlier ones look fairly finished, while the later ones not so much. I am tempted to take up to 06/13 and advance them to 'next', without the rest. Can you let me know what you've taken up? I have a new set

Re: [PATCH 1/4] contrib/subtree: Store subtree sources in .gitsubtree and use for push/pull

Paul Campbell pcampb...@kemitix.net writes: Subsequent git subtree push/pull operations now default to the values stored in .gitsubtree, unless overridden from the command line. The .gitsubtree file should be tracked as part of the repo as it describes where parts of the tree came from and

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

Junio C Hamano gits...@pobox.com writes: * dg/subtree-fixes (2013-02-05) 6 commits (merged to 'next' on 2013-02-09 at 8f19ebe) + contrib/subtree: make the manual directory if needed + contrib/subtree: honor DESTDIR + contrib/subtree: fix synopsis + contrib/subtree: better error

Re: Rebased git-subtree changes

David A. Greene gree...@obbligato.org writes: Here's a re-send of the git-subtree patches after rebasing onto master. Hopefully Junio will have better luck applying these. Damn. Sorry, I sent this before getting all of the feedback. Just ignore this sequence and I'll send a fixed version in

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

Junio C Hamano gits...@pobox.com writes: gree...@obbligato.org writes: gree...@obbligato.org writes: I think this paragraph inherits existing breakage from the beginning of time, but I do not think the above will format the second and subsequent paragraphs correctly. Ok, I'll take a

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

Junio C Hamano gits...@pobox.com writes: gree...@obbligato.org writes: Are you incorporating the other patches? Should I drop them from my list? I actually was planning to accept patches to this subdirectory only through you, hopefully as messages that forward others' changes with your

Re: [PATCH 2/8] Add --unannotate

James Nylen jny...@gmail.com writes: I just now saw these emails. I'm having a hard time thinking of any good use case other than: - add fancylib as a subtree of myprog - commit to myprog repo: fancylib: don't crash as much - split these commits back out to fancylib's main repo, and

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

Junio C Hamano gits...@pobox.com writes: David, how would you like to handle a reroll of this piece? I'll just get the test fix from Techlive Zheng, apply it to my branch and re-send. Are you incorporating the other patches? Should I drop them from my list? -David --

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index c5bce41..75aa690 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -198,6

Re: [PATCH 4/7] contrib/subtree: Better Error Handling for add

Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: From: David A. Greene gree...@obbligato.org Check refspecs for validity before passing them on to other commands. This lets us generate more helpful error messages. Signed-off-by: David A. Greene

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

gree...@obbligato.org writes: I think this paragraph inherits existing breakage from the beginning of time, but I do not think the above will format the second and subsequent paragraphs correctly. Ok, I'll take a look. I don't know what correctly is but it is at least formatted in a similar

Re: [PATCH 1/8] Use %B for Split Subject/Body

Junio C Hamano gits...@pobox.com writes: The question was about the lossage of the blank line, which does not seem to be related to what this patch wants to do. Ah, missed that. -# 25 +#25 Why the lossage of a SP? I think this got fixed later in the series. That is not a good excuse

Re: [PATCH 2/8] Add --unannotate

Junio C Hamano gits...@pobox.com writes: gree...@obbligato.org writes: In the meantime, will you apply the patch or do you prefer a new design? The --unannotate option will become a baggage you will have to keep working until the end of time, if we applied it. I think it is not too uch a

Re: [PATCH 1/8] Use %B for Split Subject/Body

Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Is this an unconditional improvement, or is it

Re: [PATCH 1/8] Use %B for Split Subject/Body

Junio C Hamano gits...@pobox.com writes: Also, please be careful about the subject line. I doubt that these 8 patches will stand out as relating to contrib/subtree, when mixed in 200 line output of git shortlog --no-merges. Ah, ok. I'll be more careful next time.

Re: [PATCH 1/8] Use %B for Split Subject/Body

Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: Subject: Re: [PATCH 1/8] Use %B for Split Subject/Body This needs to say contrib/subtree somewhere (applies to all patches in this series). Ok. Shall I re-send everything? From: Techlive Zheng

Re: [PATCH 2/8] Add --unannotate

Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: From: James Nylen jny...@gmail.com Teach git-subtree about --unannotate. This option strips a prefix from a commit message when doing a subtree split. Hrm. This looks like a workaround for a

Re: [PATCH 3/8] Better Error Handling for add

Junio C Hamano gits...@pobox.com writes: diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 7ceb413..b8a807a 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -509,8 +509,20 @@ cmd_add() ensure_clean if [ $#

Re: [PATCH 4/8] Fix Synopsis

Junio C Hamano gits...@pobox.com writes: -git subtree add --prefix=prefix commit +git subtree add --prefix=prefix refspec Again, this is not refspec but commit. Ok, I need to study the terminology. :) +git subtree add --prefix=prefix repository refspec This is given to fetch and

Re: [PATCH 5/8] Honor DESTDIR

Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: From: Adam Tkac at...@redhat.com Teach git-subtree's Makefile to honor DESTDIR. Author:Adam Tkac at...@redhat.com Signed-off-by:Adam Tkac at...@redhat.com Signed-off-by: David A. Greene

Re: [PATCH 6/8] Make the Manual Directory if Needed

Junio C Hamano gits...@pobox.com writes: diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 36ae3e4..52d6fb9 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -35,6 +35,7 @@ install: $(GIT_SUBTREE) install-doc: install-man install-man:

Re: Bug/Enhancement: contrib/subtree should ship with manpage

Neil kngsp...@gmail.com writes: Actual: git-subtree.1 fails to be generated because my system doesn't ship asciidoc and xmlto. Well, you need those tools to build ANY git documentation. I just ran a test to build git-subtree and its documentation and it went just fine. This is not a bug.

Re: [PATCH] subtree.sh: Use raw subject and body modifier %B instead of %s%n%n%b

gree...@obbligato.org writes: Techlive Zheng techlivezh...@gmail.com writes: %s%n%n%b is not always equal to %B. If the commit msg does not have a body, this will append an extra new-line character to the msg title which would cause the splited commit has a new sha1 hash. In most cases,

Re: [PATCH] Add --unannotate option to git-subtree

Herman van Rink r...@initfour.nl writes: Has anybody looked at this? It has been very useful for me. I am looking at it now. The version of subtree in contrib is rather out-dated unfortunately. It is the official version. What's missing? You have a bunch of changes that need rework to

Re: [PATCH] Add --unannotate option to git-subtree

James Nylen jny...@gmail.com writes: Rather than adding a marker to each commit when splitting out the commits back to the subproject, --unannotate removes the specified string (or bash glob pattern) from the beginning of the first line of the commit message. This enables the following

Re: [BUG?] git-subtree behavior when the -P tree is removed and recreated

Tomi Belan tomi.be...@gmail.com writes: Thanks. Here's one more bump. Avery? David? I don't know how this is supposed to work, unfortunately. I'm still in the middle of learning the code... -David -- To unsubscribe from this list: send the line unsubscribe git in the

Re: git subtree error (just how do you expect me to merge 0 trees?)

Drew Crawford d...@drewcrawfordapps.com writes: I noticed today that if you leave off the branch name from git subtree like so: $ git subtree add --prefix somewhere -m adding CDH as subtree path/to/repo warning: read-tree: emptying the index with no arguments is deprecated; use --empty

Re: git subtree error (just how do you expect me to merge 0 trees?)

Drew Crawford d...@drewcrawfordapps.com writes: Ideally it would be better to emit an error-message from a script higher up the calling chain that would be more descriptive about the problem (such as suggesting no branch is specified).-- I'm looking at implementing this but I need a bit of

Re: git subtree error (just how do you expect me to merge 0 trees?)

Drew Crawford d...@drewcrawfordapps.com writes: Ideally it would be better to emit an error-message from a script higher up the calling chain that would be more descriptive about the problem (such as suggesting no branch is specified).-- Ok, I used git rev-parse --verify and I have this

Re: [PATCH] DESTDIR support in contrib/subtree/Makefile

Adam Tkac at...@redhat.com writes: Signed-off-by: Adam Tkac at...@redhat.com --- It is a good habit in Makefiles to honor DESTDIR variable to support `make DESTDIR=/instalroot install` syntax. Comments are welcomed. Applied. I'll be sending this to the mailing list tonight or

Re: [PATCH] For git-subtree, when installing docs (make install-doc), create man1 folder first.

Junio C Hamano gits...@pobox.com writes: Jesper L. Nielsen lya...@gmail.com writes: From: Jesper L. Nielsen lya...@gmail.com Hi.. I installed Git subtree and discovered that the if the man1dir doesn't exist the man-page for Git Subtree is just called man1. So, small patch to create the

Re: [PATCH] For git-subtree, when installing docs (make install-doc), create man1 folder first.

Jesper L. Nielsen lya...@gmail.com writes: So, small patch to create the folder first in the Makefile. Hope everything is right with the patch and submitting of the patch. I've applied this to my local copy and will send it to the list for integration. Thanks for fixing this!

Re: [PATCH] git-subtree: ignore git-subtree executable

Michael Schubert msc...@elegosoft.com writes: Signed-off-by: Michael Schubert msc...@elegosoft.com Obviously good. Applied and will send for integration. -David -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: git subtree error (just how do you expect me to merge 0 trees?)

Junio C Hamano gits...@pobox.com writes: With one positional option, git-subtree add simply assumes it's a refspec. Is there an easy way to check whether a string is a proper refspec? Even better would be a way to check if a string is a path to a git repository. Do you literally mean a

Re: [PATCH 1/8] Use %B for Split Subject/Body

David A. Greene gree...@obbligato.org writes: From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Wow. So that was a spectacular fail. Sorry about th duplicate patch e-mails. I have no

libgit2 status

What is the status of libgit2 WRT the overall git project? I recall that there was some discussion of basing bits of git on libgit2 once it matures. I ask because I'm starting a project to improve the abysmal speed of git-subtree split. It's unbearably slow at the moment and as far as I can

Re: [PATCH] subtree.sh: Use raw subject and body modifier %B instead of %s%n%n%b

Techlive Zheng techlivezh...@gmail.com writes: %s%n%n%b is not always equal to %B. If the commit msg does not have a body, this will append an extra new-line character to the msg title which would cause the splited commit has a new sha1 hash. In most cases, this does not matter, but for a

Re: A possible subtree split bug

Fabien POTENCIER fabien.potenc...@gmail.com writes: According to the docs: Repeated splits of exactly the same history are guaranteed to be identical (ie. to produce the same commit ids). Because of this, if you add new commits and then re-split, the new commits will be attached as