On Fri, Oct 25, 2013 at 08:26:29PM -0400, Jeff King wrote:
On Fri, Oct 25, 2013 at 04:06:19PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
diff --git a/pack-bitmap.c b/pack-bitmap.c
new file mode 100644
index 000..73c52fd
--- /dev/null
+++
On Sat, Oct 26, 2013 at 09:09:20AM +0700, Nguyen Thai Ngoc Duy wrote:
Jeff, how about this?
It's similar to your last suggestion (i.e. relaxing the magic mask
about literal magic). In addition, it forces literal magic
unconditionally in this case, which I think is the right thing to
On 10/24/2013 11:11 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
...
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Everything in the proposed log message made sense to me.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index
Happy Good day;
Hope you are doing well today? I am happy to write you today. I am Maguetta
Grace, a lady looking for friendship, I believe that life is what you give it,
to me race, sex, age, and colour of the skin, are all jokes, they are not
barrier when we have affection to humanity, i
Jeff King p...@peff.net writes:
From: Vicent Marti tan...@gmail.com
The POSIX standard doesn't currently define a `nothll`/`htonll`
typo: ntohll
function pair to perform network-to-host and host-to-network
swaps of 64-bit data. These 64-bit swaps are necessary for the on-disk
storage of
Jeff King p...@peff.net writes:
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 752f5cb..2b4b9a9 100755
[...]
+test_atom head *objectname ''
+test_atom head *objecttype ''
[...]
+test_atom tag *objectname '67a36f10722846e891fbada1ba48ed035de75581'
+test_atom tag
On Fri, Oct 25, 2013 at 02:38:08PM -0700, Junio C Hamano wrote:
It also comes with a documentation update. The option is not called
--reflog but --fork-point; naming a feature after what it does
(i.e. it finds the fork point) is a lot more sensible than naming
it after how it happens to do
Tim Mooney tim.moo...@ndsu.edu writes:
[git-scm.com/community doesn't say whether the address for bug reports
allows posting by non-list members, so hopefully this makes it through
the moderation process]
The text is here:
https://github.com/github/gitscm-next
So we can actively improve
Very helpful :) thanks !
2013/10/26 Bryan Turner btur...@atlassian.com:
No, the .git/hooks directory in your clone is created from your local
templates, installed with your Git distribution, not the remote hooks.
On Linux distributions, these templates are often in someplace like
2013/10/26 Bryan Turner btur...@atlassian.com:
No, the .git/hooks directory in your clone is created from your local
templates, installed with your Git distribution, not the remote hooks.
On Linux distributions, these templates are often in someplace like
/usr/share/git-core/templates
If it's not mentioned yet, maybe you should note that this code
currently supports only one pack with .bitmap file.
On Fri, Oct 25, 2013 at 1:03 PM, Jeff King p...@peff.net wrote:
diff --git a/khash.h b/khash.h
new file mode 100644
index 000..0fdf39d
--- /dev/null
+++ b/khash.h
@@ -0,0
On Fri, Oct 25, 2013 at 1:03 PM, Jeff King p...@peff.net wrote:
From: Vicent Marti tan...@gmail.com
In this patch, we use the bitmap API to perform the `Counting Objects`
phase in pack-objects, rather than a traditional walk through the object
graph. For a reasonably-packed large repo, the
On Mon, Oct 21, 2013 at 2:51 PM, Matthijs Kooijman matth...@stdin.nl wrote:
Hi Duy,
I saw your patch series got accepted in git master a while back, great!
Since I hope to be using the fixed behaviour soon, what was the plan for
including it? Am I correct in thinking that git master will
Thomas Rast tr...@inf.ethz.ch writes:
Michael Haggerty mhag...@alum.mit.edu writes:
On IRC you said you would like a version that always acts as
--no-commit, and simply returns the conflict/no conflict bit as usual.
The caller would then proceed using commit-tree itself. I think that is
From: Thomas Rast tr...@inf.ethz.ch
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
---
Unchanged.
Documentation/merge-strategies.txt | 4
From: Thomas Rast tr...@inf.ethz.ch
650467c (merge-recursive: Consolidate different update_stages
functions, 2011-08-11) changed the former argument 'clear' to always
be true. Remove the useless conditional.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
---
Unchanged.
merge-recursive.c | 6
From: Thomas Rast tr...@inf.ethz.ch
o-call_depth has a double function: a nonzero call_depth means we
want to construct virtual merge bases, but it also means we want to
avoid touching the worktree. Introduce a new flag o-no_worktree to
trigger only the latter.
Signed-off-by: Thomas Rast
The function 'invalidate_ref_cache' was introduced in 79c7ca5 (2011-10-17,
invalidate_ref_cache(): rename function from invalidate_cached_refs())
by a rename and elevated to be publicly usable in 8be8bde (2011-10-17,
invalidate_ref_cache(): expose this function in the refs API)
However it is not
This function was added in d2b0708 (2008-09-27, add have_git_dir()
function) as a preparation for adbc0b6 (2008-09-30, cygwin: Use native
Win32 API for stat).
However the second referenced commit was reverted in f66450a (2013-06-22,
cygwin: Remove the Win32 l/stat() implementation), so we don't
xdg-open is a tool similar to git-web--browse. It opens a file or URL in the
user's preferred application. It could probably be made default at least on
Linux with a graphical environment.
Signed-off-by: Rüdiger Sonderfeld ruedi...@c-plusplus.de
---
Documentation/git-web--browse.txt | 1 +
We have the build configuration option DEFAULT_MAN_FORMAT to choose a
format different from man pages to be used by 'git help' when no format
is requested explicitly. Since 65db0443 (Set the default help format to
html for msys builds, 2013-06-04) we use html on Windows by default.
There is one
Commit 8d3d28f5 added test cases for URLs which should be ssh.
Add more tests testing all the combinations:
-IPv4 or IPv6
-path starting with / or with /~
-with and without the ssh:// scheme
Add tests for ssh:// with port number.
When a git repository foo:bar exist, git clone will call
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/lib-credential.sh | 4
t/t7407-submodule-foreach.sh | 4
t/t9001-send-email.sh| 1 -
3 files changed, 9 deletions(-)
diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index 3c43ff1..957ae93 100755
---
When git, the executable, invokes a bash script (hooks, scripted
git commands, ...), bash writes its output with CRLF. This causes
tests to fail because the expected output does not contain CR, only LF.
This fixes the tests by replacing test_cmp with a diff computation
that disregards the CR.
Users may set test_cmp to a comparison tool of their liking. The intent is
that the tool performs comparison of line-oriented texts. However, t5300
uses it also to compare binary data. Change those tests to use 'cmp'.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t5300-pack-object.sh | 10
In a number of tests, output that was produced by a shell script is
compared to expected output using test_cmp. Unfortunately, the MSYS bash--
when invoked via git, such as in hooks--converts LF to CRLF on output
(as produced by echo and printf), which leads to many false positives.
Implements a
From: Junio C Hamano gits...@pobox.com
Nicolas Vigier bo...@mars-attacks.org writes:
On Fri, 25 Oct 2013, Junio C Hamano wrote:
Nicolas Vigier bo...@mars-attacks.org writes:
Add the --sticked-long option to output the options in their long
form
if available, and with their arguments
Due to an interaction between the way libcurl handles GSSAPI authentication over
HTTP and the way git uses libcurl, large pushes (those over http.postBuffer
bytes) would fail due to an authentication failure requiring a rewind of the
curl buffer. Such a rewind was not possible because the data
Commit 5b0864070 (sha1_object_info_extended: make type calculation
optional, Jul 12 2013) changed the return value of the
sha1_object_info_extended function to 0/-1 for success/error.
Previously this function returned the object type for success or
-1 for error. But unfortunately the above commit
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 with Signed-off-by: if
present), containing an abbreviated commit hash (at least 12 characters
to keep it valid for a
Patch 2/10 (transport-helper: fix extra lines) deleted one copy of the
lines; patch 9/10 (transport-helper: add support to delete branches)
should delete the other copy of the lines.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
transport-helper.c | 3 ---
1 file changed, 3 deletions(-)
On Sat, Oct 26, 2013 at 11:55 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Sat, Oct 26, 2013 at 11:34 PM, Richard Hansen rhan...@bbn.com wrote:
Patch 2/10 (transport-helper: fix extra lines) deleted one copy of the
lines; patch 9/10 (transport-helper: add support to delete
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 with Signed-off-by: if
present), containing an abbreviated commit
On 10/25/2013 10:18 PM, Nicolas Vigier wrote:
Add the --sticked-long option to output the options in their long form
if available, and with their arguments sticked.
Contrary to the default form (non sticked arguments and short options),
this can be parsed unambiguously when using options
34 matches
Mail list logo
