Hello,
Recently there was some discussion about git-notes and how we do not
fetch notes from remotes by default. The big problem with doing so is
because refs/remotes/* hierarchy is only setup for branches (heads),
so we don't have any clean location to put them.
Around the time of git 1.8.0, Joh
On Fri, Aug 7, 2015 at 6:15 AM, Eric Sunshine wrote:
> An alternative would be to have git-am detect that it is being tested
> and pretend that isatty() returns true.
I would vastly prefer a solution that would work for everything, for
all the C code and scripts, instead of implementing a workaro
On 08/10/2015 05:48 PM, Patrick Steinhardt wrote:
Sorry for the late reply (and possible re-sending),
I just stumbled over this in transport.c:
/*
* Strip username (and password) from a URL and return
* it in a newly allocated string.
*/
char *transport_anonymize_url(const char *url)
Could
On Wed, Aug 12, 2015 at 11:06 AM, Paul Tan wrote:
> It's not present in this diff context, but this hunk modifies the code
> path where in_progress is true. In other words, we only check for
> SIGNOFF_EXPLICIT if
..we are resuming.
(Ugh, butter fingers)
Thanks,
Paul
--
To unsubscribe from this
On Fri, Aug 7, 2015 at 5:29 PM, Johannes Schindelin
wrote:
>> diff --git a/builtin/am.c b/builtin/am.c
>> index 0961304..8c95aec 100644
>> --- a/builtin/am.c
>> +++ b/builtin/am.c
>> @@ -2265,6 +2284,9 @@ int cmd_am(int argc, const char **argv, const
>> char *prefix)
>>
>> if (resume
Johan Herland writes:
> I know that we don't yet have a "proper" place to put remote notes refs,
> but the in notes..merge _must_ be a "local" notes ref (you even
> use the notation in the documentation below). Thus, I believe
> we can presume that the local notes ref must live under refs/notes
On Tue, Aug 11, 2015 at 10:57 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> Teach documentation about the cat_sort_uniq rewriteMode that got added
> at the same time as the equivalent merge strategy.
>
> Signed-off-by: Jacob Keller
Reviewed-by: Johan Herland
--
Johan Herland,
www.herland
On Tue, Aug 11, 2015 at 10:57 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> Add new tests to ensure that --commit, --abort, and --strategy are
> mutually exclusive.
>
> Signed-off-by: Jacob Keller
Reviewed-by: Johan Herland
--
Johan Herland,
www.herland.net
--
To unsubscribe from this li
On Tue, Aug 11, 2015 at 10:57 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> Add new option "notes..merge" option which specifies the merge
> strategy for merging into a given notes ref. This option enables
> selection of merge strategy for particular notes refs, rather than all
> notes ref mer
On Tue, Aug 11, 2015 at 4:57 PM, Jacob Keller wrote:
> Add new option "notes..merge" option which specifies the merge
> strategy for merging into a given notes ref. This option enables
> selection of merge strategy for particular notes refs, rather than all
> notes ref merges, as user may not want
On Tue, Aug 11, 2015 at 10:57 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> Teach git-notes about "notes.merge" to select a general strategy for all
> notes merges. This enables a user to always get expected merge strategy
> such as "cat_sort_uniq" without having to pass the "-s" option manual
On Wed, Aug 12, 2015 at 01:39:44AM +0200, Jan Viktorin wrote:
> When sending an e-mail, the client and server must agree on an
> authentication mechanism. Some servers (due to misconfiguration
> or a bug) deny valid credentials for certain mechanisms. In this
> patch, a new option --smtp-auth and c
When sending an e-mail, the client and server must agree on an
authentication mechanism. Some servers (due to misconfiguration
or a bug) deny valid credentials for certain mechanisms. In this
patch, a new option --smtp-auth and configuration entry smtpAuth
are introduced. If smtp_auth is defined, i
On Tue, Aug 11, 2015 at 6:56 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>> On Tue, Aug 11, 2015 at 4:51 PM, Johannes Sixt wrote:
>>> Invoking plink requires special treatment, and we have support and even
>>> test cases for the commands 'plink' and 'tortoiseplink'. We also support
>>> .
Eric Sunshine writes:
> On Tue, Aug 11, 2015 at 4:51 PM, Johannes Sixt wrote:
>> Invoking plink requires special treatment, and we have support and even
>> test cases for the commands 'plink' and 'tortoiseplink'. We also support
>> .exe variants for these two and there is a test for 'plink.exe'.
Junio C Hamano writes:
> David Turner writes:
>
>> On Fri, 2015-07-31 at 16:40 -0700, Stefan Beller wrote:
>>> I am sorry for being late to the review, I looked into coverity today as Duy
>>> bugged me to fix the memory allocation stuff[1]
>>
>> Thanks. Junio, can you pleas substitute the attach
Eric Sunshine writes:
> On Tue, Aug 11, 2015 at 4:51 PM, Johannes Sixt wrote:
>> Invoking plink requires special treatment, and we have support and even
>> test cases for the commands 'plink' and 'tortoiseplink'. We also support
>> .exe variants for these two and there is a test for 'plink.exe'.
On Tue, 2015-08-11 at 15:47 -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > David Turner writes:
> >
> >> On Fri, 2015-07-31 at 16:40 -0700, Stefan Beller wrote:
> >>> I am sorry for being late to the review, I looked into coverity today as
> >>> Duy
> >>> bugged me to fix the memor
On Tue, Aug 11, 2015 at 4:51 PM, Johannes Sixt wrote:
> Invoking plink requires special treatment, and we have support and even
> test cases for the commands 'plink' and 'tortoiseplink'. We also support
> .exe variants for these two and there is a test for 'plink.exe'.
>
> On Windows, however, whe
David Turner writes:
> On Fri, 2015-07-31 at 16:40 -0700, Stefan Beller wrote:
>> I am sorry for being late to the review, I looked into coverity today as Duy
>> bugged me to fix the memory allocation stuff[1]
>
> Thanks. Junio, can you pleas substitute the attached patch instead?
No. The topic
David Turner writes:
> What does gitk do that's relevant here?
Ahh, my mistake. "gitk" spawned from "bisect visualize" is not even
aware of the fact that it is showing the revision ranges delimited
by the bisect references.
--
To unsubscribe from this list: send the line "unsubscribe git" in
t
Thanks.
--
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:
> Johannes Sixt writes:
>
>> On Windows, 'git rebase -i' with rebase.missingCommitsCheck set to
>> warn or error reports:
>>
>>Dropped commits (newer to older):
>>'atal: bad revision '410dee56...
>>
>> The error comes from the git rev-list --stdin invocation in
>>
On Tue, 2015-08-11 at 14:10 -0700, Junio C Hamano wrote:
> David Turner writes:
P.S. I noticed an issue with patch 2/2; I had reverted a now-unnecessary
hack, but accidentally reverted the whole file. So I'll need to re-roll
anyway.
--
To unsubscribe from this list: send the line "unsubscribe g
On Tue, 2015-08-11 at 14:10 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > We need a place to stick refs for bisects in progress that is not
> > shared between worktrees. So we use the refs/worktree/ hierarchy.
>
> This is by itself OK, but to help existing Porcelains, most notably
>
Johannes Sixt writes:
> On Windows, 'git rebase -i' with rebase.missingCommitsCheck set to
> warn or error reports:
>
>Dropped commits (newer to older):
>'atal: bad revision '410dee56...
>
> The error comes from the git rev-list --stdin invocation in
> git-rebase--interactive.sh (function
David Turner writes:
> We need a place to stick refs for bisects in progress that is not
> shared between worktrees. So we use the refs/worktree/ hierarchy.
This is by itself OK, but to help existing Porcelains, most notably
"gitk", I think refs/bisect/ hierarchy should be treated the same
way.
The previous commit[1] added a new context menu entry. Therefore, the
line numbers of the folloeing entries need to be incremented when their
text or state is changed.
[1] <1437218139-7031-1-git-send-email-dev+...@drbeat.li>,
http://article.gmane.org/gmane.comp.version-control.git/274161
Sign
From: Jacob Keller
Teach git-notes about "notes.merge" to select a general strategy for all
notes merges. This enables a user to always get expected merge strategy
such as "cat_sort_uniq" without having to pass the "-s" option manually.
Signed-off-by: Jacob Keller
---
Documentation/config.txt
From: Jacob Keller
Add new option "notes..merge" option which specifies the merge
strategy for merging into a given notes ref. This option enables
selection of merge strategy for particular notes refs, rather than all
notes ref merges, as user may not want cat_sort_uniq for all refs, but
only som
From: Jacob Keller
Teach documentation about the cat_sort_uniq rewriteMode that got added
at the same time as the equivalent merge strategy.
Signed-off-by: Jacob Keller
---
Documentation/config.txt| 4 ++--
Documentation/git-notes.txt | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(
From: Jacob Keller
Add new tests to ensure that --commit, --abort, and --strategy are
mutually exclusive.
Signed-off-by: Jacob Keller
---
t/t3310-notes-merge-manual-resolve.sh | 12
1 file changed, 12 insertions(+)
diff --git a/t/t3310-notes-merge-manual-resolve.sh
b/t/t3310-not
From: Jacob Keller
This series of patches implements notes.merge and notes..merge
options for configuring notes merge strategy such that user may avoid
typing "-s". It is (probably) most useful if the user wishes to always
enforce cat_sort_uniq strategy.
This series now uses git_config_get_strin
Invoking plink requires special treatment, and we have support and even
test cases for the commands 'plink' and 'tortoiseplink'. We also support
.exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the
test case fails
A test case introduced by ae454f61 (Add tests for wildcard "path vs ref"
disambiguation) allocates a file named '*.c'. This does not work on
Windows, because the OS forbids file names containing wildcard
characters. The test case fails where the shell attempts to allocate the
file. Skip the test on
A test case introduced by 91479b9c (t7300: add tests to document
behavior of clean and nested git) uses 'chmod 0' to verify that a
subdirectory that has an unreadable .git file is not removed. This can
work only when the system pays attention to the permissions set with
'chmod'. Therefore, set the
On Tue, Aug 11, 2015 at 1:06 PM, Junio C Hamano wrote:
>
> Looks correct; somehow this reminded me of the other topic from Peff
> to reduce use of git_path() ;-)
>
>> - pidfile = git_pathdup("gc.pid");
>> + pidfile = pidfile_path;
>> sigchain_push_common(remove_pidfile_on_signal);
>>
Thanks for a pleasant read. All looked reasonable.
--
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
On Windows, 'git rebase -i' with rebase.missingCommitsCheck set to
warn or error reports:
Dropped commits (newer to older):
'atal: bad revision '410dee56...
The error comes from the git rev-list --stdin invocation in
git-rebase--interactive.sh (function check_todo_list). It is caused by
CRs
Michael Haggerty writes:
> Signed-off-by: Michael Haggerty
> ---
> builtin/gc.c | 9 ++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/gc.c b/builtin/gc.c
> index 36fe333..c41354b 100644
> --- a/builtin/gc.c
> +++ b/builtin/gc.c
> @@ -199,6 +199,7 @@ static co
Michael Haggerty writes:
> Signed-off-by: Michael Haggerty
> ---
> diff.c | 29 +++--
> 1 file changed, 7 insertions(+), 22 deletions(-)
Nice code reduction.
> diff --git a/diff.c b/diff.c
> index 7500c55..dc95247 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -2,6 +2,7 @@
Michael Haggerty writes:
> This makes the next step easier.
>
> The old code used to use "path" to set the initial length of
> tempfile->filename. This was not helpful because path was usually
> relative whereas the value stored to filename will be absolute. So
> just initialize the length to 0.
Michael Haggerty writes:
> Signed-off-by: Michael Haggerty
> ---
I was briefly confused by the similarity between get_locked_file_path()
and this new helper ;-) but names of both make sense to me.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majo
Michael Haggerty writes:
> We are about to move those members, so change client code to read them
> through accessor functions.
Hmph, _fp() variant does not seem to be used at all at this step, though.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
Michael Haggerty writes:
> Rearrange/rewrite it somewhat to fit its new environment.
> ...
> diff --git a/lockfile.h b/lockfile.h
> index b4abc61..a483cc9 100644
> --- a/lockfile.h
> +++ b/lockfile.h
> @@ -4,54 +4,103 @@
> ...
> @@ -68,16 +117,51 @@ struct lock_file {
> #define LOCK_SUFFIX ".loc
If it doesn't already exist (not that I can find). I'd like to see
config options analogous to commit.gpgsign for both tagging and pushing.
Not sure where else to send this request though, let me know if there's
a better place.
Thanks,
--
Matthew Thode
signature.asc
Description: OpenPGP digit
Karthik Nayak writes:
> struct atom_value{
Obviously not a problem with this step, but you need a SP before the
open brace.
> @@ -692,6 +704,26 @@ static void populate_value(struct ref_array_item *ref)
> else
> v->s = " ";
>
On Fri, 2015-07-31 at 16:40 -0700, Stefan Beller wrote:
> I am sorry for being late to the review, I looked into coverity today as Duy
> bugged me to fix the memory allocation stuff[1]
Thanks. Junio, can you pleas substitute the attached patch instead? It
addresses Stefan's issues. If you prefe
On Mon, 2015-08-03 at 20:55 +0700, Duy Nguyen wrote:
> On Fri, Jul 31, 2015 at 1:06 PM, David Turner
> wrote:
> > Add a function ref_type, which categorizes refs as per-worktree,
> > pseudoref, or normal ref.
>
> For per-worktree refs, you probably should follow common_list[] in
> path.c because
Karthik Nayak writes:
> +void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned int
> width,
> +const char *s)
> +{
> + int display_len = utf8_strnwidth(s, strlen(s), 0);
> + int utf8_compenstation = strlen(s) - display_len;
compensation, perhaps?
When we call "die(fmt, args...)", we end up in vreportf with
two pieces of information:
1. The prefix "fatal: "
2. The original fmt and va_list of args.
We format item (2) into a temporary buffer, and then fprintf
the prefix and the temporary buffer, along with a newline.
This has the unfort
Karthik Nayak writes:
> get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep),
> &atomv);
> - format_quote_value(atomv, quote_style, &output);
> + set_formatting_state(atomv, &state);
> + format_quote_value(atomv, &state);
> + pe
The vreportf function always goes to stderr, but run-command
wants child errors to go to the parent's original stderr. To
solve this, commit a5487dd duplicates the stderr fd and
installs die and error handlers to direct the output
appropriately (which later turned into the vwritef
function). This h
On Tue, Aug 11, 2015 at 09:34:31AM -0700, Junio C Hamano wrote:
> > As for vwritef, it exists solely to work over write(), _and_ it doesn't
> > get the "one-shot" thing right (which is probably OK, as we use it only
> > when exec fails). But we could probably teach run-command to fdopen(),
> > and
Karthik Nayak writes:
> @@ -1283,9 +1279,11 @@ void show_ref_array_item(struct ref_array_item *info,
> const char *format, int qu
> if (color_parse("reset", color) < 0)
> die("BUG: couldn't parse 'reset' as a color");
> resetv.s = color;
> -
Karthik Nayak writes:
> -static void print_value(struct atom_value *v, int quote_style)
> +static void format_quote_value(struct atom_value *v, int quote_style, struct
> strbuf *output)
> {
Hmph...
> -static void emit(const char *cp, const char *ep)
> +static void append_non_atom(const char *
Karthik Nayak writes:
> From: Karthik Nayak
>
> Add an option in 'filter_refs()' to use 'for_each_branch_ref()'
> and filter refs. This type checking is done by adding a
> 'FILTER_REFS_BRANCHES' in 'ref-filter.h'.
>
> Add an option in 'ref_filter_handler()' to filter different
> types of branche
Jeff King writes:
> We use a fixed-size buffer of 4096 bytes to format die() and
> error() messages. We explicitly avoided using a strbuf or
> other fanciness here, because we want to make sure that we
> report the message even in the face of malloc() failure
> (after all, we might even be dying
On Tue, Aug 11, 2015 at 09:28:34AM -0700, Stefan Beller wrote:
> On Tue, Aug 11, 2015 at 9:17 AM, Jeff King wrote:
> > We use a fixed-size buffer of 4096 bytes to format die() and
> > error() messages. We explicitly avoided using a strbuf or
> > other fanciness here, because we want to make sure
On Tue, Aug 11, 2015 at 9:17 AM, Jeff King wrote:
> We use a fixed-size buffer of 4096 bytes to format die() and
> error() messages. We explicitly avoided using a strbuf or
> other fanciness here, because we want to make sure that we
> report the message even in the face of malloc() failure
> (aft
We use a fixed-size buffer of 4096 bytes to format die() and
error() messages. We explicitly avoided using a strbuf or
other fanciness here, because we want to make sure that we
report the message even in the face of malloc() failure
(after all, we might even be dying due to a malloc call).
In mos
David Turner writes:
> On Mon, 2015-08-10 at 16:53 -0400, Michael Rappazzo wrote:
>> +while ((d = readdir(dir)) != NULL) {
>
> I think it would be useful to break this loop out into a
> for_each_worktree function.
Very good point.
--
To unsubscribe from this list: send the li
Mike Rappazzo writes:
>>> + int is_bare = is_bare_repository();
>>
>> Please do not introduce decl-after-stmt.
>
> Since I reused this value below, I thought it would be acceptable.
Use of a new variable is fine. "Do not declare one in a block after
you already wrote statement" is what "dec
On Mon, Aug 10, 2015 at 7:52 PM, David Turner wrote:
> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using
> find_shared_symref and die if we find one. This prevents simultaneous
> merges to the same notes branch from different worktrees.
>
> Signed-off-by: David Turner
Still looks goo
Hi,
On 2015-08-11 10:28, Jet Rey Maza wrote:
> I'm wondering why gitbash dont have wget?
Please take the time to write coherent questions in the future, giving enough
context for others to understand what you are talking about. We are not dogs
that you throw some bones, you know? We are highly
On Tue, Aug 11, 2015 at 03:02:41PM +0200, Martin von Gagern wrote:
> I've noticed that if I turn a subdirectory into a submodule, I'm having
> severe trouble merging branches from before that change, even if they
> don't modify that subdirectory at all.
>
> I've posted this problem on Stack Overfl
On Tue, Aug 11, 2015 at 8:11 AM, Eric Sunshine wrote:
> On Tue, Aug 4, 2015 at 9:01 AM, Karthik Nayak wrote:
>> Remove show_detached() and make detached HEAD to be rolled into
>> regular ref_list by adding REF_DETACHED_HEAD as a kind of branch and
>> supporting the same in append_ref(). This elim
On Tue, Aug 11, 2015 at 7:29 AM, Eric Sunshine wrote:
> On Tue, Aug 4, 2015 at 9:01 AM, Karthik Nayak wrote:
>> This is a preperatory patch for 'roll show_detached HEAD into regular
>> ref_list'. This patch moves get_head_descrition() to the top so that
>
> s/descrition/description/
>
>> it can b
On Tue, Aug 11, 2015 at 7:28 AM, Eric Sunshine wrote:
> On Tue, Aug 4, 2015 at 9:01 AM, Karthik Nayak wrote:
>> Remove unnecessary variables from ref_list and ref_item which were
>> used for width computation. This is to make ref_item similar to
>> ref-filter's ref_array_item. This will ensure a
Hi!
I've noticed that if I turn a subdirectory into a submodule, I'm having
severe trouble merging branches from before that change, even if they
don't modify that subdirectory at all.
I've posted this problem on Stack Overflow and started a bounty for it.
See http://stackoverflow.com/q/31821219/
Hello,
I use git-svn. I have used it without any problem for two month. Now
git starts crashing after "svn rebase" (maybe also after other
operations with a remote svn server, I'll check when will do "svn
dcommit" next time). It successfully done the operation and only then
it crashes:
$ git svn r
On Mon, Aug 10, 2015 at 10:55 PM, David Turner wrote:
> On Mon, 2015-08-10 at 16:53 -0400, Michael Rappazzo wrote:
>> + while ((d = readdir(dir)) != NULL) {
>
> I think it would be useful to break this loop out into a
> for_each_worktree function.
>
> While looking into per-wor
On Mon, Aug 10, 2015 at 6:10 PM, Junio C Hamano wrote:
> Michael Rappazzo writes:
>
>> +static int list(int ac, const char **av, const char *prefix)
>> +{
>> + int main_only = 0;
>> + struct option options[] = {
>> + OPT_BOOL(0, "main-only", &main_only, N_("only list the main
Hi,
for repositories with more than 16k files and folders, git-archive will create
zip files which store the wrong number of entries. That is, it stores the
number of entries modulo 16k. This will break unpackers that do not include
code to support this brokenness.
Instead, git-archive should use
On Mon, Aug 10, 2015 at 12:08:29PM -0700, Junio C Hamano wrote:
> But in the end, I'd prefer the choice of the compiled-in default up
> to the port maintainers. You earlier said:
>
> This problem was reported on the Cygwin mailing list at
> https://cygwin.com/ml/cygwin/2015-08/msg00102.ht
On Tue, Aug 11, 2015 at 06:00:20AM +0200, Michael Haggerty wrote:
> > Instead of using hold_lock_file_for_append, let's copy the
> > file line by line, which ensures all records are properly
> > terminated. If we see an extra line, we can simply abort the
> > update (there is no point in even copy
On Mon, Aug 10, 2015 at 03:57:31PM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Jeff King writes:
> >
> >> There are no callers of the slightly-dangerous static-buffer
> >> git_path_submodule left. Let's drop it.
> >
> > There are a few callers added on 'pu', though.
>
> Actuall
On Mon, Aug 10, 2015 at 03:36:14PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > No users of hold_lock_file_for_append remain, so remove it.
>
> This does not seem to have anything to do with rotating static buffers
> used in get_pathname(); the only effect it has is to conflict heavil
Hi,
I'm wondering why gitbash dont have wget?
--
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
On Mon, Aug 10, 2015 at 7:24 PM, Jeff King wrote:
> On Mon, Aug 10, 2015 at 06:38:10PM +0200, Johannes Schindelin wrote:
>
>> > +const char *pipe_id_get(int fd)
>> > +{
>> > + static struct strbuf id = STRBUF_INIT;
>> > + struct stat st;
>> > +
>> > + if (fstat(fd, &st) < 0 || !S_ISFIFO(st.s
80 matches
Mail list logo
