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 wh
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 m
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
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 com
On Sat, Oct 26, 2013 at 11:55 PM, Felipe Contreras
wrote:
> On Sat, Oct 26, 2013 at 11:34 PM, Richard Hansen wrote:
>> 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
On Sat, Oct 26, 2013 at 11:34 PM, Richard Hansen wrote:
> 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.
Looks awfully familiar to:
http://article.gmane.org
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
---
transport-helper.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/transp
On 10/26/2013 07:03 PM, Stefan Beller wrote:
> 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(): expos
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
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
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 did
From: "Junio C Hamano"
Nicolas Vigier writes:
On Fri, 25 Oct 2013, Junio C Hamano wrote:
Nicolas Vigier writes:
> Add the --sticked-long option to output the options in their long
> form
> if available, and with their arguments sticked.
Hmph, doesn't verb "stick" conjugate to "(present
Signed-off-by: Johannes Sixt
---
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
--- a/t/lib-credential.sh
+++ b/
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.
Pat
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
---
t/t5300-pack-object.sh | 10 +-
1 fil
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 d
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
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 te
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
---
Documentation/git-web--browse.txt | 1 +
git-web--browse.sh
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 u
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 ne
From: Thomas Rast
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
---
Unchanged.
merge-recursive.c | 6 ++
1 file changed, 2 insertions(
From: Thomas Rast
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
---
Adapted as per J
From: Thomas Rast
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
merge-recursive.c
Thomas Rast writes:
> Michael Haggerty 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
> probably a saner solution than thi
On Mon, Oct 21, 2013 at 2:51 PM, Matthijs Kooijman 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 become 1.8.5
> in
On Sat, Oct 26, 2013 at 6:23 AM, Junio C Hamano wrote:
> * kb/fast-hashmap (2013-10-22) 12 commits
> - remove old hash.[ch] implementation
> - read-cache.c: fix memory leaks caused by removed cache entries
> - name-hash.c: remove cache entries instead of marking them CE_UNHASHED
> - name-hash.
On Fri, Oct 25, 2013 at 1:03 PM, Jeff King wrote:
> From: Vicent Marti
>
> 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 time to fetch and clone
> i
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Maybe squash this in some place, or leave it separate. I'm fine either way.
sha1_file.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sha1_file.c b/sha1_file.c
index 4714bd8..1294962 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1194,6 +1194,7 @@
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 wrote:
> diff --git a/khash.h b/khash.h
> new file mode 100644
> index 000..0fdf39d
> --- /dev/null
> +++ b/khash.h
> @@ -0,0 +1,342 @
> 2013/10/26 Bryan Turner :
> > 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 (for normal pack
Very helpful :) thanks !
2013/10/26 Bryan Turner :
> 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
Tim Mooney 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 such things. I ju
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
Jeff King 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 *objecttype 'co
Fredrik Gustafsson writes:
>>
>> * Break projects into smaller, easier tasks
>> - They should individually be simple, quick things if the mentor did
>> them.
>> - Should be parallelizable so students don't have to block on reviews.
>
> I'd 5-6 smaller projects setup for the summer, I thin
Junio C Hamano writes:
> Thomas Rast writes:
>
>> Theories
>>
>>
>> * Scope creep: projects tend to get blocked on some bigger
>> refactoring/restructuring task that was not in the original
>> proposal.
(Full disclosure: I actually proposed this theory.)
> I think that is a sign t
Jeff King writes:
> From: Vicent Marti
>
> 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 EWAH bitmaps if they are
Jeff King writes:
> From: Vicent Marti
>
> EWAH is a word-aligned compressed variant of a bitset (i.e. a data
> structure that acts as a 0-indexed boolean array for many entries).
Does this contain any changes in response to
http://thread.gmane.org/gmane.comp.version-control.git/228918/focus
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 lik
40 matches
Mail list logo
