Re: Git GSoC 2014

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: Git GSoC 2014

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

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: [RFH] hackday and GSoC topic suggestions

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: Profiling support?

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 &

[PATCH] diff: do not reuse_worktree_file for submodules

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?

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

Re: diff weirdness (bug?)

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: Is there something like a blamed diff?

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: Is there something like a blamed diff?

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

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

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.

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

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 5/8] Fold all merge diff variants into an enum

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

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 4/8] combine-diff: do not pass revs->dense_combined_merges redundantly

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()

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 2/8] merge-recursive: internal flag to avoid touching the worktree

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 6/8] merge-recursive: allow storing conflict hunks in index

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 3/8] merge-recursive: -Xindex-only to leave worktree unchanged

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

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

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 || >&

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

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: Fwd: git-reviewed: linking commits to review discussion in git

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 v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged

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: [PATCH] diff: do not reuse_worktree_file for submodules

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] mv: prevent mismatched data when ignoring errors.

+ (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] Rewrite diff-no-index.c:read_directory() to use is_dot_or_dotdot() and rename it to read_dir()

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] add: Use struct argv_array in run_add_interactive()

= 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] Make XDF_NEED_MINIMAL default in blame.

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 v2 7/8] name-hash: allow dir hashing even when !ignore_case

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; >> >>

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

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()

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 v3 4/8] combine-diff: do not pass revs->dense_combined_merges redundantly

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

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

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

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 6/8] merge-recursive: allow storing conflict hunks in index

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

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

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 |

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

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 10/10] t9904: new __git_ps1 tests for Zsh

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 RFC v2 00/19] Enable options --signoff, --reset-author for pick, reword

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 v1] rebase --root: sentinel commit cloaks empty commits

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 v7 25/31] prune: strategies for linked checkouts

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 v2 04/23] rebase -i: hide interactive command messages in verbose mode

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

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 v2 23/23] rebase -i: enable options --signoff, --reset-author for pick, reword

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 20/23] rebase -i: parse to-do list command line options

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 04/23] rebase -i: hide interactive command messages in verbose mode

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 08/23] rebase -i: reword executes pre-commit hook on interim commit

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 v3] l10n: de.po: translate 68 new messages

Ralf Thielow writes: > Translate 68 new messages came from git.pot update in 727b957 > (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)). > > Signed-off-by: Ralf Thielow Acked-by: Thomas Rast Thanks for your work! -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from thi

[PATCH] config: arbitrary number of matches for --unset and --replace-all

. While the tests are rather more paranoid than just --unset and --replace-all, the other operations already worked. Indeed git-svn's usage only breaks the first time *after* creating so many entries, when it wants to unset and re-add them all. Reported-by: Jess Hottenstein Signed-off-by: T

[PATCH] config: arbitrary number of matches for --unset and --replace-all

homas Rast --- Eric Sunshine wrote: > On Wed, Nov 13, 2013 at 5:19 AM, Thomas Rast wrote: > > +setup_many() { [...] > > + cat >5to1 < > Broken &&-chain. Oops, thanks for catching. config.c| 19

Re: can we prevent reflog deletion when branch is deleted?

Sitaram Chamarty writes: > Whatever it was that happened to a hundred or more repos on the Jenkins > project seems to be stirring up this debate in some circles. Making us so curious ... and then you just leave us hanging there ;-) Any pointers to this debate? -- Thomas

Re: [PATCH] config: arbitrary number of matches for --unset and --replace-all

verflow. I was too lazy to think about it long enough to come up with a possible example that triggers this, and instead just put in the defensive ALLOC_GROW(). But if you can trigger it, it will probably cause the algorithm to go off the rails because it overwrote store.state and possibly even s

Re: [PATCH v3 0/21] pack bitmaps

(x&-x) = 001000 (x&-x) - 1 = 000111 popcount() of that is the number of trailing zeroes you started with. Please don't ask me to work out what happens in border cases; my head hurts already. [1] because x + ~x is all one bits. +1 makes it overflow to 0, so that x + -x

[PATCH v3 gitk 1/5] gitk: support -G option from the command line

From: Thomas Rast The -G option's usage is exactly analogous to that of -S, so supporting it is easy. Signed-off-by: Thomas Rast --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index 5cd00d8..0e95814 100755 --- a/gitk +++ b/gitk @@ -227,7 +

[PATCH v3 gitk 3/5] gitk: split out diff part in $commitinfo

From: Thomas Rast So far we just parsed everything after the headers into the "comment" bit of $commitinfo, including notes and -- if you gave weird options -- the diff. Split out the diff, if any, into a separate field. It's easy to recognize, since it always starts with

[PATCH v3 3/3] Documentation/gitk: document -L option

The -L option is the same as for git-log, so the entire block is just copied from git-log.txt. However, until the parser is fixed we add a caveat that gitk only understands the stuck form. Signed-off-by: Thomas Rast --- Documentation/gitk.txt | 16 1 file changed, 16

[PATCH v3 2/3] Documentation: convert to --option=arg form where possible

l that is a placeholder (all other options in the file already use this style). Signed-off-by: Thomas Rast --- Documentation/blame-options.txt| 4 ++-- Documentation/fetch-options.txt| 2 +- Documentation/git-branch.txt | 6 +++--- Documentation/git-checkout.txt

[PATCH v3 0/3] Documentation: stuck arguments and gitk log -L

etting consistency for free. 3/3 is the change to gitk(1) to match the 'gitk -L' support that I'm sending out separately (rebased to the gitk repo) and that will appear here: http://mid.gmane.org/cover.1384622392.git...@thomasrast.ch Of course it should only be applied once the

[PATCH v3 gitk 5/5] gitk: recognize -L option

From: Thomas Rast This gives line-log support to gitk, by exploiting the new support for processing and showing "inline" diffs straight from the git-log output. Note that we 'set allknown 0', which is a bit counterintuitive since this is a "known" option. Bu

[PATCH v3 gitk 0/5] gitk -L

e parallel series that will appear at http://mid.gmane.org/cover.1384622379.git...@thomasrast.ch Thomas Rast (5): gitk: support -G option from the command line gitk: refactor per-line part of getblobdiffline and its support gitk: split out diff part in $commitinfo gitk: support showing th

[PATCH v3 gitk 4/5] gitk: support showing the gathered inline diffs

From: Thomas Rast The previous commit split the diffs into a separate field. Now we actually want to show them. To that end we use the stored diff, and - process it once to build a fake "tree diff", i.e., a list of all changed files; - feed it through parseblobdiffline to actua

[PATCH v3 1/3] commit-tree: use prefixcmp instead of memcmp(..., N)

Handrolling the prefix comparison is harder to read and overruns if the argument is an empty string. Use our prefixcmp() instead. Signed-off-by: Thomas Rast --- builtin/commit-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/commit-tree.c b/builtin/commit

[PATCH v3 gitk 2/5] gitk: refactor per-line part of getblobdiffline and its support

From: Thomas Rast For later use with data sources other than a pipe, refactor the big worker part of getblobdiffline to a separate function parseblobdiffline. Also refactor its initialization and wrap-up to separate routines. Signed-off-by: Thomas Rast --- gitk | 408

Re: submodule update and core.askpass

DIRECTORIES GIT_CONFIG GIT_CONFIG_PARAMETERS GIT_OBJECT_DIRECTORY GIT_DIR GIT_WORK_TREE GIT_IMPLICIT_WORK_TREE GIT_GRAFT_FILE GIT_INDEX_FILE GIT_NO_REPLACE_OBJECTS GIT_PREFIX -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the bod

Re: Suggestion for git reference page

y work by pull requests, not patches, i.e. you should push your changes to a github fork of gitscm-next and send a pull request. -- 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

Re: GSoC 2014: Summary so far, discussion starter: how to improve?

Thomas Rast writes: > * Does libgit2 want to remain under the Git umbrella, or participate > on its own? > > * Figure out the wiki situation. In previous years the project > proposals and other important information were hosted at k.org [5] and > github wikis [6].

[RFC PATCH] Revamp git-cherry(1)

ral, so let's not confuse new users here, especially considering that git-config(1) does _not_ document this. Prompted-by: a.hue...@commend.com on #git Signed-off-by: Thomas Rast --- Documentation/git-cherry.txt | 73 +--- 1 file changed, 41 inse

Re: [RFC PATCH] Revamp git-cherry(1)

ow to > work with multiple branches. Perhaps we want both? Hmm. I'll ponder for a moment and try to cook something up for v2. I can't say exactly what, but after initially trying to keep it, something felt wrong to me about the ascii art. Perhaps it's that it is only vaguely related

Re: [RFC PATCH] Revamp git-cherry(1)

Jeff King writes: > On Thu, Nov 21, 2013 at 12:30:56PM +0100, Thomas Rast wrote: > >> +Later, you can whether your changes have been applied by saying (still >> +on `topic`): > > s/can/& see/ ? > >> +Note that this uses , and assumes that >> +`core.auto

[PATCH v2] Revamp git-cherry(1)

. I literally just learned that we support having several, so let's not confuse new users here, especially considering that git-config(1) does _not_ document this. Prompted-by: a.hue...@commend.com on #git Signed-off-by: Thomas Rast --- Junio C Hamano wrote: > > +EXAMPLES > > +

Re: What's cooking in git.git (Nov 2013, #05; Thu, 21)

er you renamed rlw_xor_run_bit() to something more fitting, so perhaps you just forgot that one thing but did all the rest. -- 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 (Nov 2013, #05; Thu, 21)

is > ewah_not). Hmm, so it really was that one unlucky thing :-) I don't have much to say on the area, but if you think it helps you I can set aside some time RSN to review the second half of the series, too. Back in June I only looked at the first half. -- Thomas Rast t...@thomasrast

Re: [PATCH v2] Revamp git-cherry(1)

igin/master`, while the commit B (marked with `+`) > still needs to be kept so that it will be sent to be applied > to `origin/master`. > > or somesuch? Good idea, thanks. Will integrate this more "what still needs to be integrated"-minded wording into a v3. --

Re: What's cooking in git.git (Nov 2013, #05; Thu, 21)

first thing that came to my mind from the original review, so I used it as an indicator to see if you had done something about it. It seems I picked an indicator that is not significant for the overall state. -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubsc

Re: What's cooking in git.git (Nov 2013, #05; Thu, 21)

e plan that you sketched in the other side thread sounded nice: give it some exposure in next. I'll still try and read the rest, but that way it hopefully gets (much) more testing. -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe gi

Re: [PATCH] git-svn: Support svn:global-ignores property

++-- > 2 files changed, 38 insertions(+), 20 deletions(-) Can you add a test or two? -- 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: gettext CTYPE for libc

rset); > setlocale(LC_CTYPE, "C"); > } Do you know why this "suddenly" broke? The long comment in init_gettext_charset() suggests that the *existing* code is there to handle exactly this problem, and apparently it doesn't. Why? Has libc moved the perror() strings into a se

Re: [PATCH v3 10/21] pack-bitmap: add support for bitmap indexes

hermore, would it be a problem to name the second hash sha1_int instead? I have another use for such a hash, and I can't imagine I'm the only one. (That's not critical however, I can do the required editing in that other series.) -- 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

[PATCH] Document khash

For squashing into a commit that adds khash.h. Signed-off-by: Thomas Rast --- > I think I'll also lend you a hand writing > Documentation/technical/api-khash.txt > (expect it tomorrow) so that we also have documentation in the git > style, where gitters can be expected to fin

[PATCH 1/2] commit-slab: document clear_$slabname()

The clear_$slabname() function was only documented by source code so far. Write something about it. Signed-off-by: Thomas Rast --- commit-slab.h | 4 1 file changed, 4 insertions(+) diff --git a/commit-slab.h b/commit-slab.h index d4c8286..d77aaea 100644 --- a/commit-slab.h +++ b/commit

[PATCH 2/2] commit-slab: declare functions "static inline"

This shuts up compiler warnings about unused functions. While there, also remove the redundant second declaration of stat_##slabname##realloc. Signed-off-by: Thomas Rast --- commit-slab.h | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/commit-slab.h b

[PATCH 0/2] commit-slab cleanups

I gathered these while writing an "all merge bases simultaneously" algorithm. Turns out this fancy algorithm loses vs. simply calling get_merge_bases() a lot, so I dropped that. But the cleanups seem valid anyway. Thomas Rast (2): commit-slab: document clear_$slabname() c

Re: [PATCH 2/2] commit-slab: declare functions "static inline"

Junio C Hamano writes: > Thomas Rast writes: > >> This shuts up compiler warnings about unused functions. > > Thanks. > >> While there, also remove the redundant second declaration of >> stat_##slabname##realloc. > > I think the latter was done very much

[PATCH v2] commit-slab: declare functions "static inline"

the same variable. Signed-off-by: Thomas Rast --- Here's a version that has a fat comment instead of the removal. Also, since I was rerolling anyway I put a reason why we need this. In the original motivation I actually created more functions afterwards, which made it more convincing, bu

Re: [PATCH v2] commit-slab: declare functions "static inline"

Jonathan Nieder writes: > Thomas Rast wrote: > >> This shuts up compiler warnings about unused functions. > > If that is the only goal, I think it would be cleaner to use > > #define MAYBE_UNUSED __attribute__((__unused__)) > > static MAYBE_UNUSED void

Re: [PATCH] bash prompt: add option to disable for a repository

E under git, you get an unbearable delay every time you open a > terminal, or type a command, anywhere, except for a separate git > repository. Umm... is __git_ps1 by itself so slow that you find it unbearable, or is it the worktree status discovery? Because the latter can already be controlled per

Re: How to pre-empt git pull merge error?

ensure that they get whatever they are supposed to deploy. (Using a merge to update is really terrible in the face of non-fast-forward updates, especially when caused by rewriting history to not include some commits.) -- 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] gitk: make pointer selection visible in highlighted lines

tag conf found -back $foundbgcolor > $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor > $ctext tag conf wwrap -wrap word > +$ctext tag raise sel > > .pwbottom add .bleft > if {!$use_ttk} { -- Thomas Rast t...@thomasrast.ch -- To unsubscrib

Re: [PATCH] subtree: fix argument validation in add/pull/push

> @@ -68,7 +68,7 @@ COMMANDS > > add:: > Create the subtree by importing its contents > - from the given or and remote . > + from the given or and remote . AFAICS you are changing refspec->commit in the manpage, but commit->ref in the usag

Re: [PATCH/WIP] Repair DF conflicts during fetch.

git branch dir && + ( + cd prune-df-conflict && + git fetch --prune && + git rev-parse origin/dir >../actual + ) && + git rev-parse dir >expect && + test_cmp expect actual +'

Re: [PATCH 1/2] commit-slab: document clear_$slabname()

Jonathan Nieder writes: > Thomas Rast wrote: > >> + * >> + * - void clear_indegree(struct indegree *); >> + * >> + * Free the slab's data structures. > > Tense shift (previous descriptions were in the present tense, while > this one is in the imp

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

mits. (use "git push" to publish your local commits) [blah blah] but with this patch: $ g stash apply stash@{0} --index --index is not valid reference Granted, git-stash is extremely inconsistent in its handling of options. For example, 'git stash save foo -k' does _

Re: [PATCH v3 10/21] pack-bitmap: add support for bitmap indexes

ISO C does not allow extra ‘;’ outside of a function [-Wpedantic] > +enum pack_bitmap_opts { > + BITMAP_OPT_FULL_DAG = 1, And I think this trailing comma on the last enum item is also strictly speaking not allowed, even though it is very nice to have: pack-bitmap.h:28:27: warning: comma at end of enumerator list [-Wpedantic] -- 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] stash: handle specifying stashes with spaces

uld lose by dropping the --symbolic in the line I quoted above (which is the second parsing pass), so that it resolves to a SHA1. We would gain some robustness, as I'm not sure "$REV:" works correctly in the face of weird revision expressions like ":/foo". -- Thomas R

Re: git stash doesn't honor --work-tree or GIT_WORK_TREE

not honor these. In fact it doesn't even honor --git-dir or --work-tree. > Judging by the name this may be intentional. Thanks for investigating this. Duy, you are the expert on the worktree detection logic. Do you know if there is a reason for --is-inside-work-tree to not honor the GIT_WORK_TREE

Re: git stash doesn't honor --work-tree or GIT_WORK_TREE

Duy Nguyen writes: > On Sun, Dec 1, 2013 at 6:12 PM, Thomas Rast wrote: >> Øystein Walle writes: >>> The problem seems to be that git rev-parse --is-inside-work-tree does >>> not honor these. In fact it doesn't even honor --git-dir or --work-tree. >

[PATCH] commit-slab: sizeof() the right type in xrealloc

When allocating the slab, the code accidentally computed the array size from s->slab (an elemtype**). The slab is an array of elemtype*, however, so we should take the size of *s->slab. Noticed-by: Nguyễn Thái Ngọc Duy Signed-off-by: Thomas Rast --- [I hope this comes through clean. gi

[PATCH 2/3] send-email: --smtp-ssl-cert-path takes an argument

nfigs anyway. Add the required "=s". Signed-off-by: Thomas Rast --- git-send-email.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-send-email.perl b/git-send-email.perl index f7468b6..9f31c68 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -291,

  1   2   3   4   5   6   7   >