We forgot to pass the Debug option through to Net::SMTP::SSL->new --
which is the same as Net::SMTP->new. This meant that with security
set to SSL, we would never enable debug output.
Pass through the flag.
Signed-off-by: Thomas Rast
---
git-send-email.perl | 1 +
1 file changed, 1 ins
SL socket, it does nothing to allow passing options to that
socket. So the SSL-relevant options are lost.
Fortunately there is an escape hatch: we can directly set the options
with IO::Socket::SSL::set_client_defaults. They will then persist
within the IO::Socket::SSL module.
Signed-off-by: Th
claims: it will ignore anything that looks like a .git directory,
regardless of the name. In particular GIT_DIR doesn't have anything to
do with it.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to maj
Ramkumar Ramachandra writes:
> Thomas Rast wrote:
>> When --smtp-encryption=ssl, we use a Net::SMTP::SSL connection,
>> passing its ->new all the options that would otherwise go to
>> Net::SMTP->new (most options) and IO::Socket::SSL->start_SSL (for the
>> SS
could walk the
'struct packed_git' list and see which open window the address belongs
to. I need to think about the implications of doing that in a signal
handler, though.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the
uot;other half" of the series that led
up to ce2c58cd?
http://thread.gmane.org/gmane.comp.version-control.git/227151/focus=237937
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.ke
I'm too tired to dig further, but AFAICT it's just a rather obvious case
of duplication of effort.
--
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
e = type;
> if (exclude)
> entry->preferred_base = 1;
> else
> nr_result++;
> +
> + if (flags & OBJECT_ENTRY_NO_TRY_DELTA)
> + entry->no_try_delta = 1;
> +
> if (found_pack) {
> entry->in_pack = found_pack;
> entry->in_pack_offset = found_offset;
> @@ -859,10 +932,21 @@ static int add_object_entry(const unsigned char *sha1,
> enum object_type type,
>
> display_progress(progress_state, to_pack.nr_objects);
>
> + return 1;
> +}
--
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
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
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.
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
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.
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.
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
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
-
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
,
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
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
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
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
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
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
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
; 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
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
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
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
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 "
* 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
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
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
--
+ watch_lowerlimit = 0;
> + recent_limit = 0;
> + autorun_watcher = 1;
> + } else
> + git_config(watcher_config, NULL);
> if (autorun_watcher == -1)
> autorun_watc
/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
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
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
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
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
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
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
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 ++--
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
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
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
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
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:
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
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
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 ++-
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"
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
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
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
&&
# 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&#
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
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
again in the future (by having the same blobs in the directory
again) and record it as a subtree or the 'tree' field of a commit. The
history would then again be invalid.
Should we add a --force flag of some sort to allow the user to do this,
while keeping the normal safety
detected by valgrind after
6a56993 (config: parse http.. using urlmatch,
2013-08-05) introduced tests covering url_normalize().
Signed-off-by: Thomas Rast
---
My apologies if this is redundant; I didn't have time to watch the
list over the last two weeks. However it seems today's pu is st
the changes. I particularly
like the better variable name.
--
Thomas Rast
trast@{inf,student}.ethz.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
Junio C Hamano writes:
> Nguyễn Thái Ngọc Duy writes:
>
>> Current code makes pack-objects always do check_pack_crc() in
>> unpack_entry() even if right after that we find out there's a cached
>> version and pack access is not needed. Swap two code blocks, search
>> for cached version first, the
Junio C Hamano writes:
> Thomas Rast writes:
>
>> Whether the option value is a separate argument in argv, or directly
>> stuck to the option.
>>
>> stuck: gitk -L:foo:main.c
>> unstuck: gitk -L :foo:main.c
>>
>> Existing gitk chokes on 'gi
Normalize to my personal address, as my ETH addresses will expire
soon. Also add my new corp account to be somewhat futureproof.
Note that despite the private address being first, Google owns the
copyright as long as I am employed there.
Signed-off-by: Thomas Rast
---
.mailmap | 4 +++-
1
ely_long_path_but_not_the_same_as_the_first &&
+ cp path1 long_dirname*/ &&
+ git add long_dirname*/path1 &&
+ test_commit add_long_pathname &&
+ git mv long_dirname*/path1 another_extremely_*/ &&
+ test_commit move_long_pathname &a
blog.blogspot.ch/2013/10/50-million-lines-of-code-and-counting.html
[4] http://thread.gmane.org/gmane.comp.version-control.git/221159
[5] https://git.wiki.kernel.org/index.php/SoC2011Projects
similarly for previous years
[6] https://github.com/peff/git/wiki/SoC-2012-Ideas
https://github
>"), try to omit as long as possible at first
> because later part or changing part will be the more important part.
> If it is not enough, shorten , trying to have the same
> maximum length.
> If it is not enough yet, omit .
>
> Signed-off-by: Tsuneo Yoshioka
> Tes
reset_index (reset.c:68)
==4959==by 0x476A72: cmd_reset (reset.c:346)
==4959==by 0x405999: run_builtin (git.c:314)
==4959==by 0x405B2C: handle_internal_command (git.c:477)
==4959==by 0x405C46: run_argv (git.c:523)
==4959==by 0x405DE2: main (git.c:606)
If you n
-by: Thomas Rast
---
t/test-lib.sh | 106 --
1 file changed, 22 insertions(+), 84 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0fa7dfd..eaf6759 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -205,15 +205,6 @@ do
(which says exactly which subtests fail) in
--valgrind-only=. So the latter is -- again Peff was right
-- the really useful thing.
The only consolation is that I apparently didn't break any other use
of the test suite -- otherwise it would presumably have been fixed
very quickly.
Thomas Ras
Now that ad0e623 (test-lib: support running tests under valgrind in
parallel, 2013-06-23) has been reverted, this support code has no
users any more. Revert it, too.
This reverts commit e939e15d241e942662b9f88f6127ab470ab0a0b9.
---
t/test-lib.sh | 27 ---
1 file changed,
: Thomas Rast
---
Jonathan Nieder wrote:
> Support for just the sticked form is better than nothing, especially
> if the gitk(1) manpage gains a note about it. In the long run I guess
> the ideal would be to add a parse-options-like library to the tcl
> support.
Ok. I'm general
urn ntohl(x);
}
#define ntoh_s(var) ntoh_s_force_align(&(var))
#define ntoh_l(var) ntoh_l_force_align(&(var))
#endif
--
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
l.git/228918/focus=228996
Otherwise that old review still applies ;-)
--
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
Junio C Hamano writes:
> Thomas Rast writes:
>
>> Theories
>>
>>
>> * Scope creep: projects tend to get blocked on some bigger
>> refactoring/restructuring task that was not in the original
>> proposal.
(Full disclosure: I actually propos
stepped up with reviews when I couldn't. So
maybe it'll again "just work out". But I would like to take this role,
and leave the "social" mentoring to others.
--
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
035de75581'
> +test_atom tag *objecttype 'commit'
Can you quote the *? I may have become somewhat paranoid, but still.
This is the first use of the * syntax, and test_atom seems
written to correctly quote its arguments, so why risk it? :-)
--
Thomas Rast
t...@thomasrast.ch
--
To
uch things. I just sent this pull request:
https://github.com/github/gitscm-next/pull/318
--
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
Thomas Rast writes:
> Michael Haggerty writes:
>
> On IRC you said you would like a version that always acts as
> --no-commit, and simply returns the conflict/no conflict bit as usual.
> The caller would then proceed using commit-tree itself. I think that is
> probably a s
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.
---
Unchanged.
Documentation/merge-strategies.txt | 4
merge-recursive.c
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
---
Unchanged.
merge-recursive.c | 6 ++
1 file changed, 2
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
---
Adapted
ntrol.git/168748
A much better argument would be if it was already clear from the specs
laid out for Fixes that n% of the kernel commits will end up having this
footer, and thus kernel hackers will spend x amount of time spelling out
--fixes and/or confusing it with --fixup to much headache.
git-config, where it is --file
Woah! Impressive work. Did you autogenerate this? If so, can we have
it as a small make target somewhere? If not, can you send a patch to
put your table in Documentation somewhere?
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the lin
t &&
#cmp current expected
ok 4 - first commit
ok 5 - update-index again
ok 6 - update-index --update from subdir
ok 7 - update-index --update with pathspec
# failed 1 among 7 test(s)
1..7
The errors for tests 5-7 look like they're the same piece of
t;change-id"]
type = uuid
though admittedly I haven't investigated if it's okay to just put a
random string there, or it needs to have a specific value.
[1] http://thread.gmane.org/gmane.comp.version-control.git/236429
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe
The -L option is the same as for git-log, so the entire block is just
copied from git-log.txt.
Signed-off-by: Thomas Rast
---
Documentation/gitk.txt | 12
1 file changed, 12 insertions(+)
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index d44e14c..0f1c7f8 100644
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
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-git/gitk | 408
The next patch will document gitk -L, but gitk does not understand the
separated form ('gitk -L :foo:bar' results in an error). Spell
git-blame and git-log -L, which are supposed to be "the same" option,
without the spaces to prevent confusion.
Signed-off-by: Thomas Rast
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-git/gitk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 5cd00d8..0e95814 100755
--- a/git
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
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
Thomas Rast wrote:
> Jonathan Nieder wrote:
> > Support for just the sticked form is better than nothing, especially
> > if the gitk(1) manpage gains a note about it. In the long run I guess
> > the ideal would be to add a parse-options-like library to the tcl
> > suppo
e to size of repo).
What does your config look like now?
You should have only one svn-remote with one url, but it can have
multiple .fetch entries. To fetch all branches, you can also just
configure its .branches.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line
Junio C Hamano writes:
> Thomas Rast writes:
>
>> The next patch will document gitk -L, but gitk does not understand the
>> separated form ('gitk -L :foo:bar' results in an error). Spell
>> git-blame and git-log -L, which are supposed to be "the same&qu
Junio C Hamano writes:
> Thomas Rast writes:
>
>> 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-git/gitk | 2 +-
>
&g
.tf.histframe.pwclist add $canv
> +${NS}::scrollbar $cscrollhl -command {$canv xview} -orient horizontal
> +if {!$use_ttk} {$cscrollhl configure -highlightthickness 0}
> +pack $cscrollhl -fill x -side bottom
> +
> set canv2 .tf.histframe.pwclist.canv2
> canvas $can
ave only a single remote, along the
lines of:
[svn-remote "svn"]
url = https://some_host/
fetch = trunk:refs/remotes/git-svn
fetch = branches/stable-2012-09-13:refs/remotes/stable-2012-09-13
or possibly, instead of manually listing the branches you want,
ly because there are too
many).
However we already have one feature in a similar vein: the tickbox "Hide
remote refs" in Edit->Preferences. Shouldn't your feature go alongside
it, and be configured in the same way?
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from thi
Junio C Hamano writes:
> Thomas Rast writes:
>
>> Junio C Hamano writes:
>>
>>> I agree that this patch may reduce confusion locally, but if we were
>>> to go in this direction, we should be consistent and enforce "stuck"
>>> form everywhe
-- since you dropped the earlier note to the same effect -- I still
consider this "hold until Michael finds a use for 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.
e specific.
- set-branches: kept the main usage, which is more concise in saying
that --add is optional
Reported-by: Trần Ngọc Quân
Signed-off-by: Thomas Rast
---
Trần Ngọc Quân wrote:
> On 02/11/2013 09:23, Jiang Xin wrote:
> > Confirmed, there is a typo in builtin/remote.c line 15. Have
101 - 200 of 694 matches
Mail list logo
