on
whether smart http is used there, and if not guess it wouldn't be a
big deal to switch to apache.
You can use Lighttpd if you like. See
Documentation/git-http-backend.txt (or git http-backend --help).
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
into Junio's queue whatsoever. And the always-sign code is only in pu
at the moment.
But if you wanted to anyway, you could simply use a pre-receive hook and
walk the tree, verifying the signatures of each commit against some
canonical list of approved keys.
--
brian m. carlson / brian with sandals
-completion.zsh. Is
this correct? Your commit message says ./, and if that's the case, it
has the same security problems as putting . first in your PATH.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA
programming or a review process to ensure that the
result is good.
We use a similar workflow at my regular employer, and it is generally
very successful for a department with 45 employees.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net
message, so many people disable alignment fixups. I know it
made things extremely slow on Alpha. ARM is even more fun since if you
don't take the trap, it loads the data rotated, so the load happens, it
just silently returns the wrong data.
--
brian m. carlson / brian with sandals: Houston, Texas, US
From: Nicolas Vigier bo...@mars-attacks.org
The -M option does not exist in OPTIONS_SPEC, so there is no use to try
to find it.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-rebase.sh | 2 +-
1 file changed, 1 insertion
From: Nicolas Vigier bo...@mars-attacks.org
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse
option parsing is done in --stuck-long mode.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
contrib/examples/git
git merge already allows us to sign commits, and git rebase has recently
learned how to do so as well. Teach git pull to parse the -S/--gpg-sign
option and pass this along to merge or rebase, as appropriate.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-pull.sh | 13
' --
when parsing the --onto option, $# will be 3 or more if there are
other options.
- if --onto or -x doesn't have an argument, git rev-parse --parseopt
will exit with an error and display usage information.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-cherry-pick.txt | 7 ++-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 2
From: Nicolas Vigier bo...@mars-attacks.org
There is no functionnal change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git
From: Nicolas Vigier bo...@mars-attacks.org
There is no functional change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-am.sh
the --gpg-sign option
rebase: remove useless arguments check
rebase: don't try to match -M option
rebase: parse options in stuck-long mode
rebase: add the --gpg-sign option
brian m. carlson (1):
pull: add the --gpg-sign option.
Documentation/git-am.txt | 6 +++-
Documentation/git
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-rebase.txt | 4
git-rebase--am.sh| 8 +---
git-rebase--interactive.sh | 32
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-am.txt | 6 +-
git-am.sh| 9 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff
On Fri, Jan 24, 2014 at 01:00:06PM -0800, Junio C Hamano wrote:
brian m. carlson sand...@crustytoothpaste.net writes:
+-S[keyid]::
+--gpg-sign[=keyid]::
+ GPG-sign commits.
+
Does this accept --no-gpg-sign? If not, shouldn't it?
It does not. I took Nicolas's patches from
on the wrong file. In
general, I'm wary of changing permissions on a file to suit Windows's
rename because of the symlink issue and the security issues that can
result. Hard links probably have the same issue.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
somewhere, and then the original repository is repacked and hits
this case, the clone is now vulnerable to tampering by a malicious user
(assuming that user can read the appropriate directory). So unless I'm
reading this wrong, this patch would cause security problems on all Unix
systems.
--
brian m
On Mon, Jan 27, 2014 at 03:36:44PM -0800, Junio C Hamano wrote:
brian m. carlson sand...@crustytoothpaste.net writes:
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 43c19e0..73d32dd 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
undefined
behavior checking, the code will work. On systems that don't have
uintptr_t, the compiler is probably not smart enough to perform such a
check anyway.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP
that points at the commit at the tip of
s/tqag/tag/
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: Digital
this?
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: Digital signature
On Fri, Jan 31, 2014 at 04:35:05PM -0500, Jeff King wrote:
On Fri, Jan 31, 2014 at 09:02:15PM +, brian m. carlson wrote:
At work, we recently upgraded our git version from 1.8.3.4 to 1.8.5.3.
We've noticed a significant performance regression in git fetch. The
numbers below
.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: Digital signature
' --
when parsing the --onto option, $# will be 3 or more if there are
other options.
- if --onto or -x doesn't have an argument, git rev-parse --parseopt
will exit with an error and display usage information.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand
From: Nicolas Vigier bo...@mars-attacks.org
There is no functionnal change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git
From: Nicolas Vigier bo...@mars-attacks.org
There is no functional change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-am.sh
From: Nicolas Vigier bo...@mars-attacks.org
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse
option parsing is done in --stuck-long mode.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
contrib/git-resurrect.sh
From: Nicolas Vigier bo...@mars-attacks.org
The -M option does not exist in OPTIONS_SPEC, so there is no use to try
to find it.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-rebase.sh | 2 +-
1 file changed, 1 insertion
to use the stuck-long mode
am: parse options in stuck-long mode
am: add the --gpg-sign option
rebase: remove useless arguments check
rebase: don't try to match -M option
rebase: parse options in stuck-long mode
rebase: add the --gpg-sign option
brian m. carlson (1):
pull: add the --gpg
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-cherry-pick.txt | 7 ++-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 2
git merge already allows us to sign commits, and git rebase has recently
learned how to do so as well. Teach git pull to parse the -S/--gpg-sign
option and pass this along to merge or rebase, as appropriate.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-pull.sh | 13
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-rebase.txt | 4
git-rebase--am.sh| 8 +---
git-rebase--interactive.sh | 32
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-am.txt | 6 +-
git-am.sh| 9 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff
-forwarded to origin/master.
In newer versions of git (1.8.0+), you can use git merge-base
--is-ancestor for this instead. The commit message for 5907cda implies
that it is more efficient than the old way.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
take an argument. Your suggestion to use # seems fine, though.
I'm a little embarrassed to admit that in my fifteen years of Unix
experience, I've never learned the variable modifiers for shell, so it
didn't occur to me to use them in this case. Guess it's time to learn
them now.
--
brian m
code. It has
the benefits of keeping the history free of frequent merges, which may
or may not be important to you; it doesn't really bother me very much.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP
the systems I've used.
Of course, it's up to the regulars (and probably ultimately Junio)
whether this is something that Git as a project would benefit from.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
rebase: remove useless arguments check
rebase: don't try to match -M option
rebase: parse options in stuck-long mode
rebase: add the --gpg-sign option
brian m. carlson (1):
pull: add the --gpg-sign option.
Documentation/git-am.txt | 6 +++-
Documentation/git-cherry-pick.txt
From: Nicolas Vigier bo...@mars-attacks.org
There is no functional change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-am.sh
From: Nicolas Vigier bo...@mars-attacks.org
The -M option does not exist in OPTIONS_SPEC, so there is no use to try
to find it.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-rebase.sh | 2 +-
1 file changed, 1 insertion
From: Nicolas Vigier bo...@mars-attacks.org
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse
option parsing is done in --stuck-long mode.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
contrib/git-resurrect.sh
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-am.txt | 6 +-
git-am.sh| 9 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff
git merge already allows us to sign commits, and git rebase has recently
learned how to do so as well. Teach git pull to parse the -S/--gpg-sign
option and pass this along to merge or rebase, as appropriate.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-pull.sh | 13
' --
when parsing the --onto option, $# will be 3 or more if there are
other options.
- if --onto or -x doesn't have an argument, git rev-parse --parseopt
will exit with an error and display usage information.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-cherry-pick.txt | 7 ++-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 2
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-rebase.txt | 4
git-rebase--am.sh| 8 +---
git-rebase--interactive.sh | 39
From: Nicolas Vigier bo...@mars-attacks.org
There is no functionnal change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git
On Mon, Feb 10, 2014 at 01:59:02AM -0500, Eric Sunshine wrote:
On Sun, Feb 9, 2014 at 8:03 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
From: Nicolas Vigier bo...@mars-attacks.org
There is no functionnal change. The reason for this change is to be able
s/functionnal
, and depending on the situation, I might even write
something like this. I personally think it's fine.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA
.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: Digital signature
information in this case.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: Digital signature
://github.com/git/git-scm.com. What you're seeing
appears to be issue #268 at that project:
https://github.com/git/git-scm.com/issues/268. That's probably the
most appropriate place to go.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
Porcelains use unsafe variable
substitutions and still need to be tightened.
Will merge to 'next'.
Junio, did you want a reroll with that fixed commit message, or will you
fix it up yourself?
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
From: Nicolas Vigier bo...@mars-attacks.org
There is no functional change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git
' --
when parsing the --onto option, $# will be 3 or more if there are
other options.
- if --onto or -x doesn't have an argument, git rev-parse --parseopt
will exit with an error and display usage information.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-rebase.txt | 4
git-rebase--am.sh| 8 +---
git-rebase--interactive.sh | 39
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-am.txt | 6 +-
git-am.sh| 9 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff
From: Nicolas Vigier bo...@mars-attacks.org
There is no functional change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-am.sh
From: Nicolas Vigier bo...@mars-attacks.org
The -M option does not exist in OPTIONS_SPEC, so there is no use to try
to find it.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-rebase.sh | 2 +-
1 file changed, 1 insertion
git merge already allows us to sign commits, and git rebase has recently
learned how to do so as well. Teach git pull to parse the -S/--gpg-sign
option and pass this along to merge or rebase, as appropriate.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-pull.sh | 13
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-cherry-pick.txt | 7 ++-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 2
From: Nicolas Vigier bo...@mars-attacks.org
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse
option parsing is done in --stuck-long mode.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
contrib/git-resurrect.sh
: add the --gpg-sign option
rebase: remove useless arguments check
rebase: don't try to match -M option
rebase: parse options in stuck-long mode
rebase: add the --gpg-sign option
brian m. carlson (1):
pull: add the --gpg-sign option.
Documentation/git-am.txt | 6
On Sun, Feb 16, 2014 at 10:37:18AM +0700, Nguyễn Thái Ngọc Duy wrote:
-static char cut_line[] =
+static const char cut_line[] =
Your subject says cut_lines[], but the variable is cut_line[] (no s).
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
project itself. The fact that that website has confusing information
for binary builds is tracked in that site's issue #268:
https://github.com/git/git-scm.com/issues/268.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion
also
need to be cherry-picked. We also have automated tools that want this
information.
I usually solve this with an alias (backport = cherry-pick -x -s), but I
can see how this might be a useful option.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
-by: brian m. carlson sand...@crustytoothpaste.net
---
Obviously, this doesn't actually fix the issue, but at least we're aware of it
so we don't lose track of it and can fix it. A future patch can mark the test
passing.
t/t8003-blame-corner-cases.sh | 10 ++
1 file changed, 10 insertions
to an aborted project that I stashed
when I needed to change branches. I figure that they might be useful in
the future, but I don't care about them right now. I may pick them up,
I may not, but I certainly don't want to be reminded of them constantly.
--
brian m. carlson / brian with sandals: Houston
just a single test file in the t
directory?
You can run ./t-sh explicitly.
You can also use Perl's prove command, which provides some nice-to-have
features, such as exiting abnormally if your tests abort prematurely.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832
On Sat, Mar 01, 2014 at 11:05:23PM +0800, Sun He wrote:
Signed-off-by: Sun He sunheeh...@gmail.com
Helped-by: Duy Nguyen pclo...@gmail.com
Your commit summary has generl instead of general.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
the failing filename, and we get a segfault right here:
if (rename(src, dst) 0 !ignore_errors)
die_errno (_(renaming '%s' failed), src);
I don't know yet if dst is also bad, but clearly src is. I'm looking
into it.
--
brian m. carlson
, that's the same conclusion I came to. There are also two cases
where we don't shrink the array properly. I'll rebase my patch on top
of this one and send it.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP
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 sand...@crustytoothpaste.net
---
builtin/mv.c | 5 +
1 file changed
the places that use this
and then remove the function altogether? I imagine your current patch
might introduce a number of warnings that some people would rather
avoid.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion
On Mon, Mar 10, 2014 at 09:56:03PM -0400, Jeff King wrote:
On Sat, Mar 08, 2014 at 07:21:39PM +, brian m. carlson wrote:
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 code, so I'll need to actually spend
time reproducing the problem.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
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. Add tests to ensure the
problem does not recur.
Signed-off-by: brian m. carlson sand
file_name_is_absolute {
return $_[0] =~ /^\// || $_[0] =~ /^[A-Z]:/i;
}
}
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA
in the sense that you can sign any arbitrary piece of text or data
with your certificates.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
programming
practice. I suspect the latter two will be more controversial. These
changes, if implemented, would be done by hand, not by machine, and they
would be bisectable.
Comments?
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc
to the
crlf settings when synthesizing the fake commit)---perhaps somebody
can squash in a fix to this?
Last time I looked at this, I couldn't come up with an obvious fix for
the problem, or I would have included one. I'll try to have another go
at it this weekend.
--
brian m. carlson / brian
: \(.*\)$/\1,/gp' \
-e 's/^Signed-off-by: \(.*\)/\1,/gp'`
It looks like you may have missed a usage here due to the line break.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196
, as
there's simply no other way to make it work.
What version of curl are you using (and what distro if you didn't
compile it yourself)? Also, can you post output of an attempt to push
with GIT_CURL_VERBOSE=1?
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
setting.
Reported-by: Ephrim Khong dr.kh...@gmail.com
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
On Tue, Apr 22, 2014 at 04:12:42PM -0700, Junio C Hamano wrote:
I have a feeling that a fix for this should be fairly isolated and
trivial (it should be just the matter of paying
-remote topic-branch
git push main-repo HEAD
So there are times when fast-forward merges are the right thing, and
times when they're not, and as you can see, this depends on context and
isn't per-repository.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
object.h | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/object.h b/object.h
index 6e12f2c..f1cff2d 100644
--- a/object.h
+++ b/object.h
@@ -1,6 +1,13 @@
#ifndef OBJECT_H
#define OBJECT_H
On Thu, May 01, 2014 at 10:20:07AM -0700, Jonathan Nieder wrote:
Hi,
brian m. carlson wrote:
--- a/object.h
+++ b/object.h
[...]
@@ -49,7 +56,7 @@ struct object {
unsigned used : 1;
unsigned type : TYPE_BITS;
unsigned flags : FLAG_BITS;
- unsigned char sha1[20
On Thu, May 01, 2014 at 02:04:33PM -0400, Marc Branchaud wrote:
On 14-05-01 01:56 PM, W. Trevor King wrote:
On Thu, May 01, 2014 at 11:20:44AM -0400, Marc Branchaud wrote:
On 14-05-01 05:46 AM, brian m. carlson wrote:
git checkout maintenance-branch
# Update our maintenance branch
is different, then this
documentation needs to be improved, I think, along with the
documentation earlier in the series.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552
On Thu, May 01, 2014 at 09:41:34PM -0500, Felipe Contreras wrote:
brian m. carlson wrote:
On Thu, May 01, 2014 at 07:00:05PM -0500, Felipe Contreras wrote:
Also, deprecate --no-rebase since there's no need for it any more.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
On Fri, May 02, 2014 at 03:14:44PM -0500, Felipe Contreras wrote:
brian m. carlson wrote:
My point is that it's unclear to me what options I need to use to
retain the current behavior (fast-forward if possible, merge
otherwise) without a warning.
The current behavior is to always merge
On Fri, May 02, 2014 at 01:51:55PM -0700, Junio C Hamano wrote:
+ - When splitting a long logical line, with everything else being
+ equal, it is preferrable to split after the operator at higher
dict.org says that it should be preferable, not preferrable.
--
brian m. carlson / brian
can pack the struct on that particular
platform?
Sounds like a plan. I am not aware of any architecture that has this
limitation; I've worked with x86(-64)?, 32-bit PowerPC, UltraSPARC, and
ARM.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http
of compile-time checking for misuse. The structure is expected to remain
the same size and have the same alignment requirements on all known
platforms, compared to the array of unsigned char.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
object.h | 13 -
1 file changed
The object.h header is included in archive.h for this constant. It will be
used by other parts of the archiving code in the future.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
archive-zip.c | 4 ++--
archive.h | 1 +
2 files changed, 3 insertions(+), 2 deletions
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
archive.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/archive.c b/archive.c
index 3fc0fb2..dba148a 100644
--- a/archive.c
+++ b/archive.c
@@ -255,7 +255,7 @@ static void parse_treeish_arg
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
bisect.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/bisect.c b/bisect.c
index d6e851d..fe53214 100644
--- a/bisect.c
+++ b/bisect.c
@@ -15,7 +15,7 @@
static struct
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
bulk-checkin.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 98e651c..92c7b5e 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -23,7 +23,7 @@ static struct
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
combine-diff.c | 54 +++---
diff-lib.c | 10 +-
diff.h | 5 +++--
3 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/combine-diff.c b/combine-diff.c
1 - 100 of 2261 matches
Mail list logo