[PATCH 08/18] branch-diff: suppress the diff headers

When showing the diff between corresponding patches of the two branch versions, we have to make up a fake filename to run the diff machinery. That filename does not carry any meaningful information, hence tbdiff suppresses it. So we should, too. Signed-off-by: Johannes Schindelin

[PATCH 09/18] branch-diff: adjust the output of the commit pairs

This change brings branch-diff yet another step closer to feature parity with tbdiff: it now shows the oneline, too, and indicates with `=` when the commits have identical diffs. Signed-off-by: Johannes Schindelin --- builtin/branch-diff.c | 67

[PATCH 03/18] branch-diff: first rudimentary implementation

At this stage, `git branch-diff` can determine corresponding commits of two related commit ranges. This makes use of the recently introduced implementation of the Hungarian algorithm. The core of this patch is a straight port of the ideas of tbdiff, the seemingly dormant project at

[PATCH 05/18] branch-diff: also show the diff between patches

Just like tbdiff, we now show the diff between matching patches. This is a "diff of two diffs", so it can be a bit daunting to read for the beginnger. This brings branch-diff closer to be feature-complete with regard to tbdiff. An alternative would be to display an interdiff, i.e. the

[PATCH 04/18] branch-diff: improve the order of the shown commits

This patch lets branch-diff use the same order as tbdiff. The idea is simple: for left-to-right readers, it is natural to assume that the branch-diff is performed between an older vs a newer version of the branch. As such, the user is probably more interested in the question "where did this come

[PATCH 06/18] branch-diff: right-trim commit messages

When comparing commit messages, we need to keep in mind that they are indented by four spaces. That is, empty lines are no longer empty, but have "trailing whitespace". When displaying them in color, that results in those nagging red lines. Let's just right-trim the lines in the commit message,

[PATCH 00/18] Add `branch-diff`, a `tbdiff` lookalike

The incredibly useful `git-tbdiff` tool to compare patch series (say, to see what changed between two iterations sent to the Git mailing list) is slightly less useful for this developer due to the fact that it requires the `hungarian` and `numpy` Python packages which are for some reason really

[PATCH 02/18] Add a new builtin: branch-diff

This builtin does not do a whole lot so far, apart from showing a usage that is oddly similar to that of `git tbdiff`. And for a good reason: the next commits will turn `branch-diff` into a full-blown replacement for `tbdiff`. At this point, we ignore tbdiff's color options, as they will all be

[PATCH 01/18] Add a function to solve least-cost assignment problems

The Jonker-Volgenant algorithm was implemented to answer questions such as: given two different versions of a topic branch (or iterations of a patch series), what is the best pairing of commits/patches between the different versions? Signed-off-by: Johannes Schindelin

Re: [PATCH] gitweb: Measure offsets against UTF-8 flagged string

> One solution would be to force conversion to UTF-8 on input via "open" > pragma (e.g. "use open ':encoding(UTF-8)';"). But there is no > UTF-8-with_fallback encoding available - we would have to write one, and > install it as module (or fake it via Perl trickery). This mechanism is > almost

Re: [PATCH v2] checkout & worktree: introduce checkout.implicitRemote

On Thu, May 3, 2018 at 3:18 PM, Ævar Arnfjörð Bjarmason wrote: > Introduce a checkout.implicitRemote setting which can be used to > designate a remote to prefer (via checkout.implicitRemote=origin) when > running e.g. "git checkout master" to mean origin/master, even though >

Re: [PATCH 13/13] alloc: allow arbitrary repositories for alloc functions

On Tue, May 1, 2018 at 11:34 PM, Stefan Beller wrote: > @@ -501,9 +516,12 @@ void raw_object_store_clear(struct raw_object_store *o) > void object_parser_clear(struct object_parser *o) > { > /* > -* TOOD free objects in o->obj_hash. > -* You need to

Re: [PATCH 1/5] submodule foreach: correct '$path' in nested submodules from a subdirectory

On 03/05/18 01:53, Stefan Beller wrote: > From: Prathamesh Chavan > > When running 'git submodule foreach --recursive' from a subdirectory of > your repository, nested submodules get a bogus value for $path: > For a submodule 'sub' that contains a nested submodule 'nested',

[PATCH v2] checkout & worktree: introduce checkout.implicitRemote

Introduce a checkout.implicitRemote setting which can be used to designate a remote to prefer (via checkout.implicitRemote=origin) when running e.g. "git checkout master" to mean origin/master, even though there's other remotes that have the "master" branch. I want this because it's very handy to

Re: [PATCH] gitweb: Measure offsets against UTF-8 flagged string

Junio C Hamano writes: > Shin Kojima writes: > >> Offset positions should not be counted by byte length, but by actual >> character length. >> ... >> # escape tabs (convert tabs to spaces) >> sub untabify { >> -my $line = shift; >> +my $line =

Do You Need A Hand?

I am Mavis Wanczyk i know you may not know me but am the latest largest US Powerball lottery winner of $758.7m just of recent, am currently helping out people in need of financial assistance, i know it's hard to believe anything on the internet, so if you don't need my help please

Re: [PATCH v5 00/11] Compute and consume generation numbers

Derrick Stolee writes: > Most of the changes from v4 are cosmetic, but there is one new commit: > > commit: use generation number in remove_redundant() > > Other changes are non-functional, but do clarify things. I wonder if out perf framework in t/perf could help

[PATCH v4 3/3] submodule: add --dissociate option to add/update commands

Add --dissociate option to add and update commands, both clone helper commands that already have the --reference option --dissociate pairs with. Signed-off-by: Casey Fitzpatrick --- Documentation/git-submodule.txt | 10 +- builtin/submodule--helper.c | 16

[PATCH v4 2/3] submodule: add --progress option to add command

The '--progress' was introduced in 72c5f88311d (clone: pass --progress decision to recursive submodules, 2016-09-22) to fix the progress reporting of the clone command. Also add the progress option to the 'submodule add' command. The update command already supports the progress flag, but it is not

[PATCH v4 0/3] Add --progress and --dissociate to git submodule

These patches add --progress and --dissociate options to git submodule. The --progress option existed beforehand, but only for the update command and it was left undocumented. Both add and update submodule commands supported --reference, but not its pair option --dissociate which allows for

[PATCH v4 1/3] submodule: clean up subsititions in script

'recommend_shallow' and 'jobs' variables do not need quotes. They only hold a single token value, and even if they were multi-token it is likely we would want them split at IFS rather than pass a single string. 'progress' is a boolean value. Treat it like the other boolean values in the script by

Re: [PATCH 1/3] submodule: clean up subsititions in script

Thanks I will amend and re-submit (this time with -v$N, I apologize for creating a confusing mess in everyone's email clients :)) On Wed, May 2, 2018 at 1:59 AM, Junio C Hamano wrote: > Casey Fitzpatrick writes: > >> 'recommend_shallow' and 'jobs'

Re: [PATCH v3 09/12] get_short_oid / peel_onion: ^{tree} should be tree, not treeish

On Thu, May 03 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> But ^{tree} shows just the trees, but would previously be equivalent >> to the above: >> >> $ git rev-parse e8f2^{tree} >> error: short SHA1 e8f2 is ambiguous >> hint: The candidates

I Am Interested In You.

Greeting to you and how is your family? sorry for my way of approach to you, it is because i do not have choice. I am Aniccet Ibrahim From Ivory Coast. My story is connected to the fight with the Republican Forces. I have a business proposals for you. If your interested i want you to reply

Re: Generate more revenue from Git

Hello, Following up on my last email, It would be great to setup a call this week. Looking forward to your response. Best Regards, -- Michal Sapozhnikov | Business Manager, Luminati SDK | +972-50-2826778 | Skype: live:michals_43 http://luminati.io/sdk On 15-Apr-18 14:14, 7d (by eremind)

Re: [PATCH v3 00/12] get_short_oid UI improvements

On Wed, May 2, 2018 at 6:45 AM, Derrick Stolee wrote: > On 5/2/2018 8:42 AM, Derrick Stolee wrote: >> >> On 5/1/2018 2:40 PM, Ævar Arnfjörð Bjarmason wrote: >>> >>> The biggest change in v3 is the no change at all to the code, but a >>> lengthy explanation of why I didn't go for

<    1   2