[PATCH v6 11/21] range-diff: add tests

2018-08-13 Thread Thomas Rast via GitGitGadget
From: Thomas Rast These are essentially lifted from https://github.com/trast/tbdiff, with light touch-ups to account for the command now being named `git range-diff`. Apart from renaming `tbdiff` to `range-diff`, only one test case needed to be adjusted: 11 - 'changed message'. The

[PATCH v5 11/21] range-diff: add tests

2018-08-10 Thread Thomas Rast via GitGitGadget
From: Thomas Rast These are essentially lifted from https://github.com/trast/tbdiff, with light touch-ups to account for the command now being named `git range-diff`. Apart from renaming `tbdiff` to `range-diff`, only one test case needed to be adjusted: 11 - 'changed message'. The

[PATCH v4 11/21] range-diff: add tests

2018-07-21 Thread Thomas Rast via GitGitGadget
From: Thomas Rast These are essentially lifted from https://github.com/trast/tbdiff, with light touch-ups to account for the command now being names `git range-diff`. Apart from renaming `tbdiff` to `range-diff`, only one test case needed to be adjusted: 11 - 'changed message'. The

[PATCH v3 11/20] range-diff: add tests

2018-07-03 Thread Thomas Rast via GitGitGadget
From: Thomas Rast These are essentially lifted from https://github.com/trast/tbdiff, with light touch-ups to account for the command now being an option of `git branch`. Apart from renaming `tbdiff` to `range-diff`, only one test case needed to be adjusted: 11 - 'changed message&#

Re: XDL_FAST_HASH can be very slow

2014-12-22 Thread Thomas Rast
fferently is load 8 bytes at a time instead > of 1. It does all the same ALU operations as DJB. I don't think there's a point in having such a function, since it would mean a lot of code for no throughput gain. Let's just remove XDL_FAST_HASH and the original hashing scheme in f

[PATCH v3 6/8] merge-recursive: allow storing conflict hunks in index

2014-09-06 Thread Thomas Rast
ee. They could already get the _conflicts_ with --index-only, but not (conveniently) the conflict-hunk formatted files that would normally be written to the worktree. Signed-off-by: Thomas Rast --- Documentation/merge-strategies.txt | 5 + merge-recursive.c | 4 me

[PATCH v3 3/8] merge-recursive: -Xindex-only to leave worktree unchanged

2014-09-06 Thread Thomas Rast
From: Thomas Rast Using the new no_worktree flag from the previous commit, we can teach merge-recursive to leave the worktree untouched. Expose this with a new strategy option so that scripts can use it. Signed-off-by: Junio C Hamano --- Documentation/merge-strategies.txt | 4 merge

[PATCH v3 8/8] log --remerge-diff: show what the conflict resolution changed

2014-09-06 Thread Thomas Rast
ion is there, unlike with --cc; and the output is usually much shorter than with -c. Signed-off-by: Thomas Rast --- Documentation/rev-list-options.txt | 7 + log-tree.c | 297 + merge-recursive.c |

[PATCH v3 4/8] combine-diff: do not pass revs->dense_combined_merges redundantly

2014-09-06 Thread Thomas Rast
now, the next commit will simplify this to a single setting again. Signed-off-by: Thomas Rast --- builtin/diff.c | 3 +-- combine-diff.c | 13 ++--- diff-lib.c | 6 ++ diff.h | 6 +++--- log-tree.c | 2 +- submodule.c| 5 - 6 files changed, 17 inse

[PATCH v3 2/8] merge-recursive: internal flag to avoid touching the worktree

2014-09-06 Thread Thomas Rast
From: Thomas Rast o->call_depth has a double function: a nonzero call_depth means we want to construct virtual merge bases, but it also means we want to avoid touching the worktree. Introduce a new flag o->no_worktree to trigger only the latter. Signed-off-by: Thomas Rast Signed-off-by:

[PATCH v3 5/8] Fold all merge diff variants into an enum

2014-09-06 Thread Thomas Rast
variants without yet more special casing. It should also be slightly easier to read because one does not have to ensure that the flag bits are set in an expected combination. Signed-off-by: Thomas Rast --- builtin/diff-files.c| 5 +++-- builtin/diff-tree.c | 2 +- builtin/diff.c | 9

[PATCH v3 7/8] name-hash: allow dir hashing even when !ignore_case

2014-09-06 Thread Thomas Rast
The directory hash (for fast checks if the index already has a directory) was only used in ignore_case mode and so depended on that flag. Make it generally available on request. Signed-off-by: Thomas Rast --- cache.h | 2 ++ name-hash.c | 13 - 2 files changed, 10 insertions

[PATCH v3 0/8] --remerge-diff

2014-09-06 Thread Thomas Rast
that we no longer need (in 8/8); previously, the insert-only name-hash kept them alive. - Adaptations to match Duy's changes to cache_tree handling (in 8/8). Please review the cache_tree handling extra carefully, as I'm not 100% convinced the dance there is all that is needed. T

[PATCH v3 1/8] merge-recursive: remove dead conditional in update_stages()

2014-09-06 Thread Thomas Rast
From: Thomas Rast 650467c (merge-recursive: Consolidate different update_stages functions, 2011-08-11) changed the former argument 'clear' to always be true. Remove the useless conditional. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- merge-recursive.c | 6 ++--

Re: [PATCH v2 7/8] name-hash: allow dir hashing even when !ignore_case

2014-09-06 Thread Thomas Rast
Eric Sunshine writes: > On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast wrote: >> -static void lazy_init_name_hash(struct index_state *istate) >> +void init_name_hash(struct index_state *istate, int force_dir_hash) >> { >> int nr; >> >>

Re: [PATCH v2 08/23] rebase -i: reword executes pre-commit hook on interim commit

2014-08-11 Thread Thomas Rast
Fabian Ruch writes: > Hi Thomas, > > Thomas Rast writes: >> Fabian Ruch writes: >>> Subject: Re: [PATCH v2 08/23] rebase -i: reword executes pre-commit >>> hook on interim commit >> >> I think the change makes sense, but can you reword the subj

Re: [PATCH v2 04/23] rebase -i: hide interactive command messages in verbose mode

2014-08-11 Thread Thomas Rast
Fabian Ruch writes: > Hi Thomas, > > Thomas Rast writes: >> Fabian Ruch writes: >>> @@ -923,6 +923,8 @@ EOF >>> ;; >>> esac >>> >>> +mkdir -p "$state_dir" || die "Could not create temporary $state_dir" >&g

Re: [PATCH v2 20/23] rebase -i: parse to-do list command line options

2014-08-08 Thread Thomas Rast
tion warning: Unknown command: pick --unknown-option ? It shouldn't claim the command is unknown if the command itself was valid. Also, you speak of do_cmd above, but the unknown command handling seems to be part of do_replay? -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH v2 23/23] rebase -i: enable options --signoff, --reset-author for pick, reword

2014-08-08 Thread Thomas Rast
rigger this. Also, are you sure $sha1 does not require quoting through an eval? Please add tests to this patch. -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH v2 04/23] rebase -i: hide interactive command messages in verbose mode

2014-08-08 Thread Thomas Rast
FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" && > export FAKE_LINES && > - git rebase -i HEAD~2 >expect > + git rebase -i HEAD~2 >expected > ) && > - sed -e "1,9d" expect >exp

Re: [PATCH v2 08/23] rebase -i: reword executes pre-commit hook on interim commit

2014-08-08 Thread Thomas Rast
Fabian Ruch writes: > Subject: Re: [PATCH v2 08/23] rebase -i: reword executes pre-commit hook on > interim commit I think the change makes sense, but can you reword the subjects that it describes the state after the commit (i.e. what you are doing), instead of before the commit? --

Re: [PATCH v7 25/31] prune: strategies for linked checkouts

2014-07-18 Thread Thomas Rast
ire; > + strbuf_addf(reason, _("Removing repos/%s: gitdir file does not > exist"), id); > + return 1; > + } [...] > +} > + > +static void prune_repos_dir(void) > +{ [...] > + struct stat st; [...] > + if (!prune_repo_

Re: [PATCH v1] rebase --root: sentinel commit cloaks empty commits

2014-07-18 Thread Thomas Rast
created by the user. > + # Exclude it from the rev list to avoid skipping > + # empty user commits prematurely, i. e. before > + # --keep-empty can take effect. > + revisions=$orig_head > + else > + revisions=$onto..

Re: [PATCH RFC v2 00/19] Enable options --signoff, --reset-author for pick, reword

2014-07-18 Thread Thomas Rast
th lowercase and many begin with >> capital, which makes the short-log output look distracting. > > The ones that begin with lower-case letters are the ones that begin with > the command name "reword". All first lines are typed in lower case now. You could spell it 

Re: [PATCH 10/10] t9904: new __git_ps1 tests for Zsh

2014-05-29 Thread Thomas Rast
t: I use bash as my shell and as /bin/sh, but I do have zsh installed. Can you look into it? -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH] l10n: de.po: translate 45 new messages

2014-04-25 Thread Thomas Rast
Ralf Thielow writes: > Translate 45 new messages came from git.pot update in 5e078fc > (l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)). Thanks for sending this with extra context, it really helps reviewing! With the small changes below, Acked-by: Thomas Rast > #: diffcore-ren

Re: [PATCH] Make XDF_NEED_MINIMAL default in blame.

2014-03-16 Thread Thomas Rast
Michael Andreen writes: > The --minimal flag is still there, but didn't want to break scripts > depending on it. If I specify --no-minimal, does that turn it off again? -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [PATCH] add: Use struct argv_array in run_add_interactive()

2014-03-16 Thread Thomas Rast
= 0; i < pathspec->nr; i++) > /* pass original pathspec, to be re-parsed */ > - args[ac++] = pathspec->items[i].original; > + argv_array_push(&argv, pathspec->items[i].original); > > - status = run_command_v_opt(args, RUN_GIT_CMD); &

Re: [PATCH] Rewrite diff-no-index.c:read_directory() to use is_dot_or_dotdot() and rename it to read_dir()

2014-03-16 Thread Thomas Rast
s at 72 characters. >> --- >> diff-no-index.c | 9 + The microproject idea said Rewrite diff-no-index.c:read_directory() to use is_dot_or_dotdot(). Try to find other sites that can use that function. Are there any others? -- Thomas Rast t...@thomasrast.ch -- To unsubscribe

Re: [PATCH] mv: prevent mismatched data when ignoring errors.

2014-03-15 Thread Thomas Rast
+ (argc - i) * sizeof(char *)); This isn't right -- you are computing the size of things to be moved based on a type of char*, but 'modes' is an enum. (Valgrind spotted this.) -- Thomas Rast t...@thomasrast.ch -- To unsubscri

Re: [PATCH] diff: do not reuse_worktree_file for submodules

2014-02-23 Thread Thomas Rast
Thomas Rast writes: > Junio C Hamano writes: > >> Thomas Rast writes: >> >>> @@ -2845,8 +2845,9 @@ static struct diff_tempfile *prepare_temp_file(const >>> char *name, >>> remove_tempfile_installed = 1;

Re: [PATCH v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged

2014-02-23 Thread Thomas Rast
Eric Sunshine writes: > On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast wrote: >> Using the new no_worktree flag from the previous commit, we can teach >> merge-recursive to leave the worktree untouched. Expose this with a >> new strategy option so that scripts can use it

Re: Fwd: git-reviewed: linking commits to review discussion in git

2014-02-22 Thread Thomas Rast
to see where it applies, and turned out to be wy too slow.) I'm no longer convinced that there's anything a computer can do beyond (author, authordate), anyway. Perhaps someone with a clue in UIs -- that's definitely not me -- could make a website where users can complete or correct

Re: [PATCH] sha1_file: fix delta_stack memory leak in unpack_entry

2014-02-22 Thread Thomas Rast
aking some objects loose at this phase >>> could help git-blame and how many objects will be loosened. Gotta go >>> soon, didn't really test it, but I bet it'll work. >> >> This looks correct to me. > > This comes from abe601bb, right? The change lo

Re: [PATCH] diff: do not reuse_worktree_file for submodules

2014-02-22 Thread Thomas Rast
Junio C Hamano writes: > Thomas Rast writes: > >> @@ -2845,8 +2845,9 @@ static struct diff_tempfile *prepare_temp_file(const >> char *name, >> remove_tempfile_installed = 1; >> } >> >> -if (!one->sha1_valid || >&

[PATCH v2 2/8] merge-recursive: internal flag to avoid touching the worktree

2014-02-22 Thread Thomas Rast
From: Thomas Rast o->call_depth has a double function: a nonzero call_depth means we want to construct virtual merge bases, but it also means we want to avoid touching the worktree. Introduce a new flag o->no_worktree to trigger only the latter. Signed-off-by: Thomas Rast Signed-off-by:

[PATCH v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged

2014-02-22 Thread Thomas Rast
From: Thomas Rast Using the new no_worktree flag from the previous commit, we can teach merge-recursive to leave the worktree untouched. Expose this with a new strategy option so that scripts can use it. Signed-off-by: Junio C Hamano --- Documentation/merge-strategies.txt | 4 merge

[PATCH v2 4/8] combine-diff: do not pass revs->dense_combined_merges redundantly

2014-02-22 Thread Thomas Rast
now, the next commit will simplify this to a single setting again. Signed-off-by: Thomas Rast --- builtin/diff.c | 3 +-- combine-diff.c | 13 ++--- diff-lib.c | 6 ++ diff.h | 6 +++--- log-tree.c | 2 +- submodule.c| 5 - 6 files changed, 17 inse

[PATCH v2 1/8] merge-recursive: remove dead conditional in update_stages()

2014-02-22 Thread Thomas Rast
From: Thomas Rast 650467c (merge-recursive: Consolidate different update_stages functions, 2011-08-11) changed the former argument 'clear' to always be true. Remove the useless conditional. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- merge-recursive.c | 6 ++--

[PATCH v2 6/8] merge-recursive: allow storing conflict hunks in index

2014-02-22 Thread Thomas Rast
ee. They could already get the _conflicts_ with --index-only, but not (conveniently) the conflict-hunk formatted files that would normally be written to the worktree. Signed-off-by: Thomas Rast --- Documentation/merge-strategies.txt | 5 + merge-recursive.c | 4 me

[PATCH v2 5/8] Fold all merge diff variants into an enum

2014-02-22 Thread Thomas Rast
variants without yet more special casing. It should also be slightly easier to read because one does not have to ensure that the flag bits are set in an expected combination. Signed-off-by: Thomas Rast --- builtin/diff-files.c| 5 +++-- builtin/diff-tree.c | 2 +- builtin/diff.c | 9

[PATCH v2 8/8] log --remerge-diff: show what the conflict resolution changed

2014-02-22 Thread Thomas Rast
ion is there, unlike with --cc; and the output is usually much shorter than with -c. Signed-off-by: Thomas Rast --- Documentation/rev-list-options.txt | 7 + log-tree.c | 298 + merge-recursive.c |

[PATCH v2 7/8] name-hash: allow dir hashing even when !ignore_case

2014-02-22 Thread Thomas Rast
The directory hash (for fast checks if the index already has a directory) was only used in ignore_case mode and so depended on that flag. Make it generally available on request. Signed-off-by: Thomas Rast --- cache.h | 2 ++ name-hash.c | 19 --- 2 files changed, 14

[PATCH v2 0/8] log --remerge-diff

2014-02-22 Thread Thomas Rast
cts. * Implemented some basic handling of directory/file conflicts. I'm not completely happy yet -- see the NEEDSWORK comments -- but at least it gives consistent input to the diffing stage. This required access to the dir hash, so there's a new patch 7 that makes this possible.

Re: Is there something like a blamed diff?

2014-02-17 Thread Thomas Rast
David Kastrup writes: > Thomas Rast writes: > >> David Kastrup writes: >> >>> When comparing two branches, decorating the flat diff with the >>> respectively responsible commits seems like it would be nice to do/have >>> (the blame on th

Re: Is there something like a blamed diff?

2014-02-17 Thread Thomas Rast
ng like that? This seems to come up every year or so: http://thread.gmane.org/gmane.comp.version-control.git/110369/focus=110383 -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More m

Re: diff weirdness (bug?)

2014-02-17 Thread Thomas Rast
n the file headers) git doesn't show the combined diff for hunks that fully agree with one side. So if you (even manually) resolve the merge so that it fully matches one side, that will not show up in a --cc diff. -- Thomas Rast t...@thomasrast.ch -- 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

Re: Profiling support?

2014-02-16 Thread Thomas Rast
David Kastrup writes: > Thomas Rast writes: > >> David Kastrup writes: >> >>> Looking in the Makefile, I just find support for coverage reports using >>> gcov. Whatever is there with "profile" in it seems to be for >>> profile-based compi

[PATCH] diff: do not reuse_worktree_file for submodules

2014-02-16 Thread Thomas Rast
odule commit $sha1", but the new-file is a directory in the worktree. Fix it by never reusing a worktree "file" in the submodule case. Reported-by: Grégory Pakosz Signed-off-by: Thomas Rast --- diff.c | 5 +++-- t/t4020-diff-external.sh | 30 +++

Re: Profiling support?

2014-02-16 Thread Thomas Rast
ctly be surprised if the gcov targets had bitrotted without anyone noticing. I haven't heard of any heavy users. I originally wrote them to do some basic test coverage analysis, but that's about it. -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line &

Re: [RFH] hackday and GSoC topic suggestions

2014-02-16 Thread Thomas Rast
Duy Nguyen writes: > On Sun, Feb 9, 2014 at 2:03 AM, Thomas Rast wrote: >> Easy: >> >> * Add -p 'e' when it fails to apply should offer an obvious way of >> starting from the original hunk (not the broken one) or both > > If it's too ea

Re: Git GSoC 2014

2014-02-15 Thread Thomas Rast
David Kastrup writes: > Thomas Rast writes: > >> Motivation: I believe that migrating to libgit2 is the better approach, >> medium term, than rewriting everything ourselves to be nice, clean and >> thread-safe. I took a shot a while ago at making the pack reading code

Re: Git GSoC 2014

2014-02-13 Thread Thomas Rast
Junio C Hamano writes: > Thomas Rast writes: > >> Downside: not listing "code merged" as a goal may not make the project >> as shiny, neither for Git nor for the student. > > I'd actually view that as an upside. This sounds like a good first > s

Re: Git GSoC 2014

2014-02-13 Thread Thomas Rast
out exception. Language: C Difficulty: hard Possible mentors: Thomas Rast and --- >8 --- That absolutely requires a co-mentor from the libgit2 side to do, however. Perhaps you could talk someone into it? ;-) Motivation: I believe that migrating to libgit2 is the better approach, medium term, than

Re: bash completion patch

2014-02-09 Thread Thomas Rast
t be a piece of > advice that is practically very useful, though ;-) That happens to me a lot, too. Perhaps it would be a clearer signal if you had an alias (or just something like gitster+patch) that we can send it to if we mean "please include" instead of "what do you think o

Re: [PATCH 12/13] Makefile: teach scripts to include make variables

2014-02-08 Thread Thomas Rast
&& # cd_to_toplevel && # [ "$(pwd -P)" = "$TOPLEVEL" ] # ) # I don't know why it only affects this test, or why it doesn't break when within 'git bisect run&#

Re: [PATCH] l10n: de.po: translate 27 new messages

2014-02-08 Thread Thomas Rast
David Kastrup writes: > Thomas Rast writes: > >> I don't really like 'gesondert eingehängt', how about 'transplantiert' >> instead? > > I suggest using the actual translation here as it is perfectly fitting > for both literal and figurative m

Re: [RFH] hackday and GSoC topic suggestions

2014-02-08 Thread Thomas Rast
ingle specific test under valgrind, using the normal git for the rest; and b) parallelize over (a) so as to speed up a complete ./t-foo.sh --valgrind run -- Thomas Rast t...@thomasrast.ch -- 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

Re: [RFH] hackday and GSoC topic suggestions

2014-02-08 Thread Thomas Rast
is thread. Sorry for being so procrastinative :-( I suggest we make it a rule that old projects cannot be proposed from year to year. -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel

Re: [PATCH] l10n: de.po: translate 27 new messages

2014-02-08 Thread Thomas Rast
tracks both %s and %s" > -msgstr "" > +msgstr "%s folgt %s und %s" In both of these the key point is "both". Perhaps use "sowohl... als auch". > #: wt-status.c:275 > -#, fuzzy > msgid "new file" > -msgstr "neue Datei: %s"

Re: [PATCH 3/4] line-log: convert to using diff_tree_sha1()

2014-02-06 Thread Thomas Rast
Kirill Smelkov writes: > Since diff_tree_sha1() can now accept empty trees via NULL sha1, we > could just call it without manually reading trees into tree_desc and > duplicating code. > > Cc: Thomas Rast > Signed-off-by: Kirill Smelkov > --- > line-log.c | 26 ++-

[RFC PATCH 9/9] log --remerge-diff: show what the conflict resolution changed

2014-02-04 Thread Thomas Rast
ion is there, unlike with --cc; and the output is usually much shorter than with -c. Signed-off-by: Thomas Rast --- Documentation/rev-list-options.txt | 7 ++ log-tree.c | 60 +++ merge-recursive.c | 3 +- merge-recursive.h

[PATCH 3/9] merge-recursive: -Xindex-only to leave worktree unchanged

2014-02-04 Thread Thomas Rast
From: Thomas Rast Using the new no_worktree flag from the previous commit, we can teach merge-recursive to leave the worktree untouched. Expose this with a new strategy option so that scripts can use it. Signed-off-by: Junio C Hamano --- Documentation/merge-strategies.txt | 4 merge

[PATCH 2/9] merge-recursive: internal flag to avoid touching the worktree

2014-02-04 Thread Thomas Rast
From: Thomas Rast o->call_depth has a double function: a nonzero call_depth means we want to construct virtual merge bases, but it also means we want to avoid touching the worktree. Introduce a new flag o->no_worktree to trigger only the latter. Signed-off-by: Thomas Rast Signed-off-by:

[PATCH 7/9] Fold all merge diff variants into an enum

2014-02-04 Thread Thomas Rast
variants without yet more special casing. It should also be slightly easier to read because one does not have to ensure that the flag bits are set in an expected combination. Signed-off-by: Thomas Rast --- builtin/diff-files.c| 5 +++-- builtin/diff-tree.c | 2 +- builtin/diff.c | 9

[POC PATCH 5/9] log: add a merge base inspection option

2014-02-04 Thread Thomas Rast
structures to track flags. This commit does not have to: the commit graph will be loaded anyway, and the room for flags is already there. As a big plus, this approach also works in a streaming fashion, showing the first few commits very quickly. Signed-off-by: Thomas Rast --- As indicated

[PATCH 8/9] merge-recursive: allow storing conflict hunks in index

2014-02-04 Thread Thomas Rast
ee. They could already get the _conflicts_ with --index-only, but not (conveniently) the conflict-hunk formatted files that would normally be written to the worktree. Signed-off-by: Thomas Rast --- Documentation/merge-strategies.txt | 5 + merge-recursive.c | 4 me

[PATCH 0/9] remerge diff proof of concept/RFC

2014-02-04 Thread Thomas Rast
Hi, This may look intimidating, but it's actually 3.5 separate things: merge-recursive: remove dead conditional in update_stages() merge-recursive: internal flag to avoid touching the worktree merge-recursive: -Xindex-only to leave worktree unchanged These are unchanged from tr/merge-recur

[POC PATCH 4/9] pretty: refactor add_merge_info() into parts

2014-02-04 Thread Thomas Rast
pp_commit_list() will be reused later. Signed-off-by: Thomas Rast --- Necessary only for the next patch, which may be of dubious value. commit.h | 1 + pretty.c | 40 ++-- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/commit.h b/commit.h

[PATCH 1/9] merge-recursive: remove dead conditional in update_stages()

2014-02-04 Thread Thomas Rast
From: Thomas Rast 650467c (merge-recursive: Consolidate different update_stages functions, 2011-08-11) changed the former argument 'clear' to always be true. Remove the useless conditional. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- merge-recursive.c | 6 ++--

[PATCH 6/9] combine-diff: do not pass revs->dense_combined_merges redundantly

2014-02-04 Thread Thomas Rast
now, the next commit will simplify this to a single setting again. Signed-off-by: Thomas Rast --- builtin/diff.c | 3 +-- combine-diff.c | 13 ++--- diff-lib.c | 6 ++ diff.h | 6 +++--- log-tree.c | 2 +- submodule.c| 5 - 6 files changed, 17 inse

Re: [PATCH 1/2] t/perf: time rev-list with UNINTERESTING commits

2014-01-20 Thread Thomas Rast
n-bare. For > some reason I assumed that the perf suite made a copy of the repo, but > it doesn't. If you point to a bare repo via GIT_PERF_REPO, this part of > the test fails. It does make a copy, but with cp -Rl. I haven't actually ever tried what happens if you point it at a

Re: [PATCH/WIP v2 00/14] inotify support

2014-01-20 Thread Thomas Rast
Thanks a lot for doing this! It's good that you picked it up, and I think your design strikes a good balance in the complexity of the protocol and the daemon's state. -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH/WIP v2 05/14] read-cache: put some limits on file watching

2014-01-19 Thread Thomas Rast
if (err) > return -1; > } > - if (has_watches) { > - int id, sz = (entries - removed + 7) / 8; > + if (has_watches || > + (istate->watcher != -1 && !istate->update_watches)) { > + int id, sz = (entries - removed + 7) / 8 + 1; > uint8_t *data = xmalloc(sz); > memset(data, 0, sz); > for (i = 0, id = 0; i < entries && has_watches; i++) { > @@ -2038,6 +2065,7 @@ int write_index(struct index_state *istate, int newfd) > } > id++; > } > + data[sz - 1] = istate->update_watches; > err = write_index_ext_header(&c, newfd, CACHE_EXT_WATCH, sz) < 0 > || ce_write(&c, newfd, data, sz) < 0; > free(data); -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH/WIP v2 02/14] read-cache: new extension to mark what file is watched

2014-01-19 Thread Thomas Rast
te possibly most users would watch *all* files. -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH/WIP v2 08/14] read-cache: add GIT_TEST_FORCE_WATCHER for testing

2014-01-19 Thread Thomas Rast
+ watch_lowerlimit = 0; > + recent_limit = 0; > + autorun_watcher = 1; > + } else > + git_config(watcher_config, NULL); > if (autorun_watcher == -1) > autorun_watc

Re: [PATCH/WIP v2 00/14] inotify support

2014-01-19 Thread Thomas Rast
/max_user_instances defaults to 128 on my systems. We need one inotify FD per watcher process, and given that a full android tree had something on the order of 300 repos last I looked, that just won't fly. As far as inotify corner-cases go, the only one I'm aware of is dir

[PATCH] Documentation: @{-N} can refer to a commit

2014-01-18 Thread Thomas Rast
The @{-N} syntax always referred to the N-th last thing checked out, which can be either a branch or a commit (for detached HEAD cases). However, the documentation only mentioned branches. Edit in a "/commit" in the appropriate places. Reported-by: Kevin Signed-off-by: Thomas Rast --

Re: [PATCH v3] stash: handle specifying stashes with spaces

2014-01-07 Thread Thomas Rast
t stash apply "stash@{ 0 }" It seems to refer to the same as stash@{0} as one would expect, while still triggering the bug with unpatched git-stash. -- Thomas Rast t...@thomasrast.ch -- 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

Re: [RFH/PATCH] graph: give an extra gap after showing root commit

2014-01-03 Thread Thomas Rast
* root_1 > + * further_0 > + * then_0 > + * root_0 > + EOF > + git log --graph --format=%s root0 root1 root2 >actual && > + test_cmp expect actual > +' -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH] l10n: de.po: fix translation of 'prefix'

2014-01-03 Thread Thomas Rast
Ralf Thielow writes: > The word 'prefix' is currently translated as 'Prefix' > which is not a German word. It should be translated as > 'Präfix'. Indeed :-) Thanks! -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "

Re: [PATCH] git-svn: workaround for a bug in svn serf backend

2013-12-30 Thread Thomas Rast
make any guarantees as to the order in which local variables are unreferenced and then destroyed? I can't find any such guarantee. In the absence of such, wouldn't we have to keep $upa in an outer, separate scope to ensure that $fbat is destroyed first? -- Thomas Rast t...@thomasrast.ch

Re: german translation bug

2013-12-28 Thread Thomas Rast
t (v.)" is "einreichen", whereas we had "committen" and before that "eintragen". As if there weren't enough confusion around German terminology yet. (FWIW I also think it's a terrible choice because it suggests a transaction between multiple people, which t

Re: Fwd: Error with git-svn pushing a rename

2013-12-25 Thread Thomas Rast
ed to add_file() in a local > variable, and rely on perl to keep it alive through the end of function > scope, beyond the call to close_file() where it's actually used. > > I'm going to submit a patch adding apr_pstrdup() to subversion folks. > Meanwhile if people find the

Re: [PATCH] do not pretend sha1write returns errors

2013-12-22 Thread Thomas Rast
; This is kind of a step backwards if we ever wanted to actually make > sha1write's return code mean anything. But I just don't foresee that > happening. Meh. It hasn't returned a useful value since its introduction in 2005. -- Thomas Rast t...@thomasrast.ch -- To unsubscri

Re: [PATCH v4 0/22] pack bitmaps

2013-12-21 Thread Thomas Rast
rn 0; create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset); display_progress(progress_state, to_pack.nr_objects); return 1; } Much nicer. Thanks for going the extra mile! -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: s

Re: [PATCH] gitk: Fix typo in proc blobdiffmaybeseehere

2013-12-19 Thread Thomas Rast
eof > } Ew. Sorry about that! It's very polite of you to call it a typo, but I think it's safe to blame it on my lack of practice in Tcl :-) -- Thomas Rast t...@thomasrast.ch -- 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

Re: What's cooking in git.git (Dec 2013, #02; Fri, 6)

2013-12-08 Thread Thomas Rast
Karsten Blees writes: > Am 07.12.2013 23:23, schrieb Thomas Rast: >> Karsten Blees writes: >> >>> Extending 'struct hashmap_entry' with an int-sized member shouldn't waste >>> memory on 64-bit systems. This is already documented in api-hashm

Re: What's cooking in git.git (Dec 2013, #02; Fri, 6)

2013-12-07 Thread Thomas Rast
d __attribute__((__packed__)) with some compiler detection in git-compat-util.h though. -- Thomas Rast t...@thomasrast.ch -- 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

Re: What's cooking in git.git (Dec 2013, #02; Fri, 6)

2013-12-07 Thread Thomas Rast
h my nits or not; either way I'm all for moving it forward and aiming for one of the next releases. -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH v3 21/21] pack-bitmap: implement optional name_hash cache

2013-12-07 Thread Thomas Rast
o master. Good job! > Signed-off-by: Vicent Marti > Signed-off-by: Jeff King Reviewed-by: Thomas Rast -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH v3 20/21] t/perf: add tests for pack bitmaps

2013-12-07 Thread Thomas Rast
, e.g. HEAD~1000, keeping the perf test reproducible over time (not over changing GIT_PERF_LARGE_REPO, of course). -- Thomas Rast t...@thomasrast.ch -- 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

Re: [PATCH v3 19/21] t: add basic bitmap functionality tests

2013-12-07 Thread Thomas Rast
ast check that using bitmaps does not break anything. > > Signed-off-by: Jeff King Reviewed-by: Thomas Rast One nit: > +test_expect_success JGIT 'jgit can read our bitmaps' ' > + git clone . compat-us.git && > + ( > + cd compat-us.git &a

Re: [PATCH v3 18/21] count-objects: recognize .bitmap in garbage-checking

2013-12-07 Thread Thomas Rast
having learned about ".bitmap" > files, the current code reports all such files as garbage > (case 1), even if their pack exists. Instead, they should be > treated as case 2. > > Signed-off-by: Nguyễn Thái Ngọc Duy > Signed-off-by: Jeff King Reviewed-by: Thomas Rast -

Re: [PATCH v3 17/21] repack: consider bitmaps when performing repacks

2013-12-07 Thread Thomas Rast
indexes if you are experimenting > and don't want them on all the time. > > Signed-off-by: Vicent Marti > Signed-off-by: Jeff King Reviewed-by: Thomas Rast -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe git" i

Re: [PATCH v3 16/21] repack: handle optional files created by pack-objects

2013-12-07 Thread Thomas Rast
kip them if they don't exist (and otherwise rely on > rename() to barf). > > Signed-off-by: Jeff King Reviewed-by: Thomas Rast -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.

Re: [PATCH v3 14/21] repack: stop using magic number for ARRAY_SIZE(exts)

2013-12-07 Thread Thomas Rast
Jeff King writes: > We have a static array of extensions, but hardcode the size > of the array in our loops. Let's pull out this magic number, > which will make it easier to change. > > Signed-off-by: Jeff King Reviewed-by: Thomas Rast (Ok, this one was easy.

Re: [PATCH v3 15/21] repack: turn exts array into array-of-struct

2013-12-07 Thread Thomas Rast
Jeff King writes: > This is slightly more verbose, but will let us annotate the > extensions with further options in future commits. > > Signed-off-by: Jeff King Reviewed-by: Thomas Rast -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "un

Re: [PATCH v3 13/21] pack-objects: implement bitmap writing

2013-12-07 Thread Thomas Rast
Reviewed-by: Thomas Rast You could fix this: > +pack.writebitmaps:: > + When true, git will write a bitmap index when packing all > + objects to disk (e.g., as when `git repack -a` is run). This ^^ Doesn't sound right in my ears.

Re: [PATCH v3 12/21] rev-list: add bitmap mode to speed up object lists

2013-12-07 Thread Thomas Rast
of the support code is from [10/21] ;-) Reviewed-by: Thomas Rast -- Thomas Rast t...@thomasrast.ch -- 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

  1   2   3   4   5   6   7   >