-reachable history), is more involved
than simply calling out to git fetch...
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
On Thu, Oct 16, 2014 at 2:25 PM, Jeff King p...@peff.net wrote:
On Thu, Oct 16, 2014 at 11:04:04AM +0200, Johan Herland wrote:
I simply copied the packfile containing the good copy into the
corrupted repo, and then ran a git gc, which happened to use the
good copy of the corrupted object
On Sun, Sep 21, 2014 at 10:53 AM, Torsten Bögershausen tbo...@web.de wrote:
On 2014-09-21 05.00, Johan Herland wrote:
[...]
+cat expect EOF
Git style for shell scripts: Plase put no space between or or and the
file name:
cat expect EOF
[...]
+ git log -1 actual
git log -1
was surprised to see that this behavior was deliberately introduced:
git log -1 a0b4dfa
commit a0b4dfa9b35a2ebac578ea5547b041bb78557238
Author: Johan Herland jo...@herland.net
Date: Sat Feb 13 22:28:24 2010 +0100
Teach builtin-notes to remove empty notes
When
$empty_blob.
Reported-by: James H. Fisher j...@trifork.com
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 16 +++-
notes.c | 3 +--
t/t3301-notes.sh | 19 +++
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/builtin/notes.c b
with the corresponding local notes ref
Have fun! :)
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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 Fri, Sep 19, 2014 at 8:22 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
On Fri, Sep 19, 2014 at 11:39 AM, Jeff King p...@peff.net wrote:
On Fri, Sep 19, 2014 at 09:39:45AM +0200, Scott Chacon wrote:
Currently if you try to merge notes, the notes code
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
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body
for the noise.
Hopefully, I will learn not to blindly follow my assumptions.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
(and preferably supersede) my tests.
I have not found the time to look more at that effort.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/246312
[2]: http://thread.gmane.org/gmane.comp.version-control.git/245048/focus=245046
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
mailing list and elsewhere, and I have no
doubt that this will be a very useful feature that will be put to good
use in many projects.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
recipe) for git-imerge:
https://aur.archlinux.org/packages/git-imerge-git/
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
Python2 for that.
FWIW, the rules laid out in PEP394 should be very easy to follow:
- If your script is Python2-only, use #!/usr/bin/env python2
- If your script is Python3-only, use #!/usr/bin/env python3
- If your script is Python2/3-agnostic, use #!/usr/bin/env python
...Johan
--
Johan
(for python2-only scripts) '/usr/bin/env python2' is the way to go.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
On Wed, May 7, 2014 at 1:11 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Johan Herland wrote:
On Wed, May 7, 2014 at 12:03 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
It's better if all our scripts use the same '/usr/bin/env python'.
Only if they are source compatible
hook itself into the user's .git/hooks/ dir.
3. Tell your co-workers to run the post-checkout hook script manually
the first time. After that, the script should take care of updating
itself and any hooks that you add to the project.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
On Mon, Apr 28, 2014 at 12:03 PM, Sitaram Chamarty sitar...@gmail.com wrote:
Johan Herland jo...@herland.net writes:
Obviously, the feature would necessarily have to be optional, simply
because Git would have to keep understanding the old commit object
format for a LONG time (probably
above), and
provide some tools that demonstrate the added value of this
information. If that is successful and gains momentum, the git
community can certainly reconsider whether it makes sense to fold it
into a more formalized part of the commit object.
...Johan
--
Johan Herland, jo
On Sun, Apr 27, 2014 at 7:38 PM, Jeremy Morton ad...@game-point.net wrote:
On 27/04/2014 10:09, Johan Herland wrote:
On Sun, Apr 27, 2014 at 1:56 AM, Jeremy Mortonad...@game-point.net
wrote:
Currently, git records a checksum, author, commit date/time, and commit
message with every commit
On Sun, Apr 27, 2014 at 10:55 PM, Jeremy Morton ad...@game-point.net wrote:
On 27/04/2014 20:33, Johan Herland wrote:
On Sun, Apr 27, 2014 at 7:38 PM, Jeremy Mortonad...@game-point.net
wrote:
On 27/04/2014 10:09, Johan Herland wrote:
As far as I can tell from that discussion, the general
the old default, you can get it by passing
+'--prefix ' on the command line ('--prefix=' may not work if
+your Perl's Getopt::Long is v2.37).
--ignore-paths=regex;;
When passed to 'init' or 'clone' this regular expression will
...Johan
--
Johan Herland, jo...@herland.net
Add a description of =1.9 behavior in the manpage. Users on
long-term-support systems are likely to continue using ancient
git installations for some time (5-10 years, even?), but may
come across the current documentation online.
Suggested-by: Eric Wong normalper...@yhbt.net
Signed-off-by: Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
PM, W. Trevor King wk...@tremily.us wrote:
On Wed, Apr 16, 2014 at 02:54:48AM +0200, Johan Herland wrote:
This is a work-in-progress to flesh out (and promote discussion about)
the expected behaviors for all possible scenarios in which
'git submodule update' might be run.
This is lovely
King: submodule: explicit local branch creation in
module_clone). Looking at the patch, it seems to introduce an implicit
assumption on the submodule origin having a master branch. Is this
an intended change in behaviour?
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
:
On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote:
Am 27.03.2014 18:16, schrieb Junio C Hamano:
Johan Herland jo...@herland.net writes:
I just found a failure to checkout a project with submodules where
there is no explicit submodule branch configuration, and the
submodules
' is somewhat
analogous to unset branch.name.merge while pulling. I.e. you have
told me to merge/rebase, but you have not told me against which
branch, therefore error out.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git
and the plan you have for how to get there.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
the same way Mercurial does.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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, Mar 10, 2014 at 1:46 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
Previously there were no good tests of C-quoted arguments.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
FWIW, the first 5 patches seem trivially correct to me. Feel free to add:
Reviewed-by: Johan Herland jo
quotes?
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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 4, 2014 at 3:57 PM, Matthijs Kooijman matth...@stdin.nl wrote:
On Tue, Mar 04, 2014 at 03:53:24PM +0100, Johan Herland wrote:
What would you expect echo '$name' to do?
If I run git submodule foreach each '$name', then my shell eats the
single quotes (which are only to prevent my
On Mon, Feb 24, 2014 at 11:27 AM, ydir...@free.fr wrote:
Johan Herland jo...@herland.net wrote on 02/24/2014 02:29:10:
I've been thinking about this for a while now, and I find myself
agreeing more and more with Junio's argument in the linked thread.
I think notes are fundamentally - like
On Wed, Feb 19, 2014 at 12:10 AM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Feb 18, 2014 at 9:46 PM, Johan Herland jo...@herland.net wrote:
On Mon, Feb 17, 2014 at 11:48 AM, yann.dir...@bertin.fr wrote:
The recent git-note -C changes commit type? thread
(http://thread.gmane.org
there is a reason not to reuse the push/pull
terminology for these concepts, but if there is, I guess we could
instead call them @{source}/@{destination}, @{src}/@{dst}, or
@{from}/@{to}, or somesuch...
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line
at notes-as-trees. The
first consequence of this is probably that your added -o/--object
option should be renamed. -t/--tree is not taken, AFAICS...
Johan Herland wrote:
Obviously, it would not make sense to use refs/notes/history while
displaying the commit log (git log --notes=history), as the raw
On Wed, Feb 12, 2014 at 1:06 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
There is currently no way the git notes commands will allow you to
store the 3d7de37 commit object directly as a note. There is also
(AFAICS) no easy workaround (git fast-import
-c/-C is
passed to git notes append (which appends the $object contents to an
existing note object). In both cases, passing a non-blob $object does not
make sense.
Also add a couple of tests demonstrating expected behavior.
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland
On Wed, Feb 12, 2014 at 9:53 AM, Joachim Breitner
m...@joachim-breitner.de wrote:
Am Mittwoch, den 12.02.2014, 00:52 +0100 schrieb Johan Herland:
You would have a notes ref refs/notes/history whose tree would
contain an entry named e1bfac434ebd3135a3784f6fc802f235098eebd0
pointing
), and keep everything
alive/reachable/shareable that way...
Hope this helps,
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
into your dotfiles
repo.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
and, on the other hand, hundreds of contributors. Would the mentioned
authors (CCed) consent to the removal of these sections?
No problem from me.
No problems here.
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body
On Thu, Dec 19, 2013 at 10:31 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 12/19/2013 02:11 AM, Johan Herland wrote:
On Thu, Dec 19, 2013 at 12:44 AM, Michael Haggerty mhag...@alum.mit.edu
wrote:
A correct incremental converter could be done (as long as the CVS users
don't literally
whatever available tools they
have to solve whatever problems they are currently having. And when
CVS is your tool, you will sooner or later end up with a solution
that irrevocably rewrites your CVS history.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list
without having to consult/convert the rest of the CVS
history. THIS is the hard part of incremental import. And it is much
harder for systems like CVS - where the starting point has a broken
concept of history...
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from
On Tue, Dec 17, 2013 at 3:58 PM, Eric S. Raymond e...@thyrsus.com wrote:
Johan Herland jo...@herland.net:
HOWEVER, this only solves the cheap half of the problem. The reason
people want incremental CVS import, is to avoid having to repeatedly
convert the ENTIRE CVS history. This means
this one-liner:
git for-each-ref --format %(refname:short) refs/heads/ | while
read branch; do echo $branch - $(git config
branch.$branch.description); done
I guess that could even be turned into an alias...
Hope this helps,
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
.
Those would be useful reference points when implementing a
git-remote-fossil helper. git-remote-mediawiki in contrib/mw-to-git/
might also be a useful example.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body
On Mon, Nov 4, 2013 at 8:12 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
+{
+ char *end = strchr(arg, '=');
+ if (!end)
+ end = strchr(arg, ':');
So both '=' (preferred) and ':' are accepted as field/value
separators. That's
complex_message ack:
Peff bug: 42 actual
+ test_cmp expected actual
+'
+
+test_done
--
1.8.4.1.576.g36ba827.dirty
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
used/accepted widely enough to actually
replace current ad hoc solutions.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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
On Mon, Oct 28, 2013 at 11:10 PM, Thomas Rast t...@thomasrast.ch wrote:
Johan Herland jo...@herland.net writes:
But I still don't see exactly what this option should do (inside git
commit) that would end up being useful across most/all projects, and
not just something that could more easily
On Tue, Oct 29, 2013 at 3:08 AM, Jeff King p...@peff.net wrote:
On Mon, Oct 28, 2013 at 12:29:32PM +0100, Johan Herland wrote:
A hook-based solution could do this. But a built-in all-purpose
handler like footer.Fixes.arg=commit, which was intended to be
reusable, wouldn't be able to do
On Tue, Oct 29, 2013 at 7:23 AM, Christian Couder
christian.cou...@gmail.com wrote:
On Mon, Oct 28, 2013 at 3:46 AM, Johan Herland jo...@herland.net wrote:
On Sun, Oct 27, 2013 at 8:04 PM, Christian Couder
christian.cou...@gmail.com wrote:
If git commit processes these arguments and puts
the common cases, so that is not a useful
differentiator between the two approaches. I would even venture to
ask: If we end up solving this problem in config and not in hooks,
then why do we bother having hooks in the first place?
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
to add any command-line options to Git.
3. The whole mechanism is controlled by the project. The kernel folks
can do whatever they want in their templates/hooks without needing
changes to the Git project.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from
() race to chmod() that directory, but fails
because it is (transiently, until the first users completes its chmod())
unwriteable to the other user. However, (an equivalent of) this race also
exists before this patch, and is made no worse by this patch.
Signed-off-by: Johan Herland jo...@herland.net
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
to run git fetch $remote. If $remote does not exist, leave the
current error message in place.
Hope this helps,
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
On Fri, Oct 25, 2013 at 9:10 AM, Jeff King p...@peff.net wrote:
On Fri, Oct 25, 2013 at 09:03:41AM +0200, Johan Herland wrote:
1. Split the input on the first '/' into $remote/$branch, and use the
preceding part ($remote) as a potential remote name, and the following
part ($branch
() setting errno = EEXIST as success.
Signed-off-by: Johan Herland jo...@herland.net
---
sha1_file.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sha1_file.c b/sha1_file.c
index f80bbe4..00e 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2857,7 +2857,9 @@ static int
On Fri, Oct 18, 2013 at 3:53 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Fri, Oct 18, 2013 at 9:17 AM, Johan Herland jo...@herland.net wrote:
There are cases (e.g. when running concurrent fetches in a repo) where
multiple Git processes concurrently attempt to create loose objects
On Fri, Oct 18, 2013 at 4:00 PM, Duy Nguyen pclo...@gmail.com wrote:
On Fri, Oct 18, 2013 at 8:55 PM, Duy Nguyen pclo...@gmail.com wrote:
On Fri, Oct 18, 2013 at 8:17 PM, Johan Herland jo...@herland.net wrote:
diff --git a/sha1_file.c b/sha1_file.c
index f80bbe4..00e 100644
-creating process started before the core.sharedRepository
change, and the manual permission update of object dirs).
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Hi,
Another iteration, identical to v2, except for the fixes suggested by
Eric Sunshine.
...Johan
Johan Herland (3):
Documentation/git-svn: Promote the use of --prefix in docs + examples
git-svn: Warn about changing default for --prefix in Git v2.0
Git 2.0: git svn: Set default --prefix
normalper...@yhbt.net
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-svn.txt | 35 +--
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 4dd3bcb..ac0c72f 100644
-diff
and --word-diff-regex=. diff options.)
Suggested-by: Thomas Ferris Nicolaisen tfn...@gmail.com
Cc: Eric Wong normalper...@yhbt.net
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-svn.txt| 19 +
git-svn.perl
running init/clone in the multi-mode
without providing a --prefix.
Cc: Eric Wong normalper...@yhbt.net
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-svn.txt | 11 ++-
git-svn.perl | 12 +++-
t/t9117-git-svn-init-clone.sh | 67
On Wed, Oct 9, 2013 at 3:33 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Oct 5, 2013 at 7:30 PM, Johan Herland jo...@herland.net wrote:
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 4dd3bcb..da00671 100644
--- a/Documentation/git-svn.txt
+++ b
On Wed, Oct 9, 2013 at 3:34 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Oct 5, 2013 at 7:30 PM, Johan Herland jo...@herland.net wrote:
diff --git a/t/t9117-git-svn-init-clone.sh b/t/t9117-git-svn-init-clone.sh
index b7ef9e2..1c8d049 100755
--- a/t/t9117-git-svn-init-clone.sh
On Sun, Oct 6, 2013 at 11:51 AM, Philip Oakley philipoak...@iee.org wrote:
From: Johan Herland jo...@herland.net
Cc: Eric Wong normalper...@yhbt.net
Excuse my ignorance, but what is the Carbon copy: line meant to signify?
Should it be a double Signed-of-by: or one of the other -by: lines
running init/clone in the multi-mode
without providing a --prefix.
Cc: Eric Wong normalper...@yhbt.net
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-svn.txt | 11 ++-
git-svn.perl | 12 +++-
t/t9117-git-svn-init-clone.sh | 67
-diff
and --word-diff-regex=. diff options.)
Suggested-by: Thomas Ferris Nicolaisen tfn...@gmail.com
Cc: Eric Wong normalper...@yhbt.net
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-svn.txt| 19 +
git-svn.perl
normalper...@yhbt.net
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-svn.txt | 35 +--
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 4dd3bcb..da00671 100644
On Tue, Oct 1, 2013 at 6:07 AM, Eric Wong normalper...@yhbt.net wrote:
Johan Herland jo...@herland.net wrote:
git-svn by default puts its Subversion-tracking refs directly in
refs/remotes/*. This runs counter to Git's convention of using
refs/remotes/$remote/* for storing remote-tracking
initializing a git svn clone?
Exactly, and the good news is that I finally got around to writing that
patch, which I'll post in a minute...
Hope this helps,
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-svn.txt| 1 +
git-svn.perl | 2 +-
t/t9107-git-svn-migrate.sh | 54
t/t9114-git-svn-dcommit-merge.sh | 4
.
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
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 Fri, Sep 20, 2013 at 2:20 PM, Rodolphe Belouin
rodolphe.belo...@gmail.com wrote:
Make the user able to call `git push --notes` instead of
`git push refs/notes/*`
I'm sorry for not replying to this earlier. I'm unsure how much of the
earlier discussions around pushing and pulling notes you
for the summary below. It really helps me
clear my own thoughts on this topic, and is an excellent base for
discussing how to advance on it.
The main proposal under discussion was that of Johan Herland:
http://article.gmane.org/gmane.comp.version-control.git/165885
Nicolas made the two best
+ else
+ $@
+ fi
if test -n $recursive
then
cmd_foreach --recursive $@
--
1.8.4
--
Johan Herland
.
Signed-off-by: Anders Kaseorg ande...@mit.edu
Acked-by: Johan Herland jo...@herland.net
On Fri, 27 Sep 2013, Johan Herland wrote:
2. If we are unlucky there might be existing users that work around the
existing behavior by adding an extra level of quoting (i.e. doing the
equivalent of git
On Tue, Sep 24, 2013 at 9:22 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Johan Herland wrote:
Signed-off-by: Johan Herland jo...@herland.net
Thanks.
What symptoms does this alleviate? Is this to allow configurations like
[hooks]
allowNonAscii = 1
Signed-off-by: Johan Herland jo...@herland.net
---
Resend/reminder...
...Johan
templates/hooks--pre-commit.sample | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/hooks--pre-commit.sample
b/templates/hooks--pre-commit.sample
index 586e3bf..68d62d5 100755
Signed-off-by: Johan Herland jo...@herland.net
---
templates/hooks--pre-commit.sample | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/hooks--pre-commit.sample
b/templates/hooks--pre-commit.sample
index 586e3bf..68d62d5 100755
--- a/templates/hooks--pre-commit.sample
this, but the following shell
one-liner should do the job:
git grep -l $mystring refs/notes/commits | cut -d':' -f2 | tr -d '/'
| xargs git notes remove
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
Hi,
Here is the second iteration of this series. Only one change from the
first iteration: The first patch now also fixes some missing -chaining
noticed by Junio in t2024.
...Johan
Johan Herland (4):
t2024: Fix -chaining and a couple of typos
t3200: Minor fix when preparing for tracking
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan Herland jo...@herland.net
---
t/t2024-checkout-dwim.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
index dee55e4..094b92e 100755
--- a/t/t2024
through a scheduler (c)
to a slave repo (d), that then tries create a local branch with an
upstream. See the next patch in this series for the exciting conclusion
to this story...
Reported-by: Per Cederqvist ced...@opera.com
Signed-off-by: Johan Herland jo...@herland.net
---
t/t3200-branch.sh | 34
patch to succeed, and has no negative
effect on the rest of the test suite.
This patch fixes a behavior (arguably a regression) first introduced in
41c21f2 (branch.c: Validate tracking branches with refspecs instead of
refs/remotes/*) on 2013-04-21 (released in = v1.8.3.2).
Signed-off-by: Johan
, and
then reset it to refs/heads/s:refs/remotes/local/s AFTER we have fetched
(but before we test --track).
Signed-off-by: Johan Herland jo...@herland.net
---
t/t3200-branch.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 44ec6a4..8f6ab8e
Make it easier for readers to find the actual config variables that
implement the upstream relationship.
Suggested-by: Per Cederqvist ced...@opera.com
Signed-off-by: Johan Herland jo...@herland.net
---
Documentation/git-branch.txt | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff
the breakage),
and the actual fix (which simply removes the extra refs/heads/*
requirement on the remote ref) is in patch #5/5.
The two first patches are unrelated trivial fixes that I encountered
while working on this, and patch #3 is a small documentation update
suggested by Per.
...Johan
Johan
, and
then reset it to refs/heads/s:refs/remotes/local/s AFTER we have fetched
(but before we test --track).
Signed-off-by: Johan Herland jo...@herland.net
---
t/t3200-branch.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 44ec6a4..8f6ab8e
Make it easier for readers to find the actual config variables that
implement the upstream relationship.
Suggested-by: Per Cederqvist ced...@opera.com
Signed-off-by: Johan Herland jo...@herland.net
---
In a private email exchange, Per noted that it was hard for someone reading
the git-branch
patch to succeed, and has no negative
effect on the rest of the test suite.
This patch fixes a behavior (arguably a regression) first introduced in
41c21f2 (branch.c: Validate tracking branches with refspecs instead of
refs/remotes/*) on 2013-04-21 (released in = v1.8.3.2).
Signed-off-by: Johan
through a scheduler (c)
to a slave repo (d), that then tries create a local branch with an
upstream. See the next patch in this series for the exciting conclusion
to this story...
Reported-by: Per Cederqvist ced...@opera.com
Signed-off-by: Johan Herland jo...@herland.net
---
I was not sure where
Signed-off-by: Johan Herland jo...@herland.net
---
t/t2024-checkout-dwim.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
index dee55e4..6c78fba 100755
--- a/t/t2024-checkout-dwim.sh
+++ b/t/t2024-checkout-dwim.sh
On Fri, Sep 6, 2013 at 7:32 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
index dee55e4..6c78fba 100755
--- a/t/t2024-checkout-dwim.sh
+++ b/t/t2024-checkout-dwim.sh
@@ -113,9 +113,9
101 - 200 of 329 matches
Mail list logo
