Angelo Borsotti writes:
> Another git config foo.bar true changes the config file into:
>
> [foo]
> [foo]
> bar = true
>
> Having two sections with the same name clutters the config file.
True. It would be nice if the removal of the last element removes
the section header as well.
The following two patches are based on rs/branch-del-symref, and fixes
the remaining failure to delete a packed ref through a symref.
The first patch demonstrates the bug with a testcase, and the second
patch fixes the bug.
Feel free to squash the two patches into one, if you prefer to keep
both
When deleting a ref through a symref (e.g. using 'git update-ref -d HEAD'
to delete refs/heads/master), we currently fail to remove the packed
version of that ref. This testcase demonstrates the bug.
Signed-off-by: Johan Herland
---
t/t1400-update-ref.sh | 18 ++
1 file changed,
When deleting a ref through a symref (e.g. using 'git update-ref -d HEAD'
to delete refs/heads/master), we would remove the loose ref, but a packed
version of the same ref would remain, the end result being that instead of
deleting refs/heads/master we would appear to reset it to its state as of
th
Teach symbolic-ref to delete symrefs by adding the -d/--delete option to
git-symbolic-ref. Both proper and dangling symrefs are deleted by this
option, but other refs - or anything else that is not a symref - is not.
The symref deletion is performed by first verifying that we are given a
proper sy
On Sat, Oct 20, 2012 at 10:34 PM, wrote:
> On Sat, 20 Oct 2012, Drew Northup wrote:
>> On Sun, Oct 14, 2012 at 12:57 AM, wrote:
>>> On Sat, 13 Oct 2012, Junio C Hamano wrote:
da...@lang.hm writes:
>
> today I have just a single git tree covering everything, and I make a
> commi
On Mon, Oct 8, 2012 at 7:33 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> In other words, you can do this from the command line if you want
>> to do the update.
>>
>> $ git fetch origin master:refs/remotes/origin/master
>
> Now having said all that, we should probably revisit this and
On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy
wrote:
> David Aguilar writes:
>
>> I would advise against the file locking, though. You ain't gonna need
>> it ;-)
>
> What do you suggest to merge Word files?
If the files are in the DOCX format you can just expand them as zip
archives and diff what
On Sun, Oct 21, 2012 at 7:20 PM, Drew Northup wrote:
> On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy
> wrote:
>> David Aguilar writes:
>>
>>> I would advise against the file locking, though. You ain't gonna need
>>> it ;-)
>>
>> What do you suggest to merge Word files?
>
> If the files are in the
On Sun, Oct 21, 2012 at 5:50 PM, Drew Northup wrote:
> On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy
> wrote:
>> David Aguilar writes:
>>
>>> I would advise against the file locking, though. You ain't gonna need
>>> it ;-)
>>
>> What do you suggest to merge Word files?
>
> If the files are in the
On 10/21/2012 08:32 AM, Junio C Hamano wrote:
> Herman van Rink writes:
>
>> Junio, Could you please consider merging the single commit from my
>> subtree-updates branch? https://github.com/helmo/git/tree/subtree-updates
> In general, in areas like contrib/ where there is a volunteer area
> mainta
Am 21.10.2012 12:40, schrieb Johan Herland:
When deleting a ref through a symref (e.g. using 'git update-ref -d HEAD'
to delete refs/heads/master), we would remove the loose ref, but a packed
version of the same ref would remain, the end result being that instead of
deleting refs/heads/master we
I've looked at many hg<->git tools and none satisfy me. Too complicated, or too
slow, or to difficult to setup, etc.
The only one I've liked so far is hg-fast-export[1], which is indeed fast,
relatively simple, and relatively easy to use. But it's not properly maintained
any more.
So, I decided t
Signed-off-by: Felipe Contreras
---
contrib/remote-hg/git-remote-hg | 313
1 file changed, 313 insertions(+)
create mode 100755 contrib/remote-hg/git-remote-hg
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
new file mode 1
Some parsing of fast-export parsing might be missing, but I couldn't find any.
Signed-off-by: Felipe Contreras
---
contrib/remote-hg/git-remote-hg | 156 +++-
1 file changed, 154 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/con
I'm not happy with this, but works.
Signed-off-by: Felipe Contreras
---
contrib/remote-hg/git-remote-hg | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index fc4510c..34a00cd 100755
--- a/contrib/remo
So that the other remote-hg tests don't barf.
I'm not particularily happy with this code, but does the trick.
Signed-off-by: Felipe Contreras
---
contrib/remote-hg/git-remote-hg | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-hg/git-remot
>From the original remote-hg.
You need git-remote-hg already in your path to run them.
I'm not proposing to include this patch like this, but should make it easier to
test.
Signed-off-by: Felipe Contreras
---
t/t5801-remote-hg.sh | 143 +++
1 fil
Signed-off-by: Felipe Contreras
---
t/t5801-remote-hg.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5801-remote-hg.sh b/t/t5801-remote-hg.sh
index 2e68372..ba4d7a2 100755
--- a/t/t5801-remote-hg.sh
+++ b/t/t5801-remote-hg.sh
@@ -95,7 +95,7 @@ test_expect_success 'p
[Added area experts of git-p4 to Cc.]
Matt Arsenault writes:
> From 425e4dc6992d07aa00039c5bb8e8c76def591fd3 Mon Sep 17 00:00:00 2001
> From: Matt Arsenault
> Date: Sat, 20 Oct 2012 18:48:45 -0700
> Subject: [PATCH] git-p4: Fix not using -s option to describe
Please do not include these four l
Johan Herland writes:
> When deleting a ref through a symref (e.g. using 'git update-ref -d HEAD'
> to delete refs/heads/master), we would remove the loose ref, but a packed
> version of the same ref would remain, the end result being that instead of
> deleting refs/heads/master we would appear t
Johan Herland writes:
> Teach symbolic-ref to delete symrefs by adding the -d/--delete option to
> git-symbolic-ref. Both proper and dangling symrefs are deleted by this
> option, but other refs - or anything else that is not a symref - is not.
>
> The symref deletion is performed by first verify
Otherwise transport-helper will continue checking for refs and other
things what will confuse the user more.
Signed-off-by: Felipe Contreras
---
git-remote-testgit.py | 3 +++
run-command.c | 17 +
run-command.h | 1 +
t/t5800-remote-helpers.sh | 6
Drew Northup writes:
> On Mon, Oct 8, 2012 at 7:33 PM, Junio C Hamano wrote:
>> Junio C Hamano writes:
>>
>> I personally do not think the downside of breaking backward
>> compatibility is too bad. If we do this only when we already are
>> configured to keep remote tracking branch for branch $
Herman van Rink writes:
> On 10/21/2012 08:32 AM, Junio C Hamano wrote:
>> Herman van Rink writes:
>>
>>> Junio, Could you please consider merging the single commit from my
>>> subtree-updates branch? https://github.com/helmo/git/tree/subtree-updates
>> In general, in areas like contrib/ where t
git commit -S, --gpg-sign was mentioned in the program's help message,
but not in the manpage.
This adds an equivalent entry for the option in the manpage.
---
Documentation/git-commit.txt |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-commit.txt b
Hi Felipe,
On Sun, 21 Oct 2012, Felipe Contreras wrote:
> On Thu, Oct 18, 2012 at 10:47 AM, Johannes Schindelin
> wrote:
>
> > Without push support, remote-hg is useless to me. Without regression
> > tests proving that it is rock solid, I will not use remote-hg.
>
> Done and done. My remote-hg
Tom Jones writes:
> git commit -S, --gpg-sign was mentioned in the program's help message,
> but not in the manpage.
>
> This adds an equivalent entry for the option in the manpage.
> ---
Sign off?
> Documentation/git-commit.txt |6 +-
> 1 files changed, 5 insertions(+), 1 deletions(-)
On 10/21/2012 09:51 PM, Junio C Hamano wrote:
> Herman van Rink writes:
>
>> On 10/21/2012 08:32 AM, Junio C Hamano wrote:
>>> Herman van Rink writes:
>>>
Junio, Could you please consider merging the single commit from my
subtree-updates branch? https://github.com/helmo/git/tree/subtree
On Sun, Oct 21, 2012 at 10:03 PM, Johannes Schindelin
wrote:
> On Sun, 21 Oct 2012, Felipe Contreras wrote:
>
>> On Thu, Oct 18, 2012 at 10:47 AM, Johannes Schindelin
>> wrote:
>>
>> > Without push support, remote-hg is useless to me. Without regression
>> > tests proving that it is rock solid, I
Felipe Contreras writes:
> Otherwise transport-helper will continue checking for refs and other
> things what will confuse the user more.
>
> Signed-off-by: Felipe Contreras
> ---
> git-remote-testgit.py | 3 +++
> run-command.c | 17 +
> run-command.h
Signed-off-by: Philip Oakley
---
My question on stackoverflow http://stackoverflow.com/questions/6800692
how-do-git-grafts-and-replace-differ-are-grafts-now-deprecated
noted that the gitrepository-layout(5) wasn't up to date.
Recent hits have propmted me to offer a patch.
Here is that patch.
On Sun, Oct 21, 2012 at 10:49 AM, Felipe Contreras
wrote:
> From the original remote-hg.
>
> You need git-remote-hg already in your path to run them.
>
> I'm not proposing to include this patch like this, but should make it easier
> to
> test.
You should also have a look at the tests that were m
This probably got lost in the mail. Could somebody familiar with
git-subtree take a look?
Tomi
On Sat, Oct 13, 2012 at 3:47 PM, Tomi Belan wrote:
>
> Hello folks,
>
> I think I might've found a bug in git-subtree: I have a repository
> containing a directory "foo". I'd like to use its code in oth
Hi,
Sometimes I have to clone a repository over a slow / rather unreliable
network and wonder whether there are any tools tricks to reduce the pain
for such cases.
I'm having two problems:
Problem 1: Resuming a clone:
-
When the connection gets cut during the cl
From: "Junio C Hamano"
"Philip Oakley" writes:
From: "Junio C Hamano"
When inserting the note after the commit log message to format-patch
output, add three dashes before the note. Record the fact that we
did so in the rev_info and omit showing duplicated three dashes in
the usual codepath
Show that git format-patch can have a cover letter, include patch
commentary below the three dashes, and notes can also be
included.
Signed-off-by: Philip Oakley
---
Documentation/user-manual.txt | 5 +
1 file changed, 5 insertions(+)
diff --git a/Documentation/user-manual.txt b/Documentati
git format-patch gained a --notes option. Tell the notes user.
Signed-off-by: Philip Oakley
---
Documentation/git-notes.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index b95aafa..46ef046 100644
--- a/Documentation/git-note
Remove double negative, and include the repeat usage across
versions of a patch series.
Signed-off-by: Philip Oakley
---
Documentation/git-format-patch.txt | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-format-patch.txt
b/Documentation/git-form
The git format-patch --notes option can now insert the commit notes
after the three dashes. Mention this after the regular cover letter
guidance for submitting patches.
Signed-off-by: Philip Oakley
---
Documentation/SubmittingPatches | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff
The latest feature release Git v1.8.0 is now available at the
usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
a03afc33f8f0723ad12649d79f1e8968526b4bf7 git-1.8.0.tar.gz
93c860cf4cd26d4b3e269b0903b833db1c1f0f8e
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
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 1.8.0 release has been tagged. I'd disappear for a few weeks
without carrying a computer, and Git will be in steady hands of Jeff
King (tha
On Tue, Oct 02, 2012 at 11:04:43AM -0400, Andrew Wong wrote:
> Refactored the code for binding modified function keys as Junio suggested.
>
> Andrew Wong (2):
> gitk: Refactor code for binding modified function keys
> gitk: Use bindshiftfunctionkey to bind Shift-F5
>
> gitk | 10 +++---
>
On Sun, Oct 21, 2012 at 10:33 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>> +int check_command(struct child_process *cmd)
>> +{
>> + int status;
>> + pid_t pid;
>> +
>> + pid = waitpid(cmd->pid, &status, WNOHANG);
>> +
>> + if (pid < 0)
>> + return -1;
>> +
On Thu, Oct 04, 2012 at 10:50:15PM +0200, Stefan Haller wrote:
> Sorry, I didn't realize that there is a display mode where the
> list of files is empty, not even showing a "Comments" entry.
>
> Here's a patch that fixes it, plus another patch that is only related
> in so far as the bug that it fi
On Sun, Oct 07, 2012 at 11:21:14PM +0200, Marcus Karlsson wrote:
> When configured not to use themed widgets gitk may crash on launch with
> a message that says that the image "bm-left disabled bm-left-gray"
> doesn't exist. This happens when the left and right arrow buttons are
> created.
>
> The
On Wed, Oct 03, 2012 at 08:22:17AM +0100, Peter Krefting wrote:
> This patch updates the Swedish translation for gitk. To avoid the
> UTF-8 encoding of the file to be mangled by my email software, the
> patch is attached gzip'ed.
>
> --
> \\// Peter - http://www.softwolves.pp.se/
Thanks, applied
On Sun, 21 Oct 2012, Drew Northup wrote:
On Sat, Oct 20, 2012 at 10:34 PM, wrote:
On Sat, 20 Oct 2012, Drew Northup wrote:
On Sun, Oct 14, 2012 at 12:57 AM, wrote:
On Sat, 13 Oct 2012, Junio C Hamano wrote:
da...@lang.hm writes:
today I have just a single git tree covering everything,
On Wed, Oct 17, 2012 at 7:28 PM, SZEDER Gábor wrote:
> On Sun, Oct 14, 2012 at 05:52:49PM +0200, Felipe Contreras wrote:
>> diff --git a/contrib/completion/git-completion.bash
>> b/contrib/completion/git-completion.bash
>> index d743e56..01325de 100644
>> --- a/contrib/completion/git-completion.
As the subject says. These came up in a discussion with SZEDER.
Felipe Contreras (2):
completion: refactor __gitcomp related tests
completion: simplify __gitcomp test helper
t/t9902-completion.sh | 71 +++
1 file changed, 21 insertions(+), 50 d
Lots of duplicated code!
No functional changes.
Signed-off-by: Felipe Contreras
---
t/t9902-completion.sh | 72 ---
1 file changed, 23 insertions(+), 49 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index cbd0fb6..1c6952
By using print_comp as suggested by SZEDER Gábor.
Signed-off-by: Felipe Contreras
---
t/t9902-completion.sh | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 1c6952a..2e7fc06 100755
--- a/t/t9902-completion.sh
++
Hi,
Here's a bit of reorganition. I'm introducing a new __gitcompadd helper that is
useful to wrapp all changes to COMPREPLY, but first, lets get rid of
unnecessary assignments as SZEDER suggested.
The zsh wrapper is now very very simple.
Since v5:
* Get rid of unnecessary COMPREPLY assignmen
There's no functional reason for those, the only purpose they are
supposed to serve is to say "we don't provide any words here", but even
for that it's not used consitently.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 28
1 file chang
The idea is to never touch the COMPREPLY variable directly.
This allows other completion systems override __gitcompadd, and do
something different instead.
Also, this allows the simplification of the completion tests (separate
patch).
There should be no functional changes.
Signed-off-by: Felipe
It seems there's always issues with zsh's bash completion emulation.
I've tried to fix as many as I could and most of the fixes are already
in the latest version of zsh, but still, there are issues.
There is no point in going through all that pain; the emulation is easy
to achieve, and this patch
On 21 October 2012 18:31, Mike Norman wrote:
> Many links on scm-git.org/docs simply reload the page.
>
> For example, all of Sharing and Updating section simply reload the
> docs page. And tons others. Must be a broken link or routing problem.
> Repros on FF 14.0.1 and Chrome. Good luck!
>
Inclu
Am 10/21/2012 21:19, schrieb Felipe Contreras:
> diff --git a/run-command.c b/run-command.c
> index 1101ef7..2852e9d 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -559,6 +559,23 @@ int run_command(struct child_process *cmd)
> return finish_command(cmd);
> }
>
> +int check_command
59 matches
Mail list logo
