On 12/19/2016 07:23 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> Especially given that the output is not especially machine-readable, it
>> might be more consistent with other commands to call the new feature
>> `--verbose` rather than `--report-errors`.
>
> Don't we instead want to
On 12/19/2016 02:19 PM, Ian Jackson wrote:
> Michael Haggerty writes ("Re: [PATCH 1/5] check-ref-format: Refactor out
> check_one_ref_format"):
>> On 11/04/2016 08:13 PM, Ian Jackson wrote:
>>> +static int check_one_ref_format(const char *refname)
> ...
>> This function needs to `return 0` if it g
On Mon, Dec 19, 2016 at 01:57:29PM -0800, Junio C Hamano wrote:
> Max, I see this is a resend from a few days ago
Sorry about resend. For some reason I don't get the list
copy (might be some clever duplicate elimination in my
forwardings), and marc.info seems to be slow to update, so I
had no indi
On Tue, Dec 20, 2016 at 1:15 AM, Stefan Beller wrote:
> On Sun, Dec 18, 2016 at 9:35 PM, Duy Nguyen wrote:
>> On Mon, Dec 12, 2016 at 11:04:35AM -0800, Stefan Beller wrote:
>>> diff --git a/dir.c b/dir.c
>>> index e0efd3c2c3..d872cc1570 100644
>>> --- a/dir.c
>>> +++ b/dir.c
>>> @@ -2773,3 +2773,
Johannes Schindelin writes:
> Hi Junio,
>
> On Thu, 15 Dec 2016, Junio C Hamano wrote:
>
>> Johannes Schindelin writes:
>>
>> > + strbuf_addstr(&buf, "GIT_AUTHOR_NAME='");
>> > + while (*message && *message != '\n' && *message != '\r')
>> > + if (skip_prefix(message, " <", &message))
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The second (rather large) batch of
On Dec 19, 2016, at 15:26, Junio C Hamano wrote:
> "Kyle J. McKay" writes:
>
>>> OK. So we do not expect it to fail, but we still do want the side
>>> effect of that function (i.e. accmulation into the field).
>>>
>>> Somebody care to send a final "agreed-upon" version?
>>
>> Yup, here it is:
>
Hello complement of the season
I'M Anessa female 25 years old single, I am contacting you because I will be
relocating to your country. I will send you my photos soon as i hear from you
and also tell you much about my self.
Thanks.
Sincerely yours
Anessa.
Other than Brandon's issue on 3/5 (which I noticed myself but wanted to
double-check that my mailer wasn't playing tricks on me and so lost the race to
report), this version looks good.
> -Original Message-
> From: Stefan Beller [mailto:sbel...@google.com]
> Sent: Monday, December 19, 20
On Mon, Dec 19, 2016 at 3:32 PM, Brandon Williams wrote:
>> + strbuf_addstr(&err, "git ");
>> + for (i = 0; cmd->argv[i]; )
>
> Missing the increment of i here.
Doh :(
When writing the code I was undecided between using
an incremental loop "for (i = 0; cmd->argv[i]; i++)" and
a
On 12/19, Stefan Beller wrote:
> In a later patch we want to report the exact command that we run in the
> error message. Add a convenient way to the run command API that runs the
> given command or reports the exact command as failure.
>
> Signed-off-by: Stefan Beller
> ---
> run-command.c | 28
On Mon, Dec 19, 2016 at 12:50 PM, Junio C Hamano wrote:
>
> -- >8 --
> Subject: rebase -i: fix mistaken i18n
>
> f2d17068fd ("i18n: rebase-interactive: mark comments of squash for
> translation", 2016-06-17) attempted to apply sh-i18n and failed to
> use $(eval_gettext "string with \$variable int
Instead of constructing the NULL terminated array ourselves, we
should make use of the argv_array infrastructure.
While at it, adapt the error messages to reflect the actual invocation.
Signed-off-by: Stefan Beller
---
submodule.c | 14 --
1 file changed, 4 insertions(+), 10 deletio
In different contexts the question "Is it ok to delete a submodule?"
may be answered differently.
In 293ab15eea (submodule: teach rm to remove submodules unless they
contain a git directory, 2012-09-26) a case was made that we can safely
ignore ignored untracked files for removal as we explicitely
When deleting a submodule, we need to keep the actual git directory around,
such that we do not lose local changes in there and at a later checkout
of the submodule we don't need to clone it again.
Now that the functionality is available to absorb the git directory of a
submodule, rewrite the chec
In a later patch we want to report the exact command that we run in the
error message. Add a convenient way to the run command API that runs the
given command or reports the exact command as failure.
Signed-off-by: Stefan Beller
---
run-command.c | 28
run-command.h
v4:
* reworded commit messages of the last 2 patches
* introduced a new patch introducing {run,start,finish}_command_or_die
* found an existing function in dir.h to use to remove a directory
which deals gracefully with the cornercases, that Junio pointed out.
v3:
* removed the patch to enhance o
As the upcoming series will add a lot of functions to the submodule
header, let's first make the header consistent to the rest of the project
by adding the extern keyword to functions.
As per the CodingGuidelines we try to stay below 80 characters per line,
so adapt all those functions to stay bel
Stefan Beller writes:
> On Mon, Dec 19, 2016 at 2:54 PM, Junio C Hamano wrote:
>> Stefan Beller writes:
>>
>>> This goes on top of sb/submodule-embed-gitdir.
>>> When the absorbing of a git dir fails, try to recover into a sane state,
>>> i.e. try to undo the move of the git dir.
>>
>> Are thes
"Kyle J. McKay" writes:
>> OK. So we do not expect it to fail, but we still do want the side
>> effect of that function (i.e. accmulation into the field).
>>
>> Somebody care to send a final "agreed-upon" version?
>
> Yup, here it is:
Thanks.
> -- 8< --
>
> Since 6b4b013f18 (mailinfo: handle i
On Mon, Dec 19, 2016 at 2:25 PM, Brandon Williams wrote:
> On 12/19, Stefan Beller wrote:
>> Relocating a git directory consists of 3 steps:
>> 1) Move the directory.
>> 2) Update the gitlink file.
>> 3) Set core.worktree correctly.
>>
>> In an ideal world all three steps would be part of one tran
On Mon, Dec 19, 2016 at 2:54 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> This goes on top of sb/submodule-embed-gitdir.
>> When the absorbing of a git dir fails, try to recover into a sane state,
>> i.e. try to undo the move of the git dir.
>
> Are these unconditionally good improvemen
On Dec 19, 2016, at 13:01, Junio C Hamano wrote:
> Jonathan Tan writes:
>
This is obviously an improvement, but it makes me wonder if we
should be
doing:
if (!check_header(mi, &mi->inbody_header_accum, mi->s_hdr_data))
die("BUG: some explanation of why this can
Stefan Beller writes:
> This goes on top of sb/submodule-embed-gitdir.
> When the absorbing of a git dir fails, try to recover into a sane state,
> i.e. try to undo the move of the git dir.
Are these unconditionally good improvements? I ask because the
series is still not in 'next' and it is th
From: "Michael Haggerty"
This patch series changes a bunch of details about how remote-tracking
references are rendered in the commit list of gitk:
[...]
* Introduce a separate constant to specify the background color used
for the branch name part of remote-tracking references, to allow it
On Mon, Dec 19, 2016 at 3:12 AM, Mike Hommey wrote:
> In typical uses of fast-import, trees are inherited from a parent
> commit. In that case, the tree_entry for the branch looks like:
>
> .versions[1].sha1 = $some_sha1
> .tree =
>
> However, when trees are imported, rather than inherited, t
On 12/19, Stefan Beller wrote:
> Relocating a git directory consists of 3 steps:
> 1) Move the directory.
> 2) Update the gitlink file.
> 3) Set core.worktree correctly.
>
> In an ideal world all three steps would be part of one transaction, such
> that either all of them happen correctly or none
Marc Branchaud writes:
> Signed-off-by: Marc Branchaud
> ---
>
> On 2016-12-18 07:48 PM, Chris Packham wrote:
>>
>> This feature already exists (although it's not interactive). See
>> help.autoCorrect in the git-config man page. "git config
>> help.autoCorrect -1" should to the trick.
>
> Awesom
This goes on top of sb/submodule-embed-gitdir.
When the absorbing of a git dir fails, try to recover into a sane state,
i.e. try to undo the move of the git dir.
Thanks,
Stefan
Stefan Beller (2):
dir.c: split up connect_work_tree_and_git_dir
dir.c: add retry logic to relocate_gitdir
dir.c
Relocating a git directory consists of 3 steps:
1) Move the directory.
2) Update the gitlink file.
3) Set core.worktree correctly.
In an ideal world all three steps would be part of one transaction, such
that either all of them happen correctly or none of them.
However currently we just execute th
In a later patch we want to treat the failures of each of the two steps
differently, so split them up first.
Signed-off-by: Stefan Beller
---
dir.c | 28 +---
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/dir.c b/dir.c
index d872cc1570..b2cb23fe88 100644
Max Kirillov writes:
> UNICODE_STRING::Length field means size of buffer in bytes[1], despite of
> buffer
> itself being array of wchar_t. Because of that terminating zero is placed
> twice
> as far. Fix it.
>
> [1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa380518.aspx
>
> Sign
Hi Dscho,
>> However, maintaining more than one directory (like "sequencer" for
>> sequencer state and "rebase-merge" for rebase todo and log) can cause
>> the necessity to be even more careful when hacking on sequencer... For
>> example, the cleanup code must delete both of them, not only one of
UNICODE_STRING::Length field means size of buffer in bytes[1], despite of buffer
itself being array of wchar_t. Because of that terminating zero is placed twice
as far. Fix it.
[1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa380518.aspx
Signed-off-by: Max Kirillov
---
Access outsi
larsxschnei...@gmail.com writes:
> From: Lars Schneider
>
> The `git lfs track` command generates a .gitattributes file with diff
> and merge properties [1]. Set the same .gitattributes format for files
> tracked with GitLFS in git-p4.
>
> [1]
> https://github.com/git-lfs/git-lfs/blob/v1.5.3/com
larsxschnei...@gmail.com writes:
> From: Lars Schneider
>
> In a9e38359e3 we taught git-p4 a way to re-encode path names from what
> was used in Perforce to UTF-8. This path re-encoding worked properly for
> "added" paths. "Removed" paths were not re-encoded and therefore
> different from the "ad
Duy Nguyen writes:
> I've read through the series (*) and I think it looks good, just a few
> minor comments here and there.
>
> (*) guiltily admit that I only skimmed through tests, not giving them
> as much attention as I should have
OK. I'd still want to see them get reviewed, though. P
Jonathan Tan writes:
>>> This is obviously an improvement, but it makes me wonder if we should be
>>> doing:
>>>
>>> if (!check_header(mi, &mi->inbody_header_accum, mi->s_hdr_data))
>>> die("BUG: some explanation of why this can never happen");
>>>
>>> which perhaps documents the intended as
On Mon, Nov 28, 2016 at 1:43 AM, Nguyễn Thái Ngọc Duy wrote:
> +
> + if (S_ISGITLINK(ce->ce_mode)) {
> + found_submodules = 1;
> + break;
> + }
While I applaud being careful with submodules, I
On 12/19/2016 12:38 PM, Kyle J. McKay wrote:
On Dec 19, 2016, at 12:03, Jeff King wrote:
On Sat, Dec 17, 2016 at 11:54:18AM -0800, Kyle J. McKay wrote:
Since 6b4b013f18 (mailinfo: handle in-body header continuations,
2016-09-20, v2.11.0) mailinfo.c has contained new code with an
assert of the
Junio C Hamano writes:
> Comparing these changes that involve "\$variable" ...
>
> dashless=$(basename -- "$0" | sed -e 's/-/ /')
> usage() {
> - die "usage: $dashless $USAGE"
> + die "$(eval_gettext "usage: \$dashless \$USAGE")"
> ... and these that appear in
Stefan Beller writes:
> + Vasco Almeida, who authored d323c6b641,
> (i18n: git-sh-setup.sh: mark strings for translation, 2016-06-17)
Comparing these changes that involve "\$variable" ...
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index c48139a494..2eda134800 100644
--- a/git-sh-setup.sh
++
On Dec 19, 2016, at 12:03, Jeff King wrote:
On Sat, Dec 17, 2016 at 11:54:18AM -0800, Kyle J. McKay wrote:
Since 6b4b013f18 (mailinfo: handle in-body header continuations,
2016-09-20, v2.11.0) mailinfo.c has contained new code with an
assert of the form:
assert(call_a_function(...))
On Sat, Dec 17, 2016 at 11:54:18AM -0800, Kyle J. McKay wrote:
> Since 6b4b013f18 (mailinfo: handle in-body header continuations,
> 2016-09-20, v2.11.0) mailinfo.c has contained new code with an
> assert of the form:
>
> assert(call_a_function(...))
>
> The function in question, check_head
On Mon, Dec 19, 2016 at 05:24:32PM +, Ramsay Jones wrote:
> > t0021.15 creates files, adds them to the index, and commits them. All
> > this usually happens in a test run within the same second and Git cannot
> > know if the files have been changed between `add` and `commit`. Thus,
> > Git ha
Am 18.12.2016 um 16:37 schrieb Johannes Sixt:
winansi.c is all about overriding MSVCRT's console handling. If we are
connected to a console, then by the time isatty() is called (from
outside the emulation layer), all handling of file descriptors 1 and 2
is already outside MSVCRT's control. In par
Hello all,
On Sun, 18 December 2016 at 20:59, Alexei Lozovsky wrote,
> It's definitely a good thing for human users. For example, I am
> annoyed
> from time to time when I type in some long spell, mistype one minor
> thing,
> and the whole command fails. Then I need to press , correct the
> obviou
Johannes Schindelin writes:
> The interactive rebase keeps the user informed about its progress.
> If the sequencer wants to do the grunt work of the interactive
> rebase, it also needs to show that progress.
>
> Signed-off-by: Johannes Schindelin
> ---
> sequencer.c | 32 ++
Johannes Schindelin writes:
> In the upcoming patch, we will support rebase -i's progress
> reporting. The progress skips comments but counts 'noop's.
>
> Signed-off-by: Johannes Schindelin
> ---
> sequencer.c | 15 +--
> 1 file changed, 9 insertions(+), 6 deletions(-)
> diff --git
Johannes Schindelin writes:
> The sequencer already has an idea about using different merge
> strategies. We just piggy-back on top of that, using rebase -i's
> own settings, when running the sequencer in interactive rebase mode.
>
> Signed-off-by: Johannes Schindelin
> ---
> sequencer.c | 26 +
On Mon, Dec 19, 2016 at 10:25 AM, Brandon Williams wrote:
> Teach push the --recurse-submodules=only option. This enables push to
> recursively push all unpushed submodules while leaving the superproject
> unpushed.
>
> This is a desirable feature in a scenario where updates to the
> superproject
Johannes Schindelin writes:
>> > + strbuf_addf(&buf, "%s/patch", get_dir(opts));
>> > + memset(&log_tree_opt, 0, sizeof(log_tree_opt));
>> > + init_revisions(&log_tree_opt, NULL);
>> > + log_tree_opt.abbrev = 0;
>> > + log_tree_opt.diff = 1;
>> > + log_tree_opt.diffopt.output_format = DIFF_
Brandon Williams writes:
> This series teaches 'git push' to be able to only push submodules
> while leaving a superproject unpushed.
> ...
> builtin/push.c | 2 ++
My knee-jerk reaction is "why is this even part of 'git push' if it
does not push?"
I think "git submodule forea
Johannes Schindelin writes:
> On Tue, 13 Dec 2016, Junio C Hamano wrote:
>
>> Linus Torvalds writes:
>>
>> > On Tue, Dec 13, 2016 at 12:38 PM, Junio C Hamano wrote:
>> >> Johannes Schindelin writes:
>> >>
>> >>> +/*
>> >>> + * Note that ordering matters in this enum. Not only must it match th
Teach push the --recurse-submodules=only option. This enables push to
recursively push all unpushed submodules while leaving the superproject
unpushed.
This is a desirable feature in a scenario where updates to the
superproject are handled automatically by some other means, perhaps a
code review
Add the `RECURSE_SUBMODULES_ONLY` enum value to submodule.h. This enum
value will be used in a later patch to push to indicate that only
submodules should be pushed, while the superproject should remain
unpushed.
Signed-off-by: Brandon Williams
---
submodule-config.c | 2 ++
submodule.h
All of the #defines for the TRANSPORT_* flags are hardcoded to be powers
of two. This can be error prone when adding a new flag and is difficult
to read. This patch refactors these defines to instead use a shift
operation to generate the flags. This makes adding an additional flag
simpilar and m
This series teaches 'git push' to be able to only push submodules while leaving
a superproject unpushed.
This is a desirable feature in a scenario where updates to the
superproject are handled automatically by some other means, perhaps a
code review tool. In this scenario a developer could make a
Michael Haggerty writes:
> Especially given that the output is not especially machine-readable, it
> might be more consistent with other commands to call the new feature
> `--verbose` rather than `--report-errors`.
Don't we instead want to structure the output to be machine-readable
instead, giv
Johannes Schindelin writes:
>> Otherwise I'd prefer to drop it---at this point, the series is merely
>> "just because we can", not "because we need it to further improve this
>> or that".
>
> Oh, I thought that this was meant as a starting point for anybody
> interested in playing with resumable
On Sun, Dec 18, 2016 at 9:35 PM, Duy Nguyen wrote:
> On Mon, Dec 12, 2016 at 11:04:35AM -0800, Stefan Beller wrote:
>> diff --git a/dir.c b/dir.c
>> index e0efd3c2c3..d872cc1570 100644
>> --- a/dir.c
>> +++ b/dir.c
>> @@ -2773,3 +2773,15 @@ void connect_work_tree_and_git_dir(const char
>> *work_t
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> Will this fix the problem I'm replying to? I don't know. I found this
> while checking the code and it should be fixed regardless.
Yeah, from a cursory read, it is a step in the right direction to
check the return val
On 19 December 2016 at 17:49, Junio C Hamano wrote:
> George Vanburgh writes:
>
>> From: George Vanburgh
>>
>> When importing from multiple perforce paths - we may attempt to import
>> a changelist that contains files from two (or more) of these depot
>> paths. Currently, this results in multipl
George Vanburgh writes:
> From: George Vanburgh
>
> When importing from multiple perforce paths - we may attempt to import
> a changelist that contains files from two (or more) of these depot
> paths. Currently, this results in multiple git commits - one
> containing the changes, and the other(s
Hi,
On Sat, 17 Dec 2016, Kyle J. McKay wrote:
> Since 6b4b013f18 (mailinfo: handle in-body header continuations,
> 2016-09-20, v2.11.0) mailinfo.c has contained new code with an
> assert of the form:
>
> assert(call_a_function(...))
>
> The function in question, check_header, has side eff
Hi Junio,
On Fri, 16 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > An interactive rebase operates on a detached HEAD (to keep the reflog
> > of the original branch relatively clean), and updates the branch only
> > at the end.
> >
> > Now that the sequencer learns to perfo
On Tue, Dec 13, 2016 at 3:14 PM, Brandon Williams wrote:
> Teach simplify_away() and exclude_matches_pathspec() to handle struct
> pathspec directly, eliminating the need for the struct path_simplify.
>
> Also renamed the len parameter to pathlen in exclude_matches_pathspec()
> to match the parame
On 18/12/16 12:37, larsxschnei...@gmail.com wrote:
> From: Lars Schneider
>
> t0021.15 creates files, adds them to the index, and commits them. All
> this usually happens in a test run within the same second and Git cannot
> know if the files have been changed between `add` and `commit`. Thus,
Hi Junio,
On Fri, 16 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The scripted version of the interactive rebase already does that.
>
> Sensible. I was wondering why this wasn't there while reviewing
> 10/34, comparing the two (this is not a suggestion to squash this
>
On Mon, Dec 19, 2016 at 05:59:06PM +0100, Johannes Schindelin wrote:
> > > > + sprintf((char *)p, "%d", ++count);
> > >
> > > Do we know the area pointed at p (which is inside buf) long enough
> > > not to overflow? If the original were 9 and you incremented to get
> > > 10, you wo
Hi Hannes,
On Tue, 13 Dec 2016, Johannes Sixt wrote:
> Dscho, it looks like this could fix the original report at
> https://github.com/git-for-windows/git/issues/979
Yes, thank you so much for fixing it!
I think your v2 is safe enough to cherry-pick directly into Git for
Windows' `master`.
T
Hi Peff,
On Thu, 15 Dec 2016, Jeff King wrote:
> On Tue, Dec 13, 2016 at 04:30:01PM +0100, Johannes Schindelin wrote:
>
> > + else {
> > + unsigned char head[20];
> > + struct commit *head_commit;
> > + const char *head_message, *body;
> > +
> > + if (ge
+ Vasco Almeida, who authored d323c6b641,
(i18n: git-sh-setup.sh: mark strings for translation, 2016-06-17)
On Sun, Dec 18, 2016 at 1:44 PM, Josh Bleecher Snyder
wrote:
>>> To reproduce, run 'git submodule' from within a bare repo. Result:
>>>
>>> $ git submodule
>>> fatal: $program_name cannot b
Hi Junio,
On Thu, 15 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > + strbuf_addstr(&buf, "GIT_AUTHOR_NAME='");
> > + while (*message && *message != '\n' && *message != '\r')
> > + if (skip_prefix(message, " <", &message))
> > + break;
> > +
Signed-off-by: Marc Branchaud
---
On 2016-12-18 07:48 PM, Chris Packham wrote:
>
> This feature already exists (although it's not interactive). See
> help.autoCorrect in the git-config man page. "git config
> help.autoCorrect -1" should to the trick.
Awesome, I was unaware of this feature. Than
Hi Peff,
On Thu, 15 Dec 2016, Jeff King wrote:
> On Thu, Dec 15, 2016 at 10:42:53AM -0800, Junio C Hamano wrote:
>
> > > + sprintf((char *)p, "%d", ++count);
> >
> > Do we know the area pointed at p (which is inside buf) long enough
> > not to overflow? If the original were 9 and you i
Hi Junio,
On Thu, 15 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > diff --git a/sequencer.c b/sequencer.c
> > index f6e20b142a..271c21581d 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -45,6 +45,35 @@ static GIT_PATH_FUNC(rebase_path_todo,
> > "rebase-merge/gi
This replaces the functionality of the old `singletag` variable.
Signed-off-by: Michael Haggerty
---
gitk | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/gitk b/gitk
index 7c830c3..502f0aa 100755
--- a/gitk
+++ b/gitk
@@ -6561,7 +6561,6 @@ proc drawtags {id x xt y1
Instead of coloring the reference name part of remote-tracking
references the same bright green as used for local branches, change it
to a subtler brown. Change the remote name color to go better with the
brown.
I chose these colors because
* Remote-tracking references are less important than loc
This is the value used for references other than tags, heads, and
remote-tracking references (e.g., `refs/stash`).
Signed-off-by: Michael Haggerty
---
gitk | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gitk b/gitk
index 44f4d70..0bd4aa5 100755
--- a/gitk
+++ b/gitk
This is clearer, and also lets us avoid calling `remotereftext` a second
time for normal branches.
Signed-off-by: Michael Haggerty
---
gitk | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gitk b/gitk
index d22ce5f..44f4d70 100755
--- a/gitk
+++ b/gitk
@@ -6613,9 +661
If a reference has the form
refs/remotes/origin/foo
, then use the label
origin/foo
^^^
, where the indicated part is displayed in `$remotebgcolor`. The old
code would have displayed such a reference as
remotes/origin/foo
^^^
, which wastes horizontal space
It's no longer, and a little bit more direct, to fill in `wvals` at the
same time as we determine the tag's type.
Signed-off-by: Michael Haggerty
---
gitk | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/gitk b/gitk
index d2e3803..fb2f653 100755
--- a/gi
If a remote-tracking reference has the form
refs/remotes/origin/foo/bar
, then the part of the reference that tells which remote it comes from
is `refs/remotes/origin`. So display such a reference as
remotes/origin/foo/bar
^^^
, where the indicated part is displayed in `
Signed-off-by: Michael Haggerty
---
gitk | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gitk b/gitk
index 502f0aa..d2e3803 100755
--- a/gitk
+++ b/gitk
@@ -6588,7 +6588,11 @@ proc drawtags {id x xt y1} {
}
if {[info exists idheads($id)]} {
Signed-off-by: Michael Haggerty
---
gitk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitk b/gitk
index fb2f653..84a5326 100755
--- a/gitk
+++ b/gitk
@@ -6654,7 +6654,7 @@ proc drawtags {id x xt y1} {
set xl [expr {$xl - $delta/2}]
$canv create polyg
The text value that it also provides to its caller is not used yet, but
it will be soon.
Signed-off-by: Michael Haggerty
---
gitk | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gitk b/gitk
index 84a5326..51ebaf5 100755
--- a/gitk
+++ b/gitk
@@ -6551,6 +655
Remote-tracking references are very different than local branches, so it
would be nice to make it possible to distinguish then visually. So allow
the remote reference background color to be configured separately from
the branch reference background color by introducing a new constant,
`remoterefbgc
The resulting code is easier to follow than the old counting-based code,
plus in a moment we will add some more specific types.
Signed-off-by: Michael Haggerty
---
gitk | 37 +
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/gitk b/gitk
index 2
This patch series changes a bunch of details about how remote-tracking
references are rendered in the commit list of gitk:
* Omit the "remote/" prefix on normal remote-tracking references. They
are already distinguished via their two-tone rendering and (usually)
longer names, and this change s
Instead, just append to it as necessary.
Signed-off-by: Michael Haggerty
---
gitk | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/gitk b/gitk
index a14d7a1..296efb3 100755
--- a/gitk
+++ b/gitk
@@ -6570,18 +6570,20 @@ proc drawtags {id x xt y1} {
set extra
Michael Haggerty writes ("Re: [PATCH 0/5] git check-ref-format --stdin
--report-errors"):
> Thanks for your patches. I left some comments about the individual patches.
Thanks for your review.
> I don't know whether this feature will be popular, but it's not a lot of
> code to add it, so it would
> diff --git a/builtin/gc.c b/builtin/gc.c index 069950d0b4..d3c978c765
> 100644
> --- a/builtin/gc.c
> +++ b/builtin/gc.c
> @@ -191,6 +191,11 @@ static void add_repack_all_option(void)
> }
> }
>
> +static void add_repack_incremental_option(void)
> +{
> + argv_array_push(&repack, "--no-
subscribe git
Hi Stephan,
On Sat, 17 Dec 2016, Stephan Beyer wrote:
> On 12/14/2016 08:29 PM, Junio C Hamano wrote:
> > Johannes Schindelin writes:
> >> -/* We will introduce the 'interactive rebase' mode later */
> >> static inline int is_rebase_i(const struct replay_opts *opts)
> >> {
> >> - return 0;
>
Microsoft fixed their git repo implementation to no longer cause this problem.
https://connect.microsoft.com/VisualStudio/feedback/details/3109654/git-host-on-visualstudio-com-does-not-respect-the-q-flag-for-pushes
Scott Chamberlain
Software Engineer
ImproMed, LLC
(800) 925-7171
www.impromed.com
On Mon, Dec 19, 2016 at 9:05 PM, Jeff King wrote:
> On Mon, Dec 19, 2016 at 08:53:30PM +0700, Duy Nguyen wrote:
>
>> >> Your commit message does not make clear if you want this "fatal" to be
>> >> grep-able (by scripts) or not. If not, please _() the string. Maybe
>> >> this to reduce work for tr
On Mon, Dec 19, 2016 at 09:30:09PM +0700, Duy Nguyen wrote:
> On Mon, Dec 19, 2016 at 9:05 PM, Jeff King wrote:
> > On Mon, Dec 19, 2016 at 08:53:30PM +0700, Duy Nguyen wrote:
> >
> >> >> Your commit message does not make clear if you want this "fatal" to be
> >> >> grep-able (by scripts) or not.
Hi Hannes,
On Wed, 14 Dec 2016, Johannes Sixt wrote:
> Am 13.12.2016 um 16:29 schrieb Johannes Schindelin:
> > base-commit: 8d7a455ed52e2a96debc080dfc011b6bb00db5d2
> > Published-As: https://github.com/dscho/git/releases/tag/sequencer-i-v2
> > Fetch-It-Via: git fetch https://github.com/dscho/git
1 - 100 of 126 matches
Mail list logo