- 06 5月, 2009 8 次提交
-
-
由 Junio C Hamano 提交于
* maint-1.6.0: dir.c: Fix two minor grammatical errors in comments
-
由 Alex Riesen 提交于
Show errno if opening a lockfile fails. Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Brandon Casey 提交于
Signed-off-by: NBrandon Casey <drafnel@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Bernd Ahlers 提交于
According to POSIX, tv_sec is supposed to be a time_t, but OpenBSD (and FreeBSD, too) defines it to be a long, which triggers a type mismatch when a pointer to it is given to localtime_r(). Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stephen Boyd 提交于
Signed-off-by: NStephen Boyd <bebarino@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stephen Boyd 提交于
Signed-off-by: NStephen Boyd <bebarino@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stephen Boyd 提交于
It's nice to know that 'it' is git-am or the subject line. Whitespace implies characters so just remove characters. Signed-off-by: NStephen Boyd <bebarino@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Allan Caffee 提交于
Signed-off-by: NAllan Caffee <allan.caffee@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 5月, 2009 11 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* np/maint-no-ofs-delta: honor repack.usedeltabaseoffset when fetching packs
-
由 Junio C Hamano 提交于
* maint-1.6.1: GIT 1.6.1.4 Conflicts: GIT-VERSION-GEN
-
由 Junio C Hamano 提交于
With a handful of fixes backmerged from 1.6.2.X series Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jc/maint-read-tree-multi: checkout branch: prime cache-tree fully read-tree -m A B: prime cache-tree from the switched-to tree Move prime_cache_tree() to cache-tree.c read-tree A B: do not corrupt cache-tree
-
由 Junio C Hamano 提交于
* mk/maint-apply-swap: tests: make test-apply-criss-cross-rename more robust builtin-apply: keep information about files to be deleted tests: test applying criss-cross rename patch
-
由 Junio C Hamano 提交于
* mm/maint-add-p-quit: git add -p: add missing "q" to patch prompt
-
由 Junio C Hamano 提交于
* lt/pack-object-memuse: show_object(): push path_name() call further down process_{tree,blob}: show objects without buffering
-
由 Junio C Hamano 提交于
* jc/maint-1.6.0-keep-pack: pack-objects: don't loosen objects available in alternate or kept packs t7700: demonstrate repack flaw which may loosen objects unnecessarily Remove --kept-pack-only option and associated infrastructure pack-objects: only repack or loosen objects residing in "local" packs git-repack.sh: don't use --kept-pack-only option to pack-objects t7700-repack: add two new tests demonstrating repacking flaws is_kept_pack(): final clean-up Simplify is_kept_pack() Consolidate ignore_packed logic more has_sha1_kept_pack(): take "struct rev_info" has_sha1_pack(): refactor "pretend these packs do not exist" interface git-repack: resist stray environment variable
-
由 Junio C Hamano 提交于
* jc/maint-1.6.0-diff-borrow-carefully: diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
-
由 Junio C Hamano 提交于
* bs/maint-1.6.0-tree-walk-prefix: match_tree_entry(): a pathspec only matches at directory boundaries tree_entry_interesting: a pathspec only matches at directory boundary
-
- 02 5月, 2009 1 次提交
-
-
由 Nicolas Pitre 提交于
If the local receiving repository has disabled the use of delta base offset, for example to retain compatibility with older versions of Git that predate OFS_DELTA, we shouldn't ask for ofs-delta support when we obtain a pack from the remote server. [ issue noticed by Shawn Pearce ] Signed-off-by: NNicolas Pitre <nico@cam.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 30 4月, 2009 3 次提交
-
-
由 Junio C Hamano 提交于
* maint-1.6.1: diff -c -p: do not die on submodules
-
由 Junio C Hamano 提交于
* maint-1.6.0: diff -c -p: do not die on submodules
-
由 Junio C Hamano 提交于
The combine diff logic knew only about blobs (and their checked-out form in the work tree, either regular files or symlinks), and barfed when fed submodules. This "externalizes" gitlinks in the same way as the normal patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the issue. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 28 4月, 2009 5 次提交
-
-
由 Junio C Hamano 提交于
* maint-1.6.1: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message
-
由 Junio C Hamano 提交于
* maint-1.6.0: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message
-
由 Linus Torvalds 提交于
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Allan Caffee 提交于
Signed-off-by: NAllan Caffee <allan.caffee@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Allan Caffee 提交于
Signed-off-by: NAllan Caffee <allan.caffee@gmail.com> Acked-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 25 4月, 2009 2 次提交
-
-
由 Junio C Hamano 提交于
* maint-1.6.1: test-genrandom: Add newline to usage string
-
由 Junio C Hamano 提交于
* maint-1.6.0: test-genrandom: Add newline to usage string
-
- 23 4月, 2009 1 次提交
-
-
由 Stephen Boyd 提交于
A minor fix to place the terminal input on a new line if test-genrandom is run with no arguments. Signed-off-by: NStephen Boyd <bebarino@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 21 4月, 2009 5 次提交
-
-
由 Michał Kiedrowicz 提交于
I realized that this test does check if git-apply succeeds, but doesn't tell if it applies patches correctly. So I added test_cmp to check it. I also added a test which checks swapping three files. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michał Kiedrowicz 提交于
Example correct diff generated by `diff -M -B' might look like this: diff --git a/file1 b/file2 similarity index 100% rename from file1 rename to file2 diff --git a/file2 b/file1 similarity index 100% rename from file2 rename to file1 Information about removing `file2' comes after information about creation of new `file2' (renamed from `file1'). Existing implementation isn't able to apply such patch, because it has to know in advance which files will be removed. This patch populates fn_table with information about removal of files before calling check_patch() for each patch to be applied. Signed-off-by: NMichał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michał Kiedrowicz 提交于
Originally reported by Linus in $gmane/116198 Signed-off-by: NMichał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Frank Lichtenheld 提交于
Signed-off-by: NFrank Lichtenheld <flichtenheld@astaro.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Schindelin 提交于
Found by valgrind. Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 4月, 2009 4 次提交
-
-
由 Junio C Hamano 提交于
When switching to another branch, the earlier code relied on incremental invalidation of cache-tree entries to degrade it. While it is not wrong per-se, we know that the resulting index must fully match the branch we are switching to unless the -m (merge) option is used. We should simply fully re-prime the cache-tree using the new tree object in such a case. And for safety, invalidate the cache-tree as a whole in other cases. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
When switching to a new branch with "read-tree -m A B", the resulting index must match tree B and we can prime the cache tree with it. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
The interface to build cache-tree belongs there. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
An earlier commit aab3b9a1 (read-tree A B C: do not create a bogus index and do not segfault, 2009-03-12) resurrected the support for an obscure (but useful) feature to read and overlay more than one tree into the index without the -m (merge) option. But the fix was not enough. Exercising this feature exposes a longstanding bug in the code that primes the cache-tree in the index from the tree that was read. The intention was that when we know that the index must exactly match the tree we just read, we prime the entire cache-tree with it. However, the logic to detect that case incorrectly triggered if you read two trees without -m. This resulted in a corrupted cache-tree, and write-tree would have produced an incorrect tree object out of such an index. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-