On 10/12/2013 03:05 AM, Felipe Contreras wrote:
Hi,
Here are the patches that allow transport helpers to be completely
transparent;
renaming branches, deleting them, custom refspecs, --force, --dry-run,
reporting forced update, everything works.
These patches don't cleanly apply to master
One of the uses of the Fixes commit line is so that when we fix a
security bug that has been in mainline for a while, it can be tricky
to determine whether it should be backported in to the various stable
branches. For example, let's suppose the security bug (or any bug,
but one of the contexts
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.
Reported-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 4f47bdd..ef91882 100644
---
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index 707351d..f8eb143 100644
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index b6f623e..8ed41b4 100644
---
Hi,
Here are the patches that allow transport helpers to be completely transparent;
renaming branches, deleting them, custom refspecs, --force, --dry-run,
reporting forced update, everything works.
Some of these were were sent before and rejected without a reason, but here
they are again in case
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 30 ++
t/t9350-fast-export.sh| 7 +++
3 files changed, 41
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh
Otherwise they cannot know when to force the push or not (other than
hacks).
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index b32e2d6..408d596 100644
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index
On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote:
On 10/27/2013 02:34 AM, Josh Triplett wrote:
Linux Kernel Summit 2013 decided on a commit message convention to
identify commits containing bugs fixed by a commit: a Fixes: line,
included in the standard commit footer (along
On Sun, Oct 27, 2013 at 12:14 AM, Josh Triplett j...@joshtriplett.org wrote:
+-f commit::
+--fixes=commit::
+ Add Fixes line for the specified commit at the end of the commit
+ log message. This line includes an abbreviated commit hash for
+ the specified commit; the `core.abbrev`
Josh Triplett j...@joshtriplett.org writes:
On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote:
But I don't think that this feature should be given the -f short
option, as (a) -f often means force; (b) it will increase the
confusion with --fixup; (c) it just doesn't strike me as
On Sun, Oct 27, 2013 at 8:34 AM, Josh Triplett j...@joshtriplett.org wrote:
Add a command line option for git commit to automatically construct the
Fixes: line for a commit. This avoids the need to manually construct
that line by copy-pasting the commit hash and subject.
But you still have to
On Sun, Oct 27, 2013 at 03:33:19PM +0700, Duy Nguyen wrote:
On Sun, Oct 27, 2013 at 8:34 AM, Josh Triplett j...@joshtriplett.org wrote:
Add a command line option for git commit to automatically construct the
Fixes: line for a commit. This avoids the need to manually construct
that line by
On Sun, Oct 27, 2013 at 09:09:32AM +0100, Thomas Rast wrote:
Josh Triplett j...@joshtriplett.org writes:
On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote:
But I don't think that this feature should be given the -f short
option, as (a) -f often means force; (b) it will
On Sun, Oct 27, 2013 at 01:03:47AM -0700, Michel Lespinasse wrote:
On Sun, Oct 27, 2013 at 12:14 AM, Josh Triplett j...@joshtriplett.org wrote:
+-f commit::
+--fixes=commit::
+ Add Fixes line for the specified commit at the end of the commit
+ log message. This line includes an
On 10/27/2013 09:09 AM, Thomas Rast wrote:
Josh Triplett j...@joshtriplett.org writes:
On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote:
But I don't think that this feature should be given the -f short
option, as (a) -f often means force; (b) it will increase the
confusion
Hi, list!
See below.
Best,
Alexander.
agladysh@work-1:~/tmp/git$ git --version
git version 1.8.4.1
agladysh@work-1:~/tmp/git$ cat ./test.sh
#!/bin/bash
set -e
mkdir alpha
cd alpha
git init
mkdir beta
echo gamma beta/gamma
git add beta/gamma
git commit -m initial commit
mv beta delta
ln -s
On Sun, Oct 27, 2013 at 3:05 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18
On Sun, Oct 27, 2013 at 10:20 AM, Josh Triplett j...@joshtriplett.org wrote:
On Sun, Oct 27, 2013 at 09:09:32AM +0100, Thomas Rast wrote:
Josh Triplett j...@joshtriplett.org writes:
On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote:
But I don't think that this feature should
There are cases (e.g. when running concurrent fetches in a repo) where
multiple Git processes concurrently attempt to create loose objects
within the same objects/XX/ dir. The creation of the loose object files
is (AFAICS) safe from races, but the creation of the objects/XX/ dir in
which the loose
When 'git reflog tag' is called on a lightweight tag, nothing is
output. However, when called on an annotated tag, shortened SHA-1s for
all reachable commits are written on a single line.
Teach add_pending_object_with_mode() to handle OBJ_TAG, so that 'git
reflog' on an annotated tag is quiet,
Point test writers to the test_expect_* functions properly.
Signed-off-by: Torstein Hegge he...@resisty.net
---
t/test-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0fa7dfd..3dc1792 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@
Stefan Beller stefanbel...@googlemail.com writes:
I assembled an overview table, which plots the long options of
git commands by the short letters.
[...]
(In case thunderbird messes it up, here it is again
http://pastebin.com/raw.php?i=JBci2Krx)
As you can see, f is always --force except
On 10/27/2013 05:30 PM, Thomas Rast wrote:
Stefan Beller stefanbel...@googlemail.com writes:
I assembled an overview table, which plots the long options of
git commands by the short letters.
[...]
(In case thunderbird messes it up, here it is again
http://pastebin.com/raw.php?i=JBci2Krx)
On Saturday, October 26, 2013, Torsten Bögershausen wrote:
diff --git a/connect.c b/connect.c
index 06e88b0..903063e 100644
--- a/connect.c
+++ b/connect.c
@@ -564,9 +574,9 @@ struct child_process *git_connect(int fd[2], const char
*url_orig,
char *url;
char *host, *path;
We offer Loan for 3% if you are interested do send details.contact Mr Tony
Bowyer: coastalfinanceloanf...@hotmail.com
--
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
[Sorry I already sent the reply below to Johan only instead of everyone.]
Hi Johan,
On Sun, Oct 27, 2013 at 11:59 AM, Johan Herland jo...@herland.net wrote:
On Sun, Oct 27, 2013 at 10:20 AM, Josh Triplett j...@joshtriplett.org wrote:
...good suggestion:
~/src/linux$ git log --grep='stable@'
Hi.
First of all, thank you and congratulations for the awesome work :)
I've just made a clean install of OS X Mavericks and installed Git via
Homebrew, which obviously includes the contrib files.
I sourced the git-completion.bash into my profile and I get stuck on a
error every time I try to
document the new 'force' option
Signed-off-by: Richard Hansen rhan...@bbn.com
---
Documentation/gitremote-helpers.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/gitremote-helpers.txt
b/Documentation/gitremote-helpers.txt
index f1f4ca9..e75699c 100644
---
Signed-off-by: Richard Hansen rhan...@bbn.com
---
git-remote-testgit.sh | 18 ++
1 file changed, 18 insertions(+)
diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh
index 6d2f282..80546c1 100755
--- a/git-remote-testgit.sh
+++ b/git-remote-testgit.sh
@@ -6,6 +6,7 @@
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/t5801-remote-helpers.sh | 13 +
1 file changed, 13 insertions(+)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index be543c0..93a7d34 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@
Solaris' sed was choking on the i\ commands used in
t4015-diff-whitespace as it couldn't parse the program properly.
Modify two uses of sed that worked in GNU sed but not Solaris'
(/usr/bin or /usr/xpg4/bin) to an equivalent form that is handled
properly by both.
Signed-off-by: Ben Walton
On Sun, Oct 27, 2013 at 4:59 PM, Gabriel gabriel...@gmail.com wrote:
I've just made a clean install of OS X Mavericks and installed Git via
Homebrew, which obviously includes the contrib files.
I sourced the git-completion.bash into my profile and I get stuck on a
error every time I try to
On 10/26/13 18:34, Josh Triplett wrote:
Linux Kernel ... Fixes: line ... containing an abbreviated commit hash
!-- --
This helps people (or automated tools) determine how far to backport
I beg pardon if I'm rehearsing an old debate, but it seems to me it
would be better and worthwhile to
There are unbound number of kinds of trailers people would want to
add, depending on their projects' needs. We should not have to add
a specific support for a tailer like this one, before thinking
through to see if we can add generic support for adding arbitrary
trailers to avoid code and
On Sun, Oct 27, 2013 at 8:04 PM, Christian Couder
christian.cou...@gmail.com wrote:
On Sun, Oct 27, 2013 at 2:30 PM, Johan Herland jo...@herland.net wrote:
On Sun, Oct 27, 2013 at 1:30 PM, Christian Couder
christian.cou...@gmail.com wrote:
Your suggestion is very good, and it is not
[re-adding git mailing list]
Please do use Reply All and respond inline (as below) rather than top-posting.
On Sun, Oct 27, 2013 at 8:47 PM, Gabriel gabriel...@gmail.com wrote:
I have a possible broken shell pipe.
grep/egrep works fine when I pass a pattern and a file or folder, but
it
41 matches
Mail list logo
