PPS: Sounds like I need Peff's git-blame-tree from here:
https://github.com/peff/git/compare/jk/faster-blame-tree
--
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.htm
> My current approach is:
> 1) find files common between @ & @{-1}, "ls-tree --full-tree
> --name-only -r" both branches, take the intersection
> 2) find current branch's commits for common files, for each file in
> intersection "log -1 --format=%H $current_branch -- $file"
> 3) find common files w
I've finished testing this work in larger repositories.
While the approach is performant and works nicely in small repos, but
in larger repos one of the requirements for the "correctness" of
substitutions slows things down (1 or 2 minutes to perform checkouts
between branches with 10,000+ files).
> Now knowing the edge cases won't work, I did not get an idea about the
> standard case of what should work with this. Would you mind to write
> a more detailed example or a more advertising paragraph of what this can do?
> Not getting the big picture may be related to me having not worked with RC
Junio, et al.,
I've completed my first pass at RCS Keywords in Git. I believe I've
come up with a solution that is accurate, performant and complete (but
I have not tested it on big repos yet, I'm doing that today...).
https://github.com/derekm/git-keywords
This work basically takes advantage of
> But if you then switch to B from that state, F will not even be
> modified (i.e. it will keep the contents you prepared for "branch
> A's instance of F").
Or: the post-commit hook used in the workaround looks up the prior
branch via @{-1}, finds all files common between @ & @{-1} that don't
shar
they think they want.
Thanks!
:D
On Wed, Nov 12, 2014 at 12:30 PM, Junio C Hamano wrote:
> Derek Moore writes:
>
>> I have a case where I would like to smudge files according to the
>> reflog information of the switching-to branch.
>
> Don't do that.
>
> When
I have a case where I would like to smudge files according to the
reflog information of the switching-to branch.
This is difficult to achieve because updating HEAD to the new
switched-to refname or commit hash is the last step performed in a
checkout prior to calling the post-checkout hook, and sm
cess and Fedora
docbook2X RPM .spec, to see which name is canonical and how you guys
came up with "docbook2x-texi".
Seems there are now plenty of opportunities for me get my name in
git's AUTHORS list. ;)
On Thu, Oct 9, 2014 at 2:35 PM, Jeff King wrote:
> On Thu, Oct 09, 2014 at 12
> I don't see a big problem with that. But I wonder if we would do better
> to introduce arbitrary strftime-like formatting, so we do not have to
> keep adding new formats.
My thoughts exactly...
This list seems to be a prove-yourself-with-patches sorta place. If I
can find the time, I'll try att
.
On Thu, Oct 9, 2014 at 2:07 PM, Jeff King wrote:
> On Thu, Oct 09, 2014 at 12:42:39PM -0500, Derek Moore wrote:
>
>> As far as I've tested it would seem only %N doesn't resolve inside of
>> $Format:$, until I maybe do unit tests for this to identify any
>> other
Should perhaps you be using some symbolic method of referencing the
empty tree instead of referencing a magic number?
E.g.,
https://git.wiki.kernel.org/index.php/Aliases#Obtaining_the_Empty_Tree_SHA1
On Thu, Oct 9, 2014 at 1:50 PM, Fabian Ruch wrote:
> When the user specifies a merge strategy,
Following the INSTALL doc, I was building git with:
make prefix=/usr/local all doc info
Even after installing docbook2X, I couldn't get past the first DB2TEXI
build step until I discovered that 'docbook2x-texi' is named
'db2x_docbook2texi' in Fedora 21 using the latest upstream docbook2X
0.8.8.
On Thu, Oct 9, 2014 at 10:56 AM, Derek Moore wrote:
> I first noticed this using the system git provided in Fedora 21, so I
> cloned the official git repo, built from source, and it would appear
> there are even more options that don't work with export-subst in the
> latest code
PRETTY FORMATS' format: documentation says, "%ad: author date
(format respects --date= option)", and similarly for %cd.
But git-archive does not support the --date= option for changing the
date format in $Format:%ad$ or $Format:%cd$ substitution strings.
Relatedly, I want a short RFC date, not a
I first noticed this using the system git provided in Fedora 21, so I
cloned the official git repo, built from source, and it would appear
there are even more options that don't work with export-subst in the
latest code.
I tested this under commit 63a45136a329bab550425c3142db6071434d935e
(HEAD, or
The HTML for the git-log man page is being misrendered on the official site.
See the placehoders list under "format:" in the PRETTY FORMATS section.
--
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:
17 matches
Mail list logo
