Junio C Hamano writes:
> But at the same time, I feel that these redundant lines, especially
> the latter one, would give the users a stronger cue than just saying
> that "bar is Untracked"; "do X to include" reminds that bar will not
> be included if nothing is done.
The one which draw my atten
IMHO, It is alright as it is.
I have been using git for 4~ years now, and I still find very useful
those lines. They are like a git status while committing, and it's the
key to avoid accidental commits of objects or forgetting files in a
commit. Between that and that the commit message can't be em
On Wed, Sep 11, 2013 at 2:13 AM, John Keeping wrote:
> Instead of re-implementing the "remove trailing slashes" loop in
> builtin/rm.c just pass PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP to
> parse_pathspec.
>
> Signed-off-by: John Keeping
> ---
> builtin/rm.c | 20
> 1 file chan
Javier Domingo writes:
> IMHO, It is alright as it is.
>
> I have been using git for 4~ years now, and I still find very useful
> those lines. They are like a git status while committing, and it's the
> key to avoid accidental commits of objects or forgetting files in a
> commit.
Having the list
On Wed, Sep 11, 2013 at 08:05:44AM +0200, Johannes Sixt wrote:
> Am 10.09.2013 21:13, schrieb John Keeping:
> > When using tab-completion, a directory path will often end with a
> > trailing slash which currently confuses "git rm" when dealing with
> > submodules. Now that we have parse_pathspec w
On Wed, Sep 11, 2013 at 02:48:51PM +0700, Duy Nguyen wrote:
> On Wed, Sep 11, 2013 at 2:13 AM, John Keeping wrote:
> > Instead of re-implementing the "remove trailing slashes" loop in
> > builtin/rm.c just pass PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP to
> > parse_pathspec.
> >
> > Signed-off-by: John
No behavior change in this patch, but this makes the display of status
hints more flexible as they can be enabled or disabled for individual
calls to commit.c:run_status().
Signed-off-by: Matthieu Moy
---
builtin/commit.c | 10 --
wt-status.c | 38 +++
This turns the template COMMIT_EDITMSG from e.g
# [...]
# Changes to be committed:
# (use "git reset HEAD ..." to unstage)
#
# modified: builtin/commit.c
#
# Untracked files:
# (use "git add ..." to include in what will be committed)
#
# t/foo
#
to
# [...]
On Wed, Sep 11, 2013 at 5:08 AM, Matthieu Moy wrote:
> Most status hints were written to be accurate when running "git status"
> before running a commit. Many of them are not applicable when the commit
> has already been started, and should not be shown in COMMIT_EDITMSG. The
> most obvious are hi
On Wed, Sep 11, 2013 at 3:24 AM, Matthieu Moy
wrote:
> Junio C Hamano writes:
>
>> But at the same time, I feel that these redundant lines, especially
>> the latter one, would give the users a stronger cue than just saying
>> that "bar is Untracked"; "do X to include" reminds that bar will not
>>
On Tue, Sep 10, 2013 at 3:26 AM, Matthieu Moy
wrote:
> Felipe Contreras writes:
>
>> The problem is the newcomers, and the newcomers will most definitely
>> not activate a configuration option to tell them that they are doing
>> something potentially undesirable.
>
> I teach Git to 200 newcommers
On Wed, Sep 11, 2013 at 3:20 PM, John Keeping wrote:
> On Wed, Sep 11, 2013 at 08:05:44AM +0200, Johannes Sixt wrote:
>> Am 10.09.2013 21:13, schrieb John Keeping:
>> > When using tab-completion, a directory path will often end with a
>> > trailing slash which currently confuses "git rm" when deal
On Wed, Sep 11, 2013 at 05:54:48PM +0700, Duy Nguyen wrote:
> On Wed, Sep 11, 2013 at 3:20 PM, John Keeping wrote:
> > On Wed, Sep 11, 2013 at 08:05:44AM +0200, Johannes Sixt wrote:
> >> Am 10.09.2013 21:13, schrieb John Keeping:
> >> > When using tab-completion, a directory path will often end wi
On Wed, Sep 11, 2013 at 6:08 PM, John Keeping wrote:
>> > -- >8 --
>> > diff --git a/builtin/reset.c b/builtin/reset.c
>> > index 9efac0f..800117f 100644
>> > --- a/builtin/reset.c
>> > +++ b/builtin/reset.c
>> > @@ -143,7 +143,6 @@ static int read_from_tree(const struct pathspec
>> > *pathspec,
On Di, Sep 10, 2013 at 10:51:02 -0700, Junio C Hamano wrote:
> Consider this simple history with only a handful of commits (as
> usual, time flows from left to right):
>
> E
> /
> A---B---C---D
>
> where D is at the tip of the sending side, E is at the tip of the
Felipe Contreras writes:
> On Tue, Sep 10, 2013 at 3:26 AM, Matthieu Moy
> wrote:
>
>> So, you insist in asking the user to chose between rebase and merge, but
>> you also insist that they will not chose rebase? So, why ask?
>
> Because as you said, they don't know what that is.
That does not a
On 09/10/2013 06:51 PM, Eric Sunshine wrote:
> On Mon, Sep 9, 2013 at 8:57 PM, Brad King wrote:
>> +Use 40 "0" or the empty string to specify a zero value, except that
>
> Did you want an 's' after the "0"?
The same description without 's' already appears in git-update-ref.txt
above this locatio
Extend t/t1400-update-ref.sh to cover cases using the --stdin option.
Signed-off-by: Brad King
---
On 09/10/2013 06:46 PM, Eric Sunshine wrote:
> Thus printf provides all the functionality you require, and
> print_nul() function can be dropped. So:
>
> printf '%s\0' foo bar baz
Wonderful,
Junio C Hamano wrote:
Then what I wrote was actually relevant;-)
I am not sure if we want to use the owner bit (i.e. 4th place)
instead of the other bit (i.e. the last place) like this patch does,
though. The old code in 1.8.1.x would have produced either "r" (for
100644) or
Someone at $work asked me this week how to find the current and
previous tags on his branch so he could generate release notes. I
just need "last two tags on head in topo-order". I was surprised by
how complicated this turned out to be. I ended up with this:
git log --decorate=full --pretty=for
That extra info doesn't occupy too much, and helps distinguish between
sections. They do also remember you the commands to use (thought after
some time using git, you may not need it).
Cheers,
Javier
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to maj
Nico, if you have time you may want to look into this. The result v4
pack from pack-objects on git.git for me is 35MB (one branch) while
packv4-create produces 30MB (v2 is 40MB). I don't know why there is
such a big difference in size. I compared. Ident dict is identical.
Tree dict is a bit differe
On Wed, 11 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
> While .idx v3 is recommended because it's smaller, there is no reason
> why .idx v2 can't use with .pack v4. Enable it, at least for the test
> suite as some tests need to this kind of information from show-index
> and show-index does not support
Git use, as many project that use autoconf, private m4 macros.
When not using automake, and just relying on autoconf, the macro
files are not picked up by default.
A possibility, as git do today, is to put the private m4 macro
in the configure.ac file, so they will copied over the final configure
Lee Carver writes:
> It is using the same ${tempdir} working directory that git rev-list uses
> below for the ../revs file
Ah, I missed that; then that should be safe. The patch looks sane.
Can we have your sign-off, too, please?
>
> It's normally .git-rewrite/t, following the normal working
On Wed, Sep 11, 2013 at 8:36 AM, Brad King wrote:
> On 09/10/2013 06:51 PM, Eric Sunshine wrote:
>> On Mon, Sep 9, 2013 at 8:57 PM, Brad King wrote:
>>> +Use 40 "0" or the empty string to specify a zero value, except that
>>
>> Did you want an 's' after the "0"?
>
> The same description without '
This is necessary so that read_mailmap() can obtain a pointer to the
function.
Signed-off-by: Sebastian Schuberth
---
git-compat-util.h | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index be1c494..664305c 100644
--- a/git-co
On Wed, 11 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
> show-index takes .idx from stdin while v3 requires the .pack. It's
> used for testing purposes only. Let those test scripts force .idx v2
> with index-pack.
Since I have a patch adding (partial) index v3 support to show-index in
my tree, I've dr
Karsten Blees writes:
> A few minor fixes for the MSVC build.
>
> Also here: https://github.com/kblees/git/tree/kb/fix-msvc-stat-definitions
>
> Karsten Blees (3):
> MSVC: fix compile errors due to missing libintl.h
> MSVC: fix compile errors due to macro redefinitions
> MSVC: fix stat defi
With MinGW runtime version 4.0 this interferes with the previous definition
from sdkddkver.h.
Signed-off-by: Sebastian Schuberth
---
compat/nedmalloc/malloc.c.h | 2 ++
git-compat-util.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmall
On 11.09.2013 01:23, Karsten Blees wrote:
> In msvc.h, there's a couple of stat related functions defined diffently
> from mingw.h. When we remove these definitions, the only problem we get is
> "warning C4005: '_stati64' : macro redefinition" for this line in mingw.h:
>
> #define _stati64(x,y) m
On Wed, Sep 11, 2013 at 6:09 PM, Junio C Hamano wrote:
> Karsten Blees writes:
>
>> A few minor fixes for the MSVC build.
>>
>> Also here: https://github.com/kblees/git/tree/kb/fix-msvc-stat-definitions
>>
>> Karsten Blees (3):
>> MSVC: fix compile errors due to missing libintl.h
>> MSVC: fi
On Wed, 11 Sep 2013, Duy Nguyen wrote:
> Nico, if you have time you may want to look into this. The result v4
> pack from pack-objects on git.git for me is 35MB (one branch) while
> packv4-create produces 30MB (v2 is 40MB). I don't know why there is
> such a big difference in size. I compared. Ide
On Wed, 11 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
> This contains fixups for some of my patches, some of Nico's, adds v4
> support to unpack-objects because the test suite needs it. With these,
> when force generating pack v4 unconditionally, the remaining failed
> tests are:
[...]
@junio: I've fo
Duy Nguyen writes:
> reset --soft does not go through these code paths (i.e. it does not
> need index at all). If we fail to load index index in "reset --soft" I
> think it's ok to die(). Corrupt index is fatal anyway.
Do I smell a breakage here? Isn't "reset --soft HEAD" (or some
known good co
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> But at the same time, I feel that these redundant lines, especially
>> the latter one, would give the users a stronger cue than just saying
>> that "bar is Untracked"; "do X to include" reminds that bar will not
>> be included if nothing is done
Josef Wolf writes:
> On Di, Sep 10, 2013 at 10:51:02 -0700, Junio C Hamano wrote:
>> Consider this simple history with only a handful of commits (as
>> usual, time flows from left to right):
>>
>> E
>> /
>> A---B---C---D
>>
>> where D is at the tip of the sendi
On Wed, Sep 11, 2013 at 10:08:18AM -0700, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> > reset --soft does not go through these code paths (i.e. it does not
> > need index at all). If we fail to load index index in "reset --soft" I
> > think it's ok to die(). Corrupt index is fatal anyway.
>
>
Benjamin Bergman writes:
> From a33659535cb0eac92bed42d5e494dbb8f5d9ab20 Mon Sep 17 00:00:00 2001
> From: Benjamin Bergman
> Date: Tue, 10 Sep 2013 16:00:29 -0500
> Subject: [PATCH] Documentation/git-checkout: Move `--detach` flag in synopsis
> to correct command
These (except the first one th
On 11/09/2013 01:23, Junio C Hamano wrote:
Kevin Bracey writes:
On 10/09/2013 20:19, Junio C Hamano wrote:
This command
$ git log v1.8.3.1..v1.8.4 -- git-cvsserver.perl
reports that a merge 766f0f8ef7 (which did not touch the specified
path at all) touches it.
Bisecting points at d0a
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> Junio C Hamano writes:
>>
>>> But at the same time, I feel that these redundant lines, especially
>>> the latter one, would give the users a stronger cue than just saying
>>> that "bar is Untracked"; "do X to include" reminds that bar will not
Hi Elia. Sorry, but I have to give my NAK to this patch.
On 09/11/2013 04:46 PM, Elia Pinto wrote:
Git use, as many project that use autoconf, private m4 macros.
When not using automake, and just relying on autoconf, the macro
files are not picked up by default.
A possibility, as git do today
Phil Hord writes:
> Someone at $work asked me this week how to find the current and
> previous tags on his branch so he could generate release notes. I
> just need "last two tags on head in topo-order". I was surprised by
> how complicated this turned out to be. I ended up with this:
>
> git l
Sebastian Schuberth writes:
> On Wed, Sep 11, 2013 at 6:09 PM, Junio C Hamano wrote:
>
>> Karsten Blees writes:
>>
>>> A few minor fixes for the MSVC build.
>>>
>>> Also here: https://github.com/kblees/git/tree/kb/fix-msvc-stat-definitions
>>>
>>> Karsten Blees (3):
>>> MSVC: fix compile erro
John Keeping writes:
> On Wed, Sep 11, 2013 at 10:08:18AM -0700, Junio C Hamano wrote:
>> Duy Nguyen writes:
>>
>> > reset --soft does not go through these code paths (i.e. it does not
>> > need index at all). If we fail to load index index in "reset --soft" I
>> > think it's ok to die(). Corru
On Wed, Sep 11, 2013 at 11:14:57AM -0700, Junio C Hamano wrote:
> John Keeping writes:
>
> > On Wed, Sep 11, 2013 at 10:08:18AM -0700, Junio C Hamano wrote:
> >> Duy Nguyen writes:
> >>
> >> > reset --soft does not go through these code paths (i.e. it does not
> >> > need index at all). If we f
Kevin Bracey wrote:
> On reflection I'm not sure what we should for the "simple history"
> view of v1.8.3.1..v1.8.4. We're not rewriting parents, so we don't
> get a chance to reconsider the merge as being zero-parent, and we do
> have this little section of graph to traverse at the bottom:
>
>
Sebastian Schuberth writes:
> diff --git a/git-compat-util.h b/git-compat-util.h
> index 664305c..f5c756d 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -93,7 +93,9 @@
> #undef __NO_INLINE__
>
> #ifdef WIN32 /* Both MinGW and MSVC */
> +#ifndef _WIN32_WINNT
> #define _WIN32_
Sebastian Schuberth wrote:
> This is necessary so that read_mailmap() can obtain a pointer to the
> function.
Hm, what platform has strcasecmp() as an inline function? Is this
allowed by POSIX? Even if it isn't, should we perhaps just work
around it by providing our own thin static function wra
On Wed, Sep 11, 2013 at 11:08:58AM +0200, Matthieu Moy wrote:
> No behavior change in this patch, but this makes the display of status
> hints more flexible as they can be enabled or disabled for individual
> calls to commit.c:run_status().
> [...]
> +static void status_finalize(struct wt_status *
Sebastian Schuberth writes:
> This is necessary so that read_mailmap() can obtain a pointer to the
> function.
Whoa, I didn't think it is even legal for a C library to supply
strcmp() or strcasecmp() that are purely inline you cannot take the
address of. The "solution" looks a bit too large a h
Hi,
Junio C Hamano wrote:
> --- a/Documentation/git-checkout.txt
> +++ b/Documentation/git-checkout.txt
> @@ -9,7 +9,8 @@ SYNOPSIS
>
> [verse]
> 'git checkout' [-q] [-f] [-m] []
> -'git checkout' [-q] [-f] [-m] [--detach] []
> +'git checkout' [-q] [-f] [-m] --detach []
> +'git checkou
John Keeping writes:
> However, I think we do do a read_cache when using "reset --soft" since
> we go through builtin/reset.c::die_if_unmerged_cache() which dies if
> read_cache fails. So I don't think we are losing anything by moving
> this check earlier.
Thanks.
--
To unsubscribe from this li
Jonathan Nieder writes:
> I think you're right that dropping the "don't follow off-graph
> treesame parents" rule would be a sensible change. The usual point of
> the "follow the treesame parent" rule is to avoid drawing undue
> attention to merges of ancient history where some of the parents ar
'git status' and 'git commit' can be told to also show the output of "git
submodule summary" by setting the "status.submodulesummary" config option.
But status and commit also honor the "diff.ignoreSubmodules" and the
"submodule..ignore" settings, which then disable the summary partly
or completely
On Wed, Sep 11, 2013 at 11:29:21AM -0700, Jonathan Nieder wrote:
> Sebastian Schuberth wrote:
>
> > This is necessary so that read_mailmap() can obtain a pointer to the
> > function.
>
> Hm, what platform has strcasecmp() as an inline function? Is this
> allowed by POSIX? Even if it isn't, sho
On Tue, Sep 10, 2013 at 06:17:12PM -0400, Nicolas Pitre wrote:
> hashtable_index() appears to be a close duplicate of hash_obj().
> Keep only the later and make it usable for all cases.
Thanks. This duplication has often bugged me when looking at that
hash table, but I just never actually wrote t
On Wed, Sep 11, 2013 at 8:29 PM, Junio C Hamano wrote:
> This unfortunately does not seem to match what I have. I think the
> patch is based on the codebase before these two:
>
> 380395d0 (mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE, 2013-05-02)
> 41f29991 (msvc: Fix compilation errors
On 11/09/2013 21:24, Jonathan Nieder wrote:
Kevin Bracey wrote:
On reflection I'm not sure what we should for the "simple history"
view of v1.8.3.1..v1.8.4. We're not rewriting parents, so we don't
get a chance to reconsider the merge as being zero-parent, and we do
have this little section of
Jens Lehmann writes:
> And here we go. Matthieu, does that make it more obvious?
Seems OK.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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://vge
On Wed, Sep 11, 2013 at 8:29 PM, Jonathan Nieder wrote:
>> This is necessary so that read_mailmap() can obtain a pointer to the
>> function.
>
> Hm, what platform has strcasecmp() as an inline function? Is this
> allowed by POSIX? Even if it isn't, should we perhaps just work
> around it by pro
2013/9/11 Stefano Lattarini :
> Hi Elia. Sorry, but I have to give my NAK to this patch.
>
I hold in great consideration the comments of Stephen in this area.
>
> On 09/11/2013 04:46 PM, Elia Pinto wrote:
>>
>> Git use, as many project that use autoconf, private m4 macros.
>>
>> When not using aut
Kevin Bracey writes:
> To see the effect at the command line: "git log v1.8.3..v.1.8.4" hides
> the merge, but "git log ^v1.8.3 v1.8.4" shows it. Whoops. A new
> example of a dotty shorthand not being exactly equivalent.
>
> In the ".." case the v1.8.3 tag gets peeled before being sent to
> add_r
On 09/10/2013 12:53 AM, Junio C Hamano wrote:
> * sb/repack-in-c (2013-08-30) 2 commits
> - repack: retain the return value of pack-objects
> - repack: rewrite the shell script in C
>
> Any further reviews?
Just came home from holiday (with no internet ;)
but I'll review my code now that I hav
On Wed, Sep 11, 2013 at 09:59:53PM +0200, Sebastian Schuberth wrote:
> On Wed, Sep 11, 2013 at 8:29 PM, Jonathan Nieder wrote:
>
> >> This is necessary so that read_mailmap() can obtain a pointer to the
> >> function.
> >
> > Hm, what platform has strcasecmp() as an inline function? Is this
> >
Sebastian Schuberth writes:
> On Wed, Sep 11, 2013 at 8:29 PM, Junio C Hamano wrote:
>
>> This unfortunately does not seem to match what I have. I think the
>> patch is based on the codebase before these two:
>>
>> 380395d0 (mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE, 2013-05-02)
>> 4
It would be very helpful if you could specify the path to the private
key to use for ssh remotes just like in ssh.
```
git push origin master -i 'path_to_key'
```
Althought there are workarounds involving ssh config, if you have a
server that has hundreds of git repos, each with the own private k
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 second batch of topics are now in 'master'.
You can find the changes described here in the integration branches
of the repositories listed
Karsten Blees writes:
> +#define FNV32_BASE ((unsigned int) 0x811c9dc5)
> +#define FNV32_PRIME ((unsigned int) 0x01000193)
> + ...
> +static inline unsigned int bucket(const hashmap *map, const hashmap_entry
> *key)
> +{
> + return key->hash & (map->tablesize - 1);
> +}
As tablesize would h
The HTTP 1.1 standard requires an Allow header for 405 Method Not Allowed:
The response MUST include an Allow header containing a list of valid methods
for the requested resource.
So provide such a header when we return a 405 to the user agent.
Signed-off-by: brian m. carlson
---
http-back
brian m. carlson wrote:
> Signed-off-by: brian m. carlson
Thanks again for noticing.
For what it's worth,
Reviewed-by: Jonathan Nieder
--
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.ker
On Wed, Sep 11, 2013 at 11:25 PM, Nicolas Pitre wrote:
> On Wed, 11 Sep 2013, Duy Nguyen wrote:
>
>> Nico, if you have time you may want to look into this. The result v4
>> pack from pack-objects on git.git for me is 35MB (one branch) while
>> packv4-create produces 30MB (v2 is 40MB). I don't know
Hi, Junio
Would you please pull the following into maint branch. And it can be merged
to the master branch. This isn't really a bugfix but a "nice to have" in a
maintenance release. ($gmane/233807)
The following changes since commit 21860882c8782771e99aa68fab6e365c628ff39d:
l10n: fr.po: hotfix
Dear Friend
After five years of waiting the crown (British government) has given me
the power to contact you so that you become the beneficiary to total
amount £15,000,000.00 GBP in the intent of the deceased who died without a
will.
I am contacting you because I believe you are related. Please
Karsten Blees writes:
> +/*
> + * Hashmap entry data structure, intended to be used as first member of user
> + * data structures. Consists of a pointer and an int. Ideally it should be
It is technically correct to say this is "intended to be" used, but
to those who are using this API, it would
Thanks, will do.
--
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
Breck Yunits writes:
> It would be very helpful if you could specify the path to the private
> key to use for ssh remotes just like in ssh.
You could add a support for the "remote..sshIdentityFile"
configuration variable, i.e.
[remote "origin"]
url = br...@example.com:pr
On Thu, Sep 12, 2013 at 12:30:01AM +, brian m. carlson wrote:
> The HTTP 1.1 standard requires an Allow header for 405 Method Not Allowed:
>
> The response MUST include an Allow header containing a list of valid methods
> for the requested resource.
>
> So provide such a header when we r
On Wed, Sep 11, 2013 at 09:39:55PM -0700, Junio C Hamano wrote:
> If the only thing you are interested in supporting is a one-shot
> invocation, i.e. giving which identity file to use from the command
> line when you run either "git push" or "git fetch", I suspect that
> you could play with GIT_SS
On Wed, Sep 11, 2013 at 04:32:23PM -0700, Junio C Hamano wrote:
> * jk/config-int-range-check (2013-09-09) 5 commits
> (merged to 'next' on 2013-09-09 at 9ab779d)
> + git-config: always treat --int as 64-bit internally
> + config: make numeric parsing errors more clear
> + config: set errno i
Am 9/12/2013 1:32, schrieb Junio C Hamano:
> * jc/ref-excludes (2013-09-03) 2 commits
> - document --exclude option
> - revision: introduce --exclude= to tame wildcards
>
> People often wished a way to tell "git log --branches" (and "git
> log --remotes --not --branches") to exclude some local
81 matches
Mail list logo
