Executes checkout without -q
---
git-submodule.sh | 24 +++-
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index a33f68d..5c4e057 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -5,11 +5,11 @@
# Copyright (c) 2007 La
Hi,
Amending a commit using git gui resets its author, unlike plain "git
commit --amend".
- Orgad
--
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 Tue, Mar 11, 2014 at 8:33 PM, Paweł Wawruch wrote:
> Replace the chain of if statements with table of strings.
>
> Signed-off-by: Paweł Wawruch
> ---
> The changes proposed by Junio C Hamano:
> Improvement of indentations. Removed an unused variable.
Better, thanks. More below.
> [1]: http:/
Signed-off-by: Yao Zhao
---
branch.c | 55 +--
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..6432e27 100644
--- a/branch.c
+++ b/branch.c
@@ -53,7 +53,20 @@ void install_branch_config(int flag,
Hi all,
I am considering developing a new feature, and I'd like to poll the group for
opinions.
Background: A couple years ago, I wrote a set of scripts that speed up cloning
of frequently used repositories. The scripts utilize a bare Git repository
located at a known location, and automate p
Hi,
Some quick thoughts.
Heiko Voigt wrote:
> This submodule configuration cache allows us to lazily read .gitmodules
> configurations by commit into a runtime cache which can then be used to
> easily lookup values from it. Currently only the values for path or name
> are stored but it can be ex
On Wed, Mar 12, 2014 at 5:12 AM, Junio C Hamano wrote:
> * nd/log-show-linear-break (2014-02-10) 1 commit
> - log: add --show-linear-break to help see non-linear history
>
> Attempts to show where a single-strand-of-pearls break in "git log"
> output.
>
> Will merge to 'next'.
Hold this one.
On Wed, Mar 12, 2014 at 3:26 AM, Junio C Hamano wrote:
> Sandy Carter writes:
>
>> Le 2014-03-11 15:59, Junio C Hamano a écrit :
>>> Sandy Carter writes:
>>>
diff --git a/wt-status.c b/wt-status.c
index a452407..69e0dfc 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -264,
Replace the chain of if statements with table of strings.
Signed-off-by: Paweł Wawruch
---
The changes proposed by Junio C Hamano:
Improvement of indentations. Removed an unused variable.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/243502
[2]: http://thread.gmane.org/gmane.comp.v
Add space between how and one when printing status of unmerged data.
This fixes an appending of the how message when it is longer than 20,
such is the case in some translations such as the french one where the
colon gets appended to the file:
supprimé par nous :wt-status.c
modifié des deux
* Junio C Hamano (gits...@pobox.com) wrote:
> Looks sensible; Dilyan, any comments?
Another addendum, comment from Tijl Coosemans who
just fixed this problem in FreeBSD ports (differently):
---
Please let upstream know they should either use iconv from libc +
nl_langinfo from libc, or iconv fro
On Mon, Mar 3, 2014 at 7:34 PM, Junio C Hamano wrote:
> I think you fundamentally cannot use two labels that are merely
> "distinct" and bisect correctly. You need to know which ones
> (i.e. good) are to be excluded and the other (i.e. bad) are to be
> included when computing the "remaining to be
Hello,
this changes effectively the meaning of CHARSET_LIB to
always/unconditionally contain the library with the charset_locale ()
function. The snippet at the end of the email updates the description
in /Makefile .
However, I checked now how gnulib deals with locale_charset (). Contary
This static function has no callers, nor has it had any since its
introduction in ba67aaf2d05d (git-sh-i18n--envsubst: our own envsubst(1)
for eval_gettext(), 2011-05-14). Remove it.
Signed-off-by: Eric Sunshine
---
The latest Apple developer tools (just released) has -Wunused-function
enabled b
* Junio C Hamano (gits...@pobox.com) wrote:
> > On e.g. FreeBSD 10.x, the following situation is common:
> > - there's iconv implementation in libc, which has no locale_charset()
> > function
> > - there's GNU libiconv installed from Ports Collection
> >
> > Git build process
> > - detects that
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Topics that have been cooking in 'next' for 2.0 have been merged to
'master', which means we are committed to make the next one a big
release.
Le mardi 11 mars 2014 à 21:11 +0100, Heiko Voigt a écrit :
> On Tue, Mar 11, 2014 at 10:55:03AM +0100, Henri GEIST wrote:
> > Le lundi 10 mars 2014 à 21:32 +0100, Heiko Voigt a écrit :
> > > On Mon, Mar 10, 2014 at 10:08:06AM +0100, Henri GEIST wrote:
> > > > Le samedi 08 mars 2014 à 00:00 +0100, J
On Mon, Mar 10, 2014 at 10:24:12PM +0100, Heiko Voigt wrote:
> I have also moved all functions into the new submodule-config-cache
> module. I am not completely satisfied with the naming since it is quite
> long. If someone comes up with some different naming I am open for it.
> Maybe simply submo
shawn wilson writes:
> Currently, I've got a perl script that modifies the Id line in a smudge
> filter:
> [filter "ident-line"]
> smudge = /usr/local/bin/githook_ident-filter.pl %f
>
> The problem I've noticed with smudge filters is that it leaves the
> repo dirty. How do I fix this? I am bas
"brian m. carlson" writes:
> We shrink the source and destination arrays, but not the modes or
> submodule_gitfile arrays, resulting in potentially mismatched data. Shrink
> all the arrays at the same time to prevent this.
>
> Signed-off-by: brian m. carlson
> ---
> builtin/mv.c | 5 +
> 1
On Tue, Mar 11, 2014 at 4:06 PM, Junio C Hamano wrote:
> I may be misremembering things, but your first sentence quoted above
> was exactly my reaction while reviewing the original change, and I
> might have even raised that as an issue myself, saying something
> like "consistency across values is
Currently, I've got a perl script that modifies the Id line in a smudge filter:
[filter "ident-line"]
smudge = /usr/local/bin/githook_ident-filter.pl %f
The problem I've noticed with smudge filters is that it leaves the
repo dirty. How do I fix this? I am basically trying to replicate the
behavi
Suppress printing the header (filename) with -h even if in -c/--count
mode. GNU grep and OpenBSD's grep do the same.
Signed-off-by: Rene Scharfe
---
grep.c | 7 +--
t/t7810-grep.sh | 12
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/grep.c b/grep.c
i
Some tests in t7810-grep.sh are in a loop that runs them against HEAD and
the work tree. In order for that to work the test code should use the
variables $L (display name), $H (HEAD or empty string) and $HC (revision
prefix for result lines); otherwise tests are just repeated with the same
target.
Benoit Pierre writes:
> Add (failing) test: with commit changing the environment to let hooks
> now that no editor will be used (by setting GIT_EDITOR to ":"), the
> "edit hunk" functionality does not work (no editor is launched and the
> whole hunk is committed).
>
> Signed-off-by: Benoit Pierre
Benoit Pierre writes:
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 5df3837..da423b2 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -53,10 +53,10 @@ struct checkout_opts {
> static int post_checkout_hook(struct commit *old, struct commit *new,
>
On Tue, Mar 11, 2014 at 01:25:23PM -0700, Junio C Hamano wrote:
> > Yeah, good idea. I might be misremembering some complications, but we
> > can probably do it with:
> >
> > 1. Teach the client to send an "advertise-symrefs" flag before the ref
> > advertisement.
> >
> > 2. Teach the ser
Dmitry Marakasov writes:
> On e.g. FreeBSD 10.x, the following situation is common:
> - there's iconv implementation in libc, which has no locale_charset()
> function
> - there's GNU libiconv installed from Ports Collection
>
> Git build process
> - detects that iconv is in libc and thus -licon
Thanks for the resubmission. Comments below.
On Tue, Mar 11, 2014 at 7:33 AM, Tamer TAS wrote:
> Subject: changed logical chain in branch.c to lookup tables
Use imperative tone: "change" rather than "changed"
Prefix the message with the part of the project you are touching. So,
for instance, yo
Sandy Carter writes:
> Le 2014-03-11 15:59, Junio C Hamano a écrit :
>> Sandy Carter writes:
>>
>>> diff --git a/wt-status.c b/wt-status.c
>>> index a452407..69e0dfc 100644
>>> --- a/wt-status.c
>>> +++ b/wt-status.c
>>> @@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct
>>> w
Jeff King writes:
> On Tue, Mar 11, 2014 at 12:32:37PM -0700, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > I think the main flag of interest is giving an fnmatch pattern to limit
>> > the advertised refs. There could potentially be others, but I do not
>> > know of any offhand.
>>
>> O
Le 2014-03-11 15:59, Junio C Hamano a écrit :
Sandy Carter writes:
diff --git a/wt-status.c b/wt-status.c
index a452407..69e0dfc 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct wt_status
*s,
case 6: how = _("both added:")
On Tue, Mar 11, 2014 at 10:55:03AM +0100, Henri GEIST wrote:
> Le lundi 10 mars 2014 à 21:32 +0100, Heiko Voigt a écrit :
> > On Mon, Mar 10, 2014 at 10:08:06AM +0100, Henri GEIST wrote:
> > > Le samedi 08 mars 2014 à 00:00 +0100, Jens Lehmann a écrit :
> > > > Am 06.03.2014 23:20, schrieb Henri GE
Michael Haggerty writes:
> It seems to me that "-z" input will nearly always be machine-generated,
> so there is not much reason to accept the empty string as shorthand for
> zeros. So I think that my version of the rules, being simpler to
> explain, is a slight improvement. But your version is
On Tue, Mar 11, 2014 at 12:32:37PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > I think the main flag of interest is giving an fnmatch pattern to limit
> > the advertised refs. There could potentially be others, but I do not
> > know of any offhand.
>
> One thing that comes to mind is
Sandy Carter writes:
> diff --git a/wt-status.c b/wt-status.c
> index a452407..69e0dfc 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct
> wt_status *s,
> case 6: how = _("both added:"); break;
> case 7: how = _("bot
Paweł Wawruch writes:
> Replace the chain of if statements with table of strings.
>
> Signed-off-by: Paweł Wawruch
> ---
> I changed the commit message. Logic of table has changed. To make it more
> clear I added three dimensions of the table.
I am not sure if the message is "diagnostic"; it l
Fredrik Gustafsson writes:
> On Tue, Mar 11, 2014 at 06:58:11PM +0700, Duy Nguyen wrote:
>> On Tue, Mar 11, 2014 at 5:45 PM, Fredrik Gustafsson wrote:
>> > Strbuf needs to be released even if it's locally declared.
>>
>> "path" is declared static. So yes it's a leak but the leak is minimum.
>>
Am 11.03.2014 13:36, schrieb Fredrik Gustafsson:
Strbuf needs to be released even if it's locally declared.
Signed-off-by: Fredrik Gustafsson
---
archive.c | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/archive.c b/archive.c
index 346f3b2..dfc557d 10064
Jeff King writes:
> I think the main flag of interest is giving an fnmatch pattern to limit
> the advertised refs. There could potentially be others, but I do not
> know of any offhand.
One thing that comes to mind is where symrefs point at, which we
failed to add the last time around because we
Jeff King writes:
> I'd say keep it at this point. I think there _are_ some good ideas here,
> and part of a project is figuring out what is good. And part of the role
> of the mentor is applying some taste.
Amen to that. I hope we have enough mentor-candidates with good
taste, though ;-)
> Th
Jeff King writes:
> Most of us who compile with -Wall decided a while ago to use
> -Wno-format-zero-length, because it really is a silly complaint (it
> assumes there are no side effects of the function besides printing the
> format string, which is obviously not true in this case).
>
> It would
Junio C Hamano writes:
>> Documentation on the whole argument parsing is quite short, so, I
>> though, adding an example just to show how usage is generated would
>> look like I am trying to make this feature look important than it is
>> :)
>
> You already are by saying the "Angle brackets are au
On e.g. FreeBSD 10.x, the following situation is common:
- there's iconv implementation in libc, which has no locale_charset()
function
- there's GNU libiconv installed from Ports Collection
Git build process
- detects that iconv is in libc and thus -liconv is not needed for it
- detects locale_
Jeff King peff.net> writes:
>
> Ah, you're right. I was thinking that our invocation of launch_editor
> also respected it. It does, but we never get there at all because
> use_editor is set to 0. So yeah, it really is just needed for the hook.
>
> Your patch, even though it is a bigger change,
Permit to do a 'git clone --recursive' through git-gui.
Add a 'recursive' checkbox in the clone menu which allows
users to clone a repository and all its submodules in one
go (unless the 'update' flag is set to "none" in the
.gitmodules file for a submodule, in that case that
specific submodule is
Eric Sunshine writes:
> On Mon, Mar 10, 2014 at 2:49 PM, Benoit Pierre
> wrote:
>> Add (failing) test: with commit changing the environment to let hooks
>> now that no editor will be used (by setting GIT_EDITOR to ":"), the
>> "edit hunk" functionality does not work (no editor is launched and t
On Tue, Mar 11, 2014 at 05:27:05PM +0100, Michael Haggerty wrote:
> Thanks for your proposal. I have a technical point that I think your
> proposal should address:
>
> Currently the linked list of lockfiles only grows, never shrinks. Once
> an object has been linked into the list, there is no w
On Tue, Mar 11, 2014 at 06:56:02PM +0100, Benoit Pierre wrote:
> According to the original commit, the change to GIT_EDITOR is only
> here for hooks:
>
> commit 406400ce4f69e79b544dd3539a71b85d99331820
> Author: Paolo Bonzini
> Date: Tue Feb 5 11:01:45 2008 +0100
>
> git-commit: set GIT_E
On Mon, Mar 10, 2014 at 9:07 PM, Jeff King wrote:
> On Mon, Mar 10, 2014 at 07:49:34PM +0100, Benoit Pierre wrote:
>
>> Don't change git environment: move the GIT_EDITOR=":" override to the
>> hook command subprocess, like it's already done for GIT_INDEX_FILE.
>> [...]
>
> This is a lot of change,
On Tue, Mar 11, 2014 at 2:00 AM, brian m. carlson
wrote:
> On Mon, Mar 10, 2014 at 07:49:37PM +0100, Benoit Pierre wrote:
>> ---
>> run-command.h | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/run-command.h b/run-command.h
>> index 88460f9..3653bfa 100644
>> --- a/run-command.h
>> ++
Am 11.03.2014 12:07, schrieb Henri GEIST:
> Le mercredi 05 mars 2014 à 19:00 +0100, Jens Lehmann a écrit :
>> Am 05.03.2014 00:01, schrieb Henri GEIST:
>>> Permit to do a 'git clone --recursive' through git-gui.
>>
>> I really like where this is heading!
>>
>> Some minor issues:
>>
>> - I think we
Add space between how and one when printing status of unmerged data.
This fixes an appending of the how message when it is longer than 20.
This is the case in some translations such as the french one where
the colon gets appended to the file:
supprimé par nous :wt-status.c
modifié des deux
On 03/01/2014 10:04 PM, Brian Gesiak wrote:
> Hello all,
>
> My name is Brian Gesiak. I'm a research student at the University of
> Tokyo, and I'm hoping to participate in this year's Google Summer of
> Code by contributing to Git. I'm a longtime user, first-time
> contributor--some of you may hav
On Tue, Mar 11, 2014 at 8:21 PM, Matthieu Moy
wrote:
> karthik nayak writes:
>
>> Currently we have multiple invocation of git_config() in an
>> individual invocation of git() which is not efficient. Also, it is
>> hard to implement new features,
>
> I think efficiency is not a real concern here.
karthik nayak writes:
> Currently we have multiple invocation of git_config() in an
> individual invocation of git() which is not efficient. Also, it is
> hard to implement new features,
I think efficiency is not a real concern here. Config files are small
and easy to parse, so parsing them mult
On Mon, Mar 10, 2014 at 10:56:51AM -0700, David Lang wrote:
> On Mon, 10 Mar 2014, Ondřej Bílka wrote:
>
> >On Mon, Mar 10, 2014 at 03:13:45AM -0700, David Lang wrote:
> >>On Mon, 10 Mar 2014, Dennis Luehring wrote:
> >>
> >>>according to these blog posts
> >>>
> >>>http://www.infoq.com/news/2014/
Replace the chain of if statements with table of strings.
Signed-off-by: Paweł Wawruch
---
I changed the commit message. Logic of table has changed. To make it more
clear I added three dimensions of the table.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/243502
[2]: http://thread
Hello to all,
I'm Karthik Nayak, a Computer Science student from Bangalore India. I
will be applying for GSOC 2014. This is my first time applying for
GSOC. I have been using Git for a long time now, so it would be an
ideal organisation for me to contribute to.
As suggested I completed the Micro P
Before cdab485 (upload-pack: delegate rev walking in shallow fetch to
pack-objects - 2013-08-16) upload-pack does not write to the source
repository. cdab485 starts to write $GIT_DIR/shallow_XX if it's a
shallow fetch, so the source repo must be writable.
git:// servers do not need write acces
On 03/10/2014 05:38 PM, Michael Haggerty wrote:
> It seems to me that "-z" input will nearly always be machine-generated,
> so there is not much reason to accept the empty string as shorthand for
> zeros. So I think that my version of the rules, being simpler to
> explain, is a slight improvement.
On Tue, Mar 11, 2014 at 06:58:11PM +0700, Duy Nguyen wrote:
> On Tue, Mar 11, 2014 at 5:45 PM, Fredrik Gustafsson wrote:
> > Strbuf needs to be released even if it's locally declared.
>
> "path" is declared static. So yes it's a leak but the leak is minimum.
> Your patch would make more sense if
Strbuf needs to be released even if it's locally declared.
Signed-off-by: Fredrik Gustafsson
---
archive.c | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/archive.c b/archive.c
index 346f3b2..dfc557d 100644
--- a/archive.c
+++ b/archive.c
@@ -113,6 +113,7 @@
On Tue, Mar 11, 2014 at 5:45 PM, Fredrik Gustafsson wrote:
> Strbuf needs to be released even if it's locally declared.
"path" is declared static. So yes it's a leak but the leak is minimum.
Your patch would make more sense if "static" is gone and it's leaked
after every write_archive_entry call.
On Mon, Mar 10, 2014 at 7:51 PM, Sandy Carter
wrote:
> Is there any update on this patch?
The patch looks good. Maybe Junio missed it.
>
> Le 2014-03-03 09:55, Sandy Carter a écrit :
>
>> Separate message from command examples to avoid translation issues
>> such as a dash being omitted in a tran
Eric Sunshine wrote
> On Mon, Mar 10, 2014 at 5:47 PM, Tamer TAS <
> tamertas@
> > wrote:
>
> Section 4.3 of the GNU gettext manual [1] explains the issues in more
> detail. I urge you to read it. The upshot is that translators fare
> best when handed full sentences.
>
> Note also that your cha
Le mercredi 05 mars 2014 à 19:00 +0100, Jens Lehmann a écrit :
> Am 05.03.2014 00:01, schrieb Henri GEIST:
> > Permit to do a 'git clone --recursive' through git-gui.
>
> I really like where this is heading!
>
> Some minor issues:
>
> - I think we should be more verbose in the commit message,
>
Am 10.03.2014 12:00, schrieb Michael Haggerty:
>
> Reference transactions
> --
>
Very cool ideas indeed.
However, I'm concerned a bit that transactions are conceptual overkill. How
many concurrent updates do you expect in a repository? Wouldn't a single
repo-wide lock suff
Reference: http://git.github.io/SoC-2014-Microprojects.html
Signed-off-by: Yuxuan Shui
---
builtin/fetch.c| 5 ++---
builtin/merge.c| 5 ++---
builtin/notes.c| 10 --
builtin/pack-objects.c | 15 ++-
builtin/update-index.c | 20
p
Strbuf needs to be released even if it's locally declared.
Signed-off-by: Fredrik Gustafsson
---
archive.c | 21 +++--
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/archive.c b/archive.c
index 346f3b2..d6d56e6 100644
--- a/archive.c
+++ b/archive.c
@@ -113,6 +113
Thanks for taking review comments from your previous attempt into
account. This is a more well-crafted submission. Additional comments
below.
On Tue, Mar 11, 2014 at 4:40 AM, Paweł Wawruch wrote:
> Subject: [PATHv2] branch.c:install_branch_config():Simplify code generating
> verbose message.
PA
On Tue, Mar 11, 2014 at 2:47 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> After squashing or fixing up, you may want to have a final look at the
>> commit, edit some more if needed or even do some testing. --postedit
>> enables that. This is (to me) a paranoid mode so either I e
Le lundi 10 mars 2014 à 21:32 +0100, Heiko Voigt a écrit :
> On Mon, Mar 10, 2014 at 10:08:06AM +0100, Henri GEIST wrote:
> > Le samedi 08 mars 2014 à 00:00 +0100, Jens Lehmann a écrit :
> > > Am 06.03.2014 23:20, schrieb Henri GEIST:
> > > >> What is the use case you are trying to solve and why ca
Simplify the long if chain in install_branch_config().
There is a long chain of if statements. The code can be more clear.
Replace the chain with table of strings. New approach is more
compact.
Signed-off-by: Paweł Wawruch
---
branch.c | 40 ++--
1 file chang
On Tue, Mar 11, 2014 at 3:16 AM, Nemina Amarasinghe wrote:
> Subject: simplified branch.c:install_branch_config() if() statement
Use imperative tone: "simplify ..."
> I hope this is the correct format for patch. Please comment on this if
> something is wrong.
This commentary is relevant to the
On Tue, Mar 11, 2014 at 2:30 AM, Nemina Amarasinghe wrote:
> Eric Sunshine sunshineco.com> writes:
>>
>> On Mon, Mar 10, 2014 at 3:58 AM, Nemina Amarasinghe
> gmail.com> wrote:
>> > Nemina Amarasinghe gmail.com> writes:
>> >
>> > Sorry for the first patch. Something went wrong. This is the corr
From: Johannes Sixt
The Windows API does not preserve file names with trailing spaces (and
dots), but rather strips them. Our tools (MSYS bash, git) base the POSIX
emulation on the Windows API. As a consequence, it is impossible for bash
on Windows to allocate a file whose name has trailing space
I hope this is the correct format for patch. Please comment on this if
something is wrong.
Signed-off-by:Nemina Amarasinghe
---
branch.c | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/branch.c b/branch.c
index 0304a7a..fd93603 100644
--- a/branch.c
+++ b/branch.c
@@
78 matches
Mail list logo
