* Re: [PATCH 0/2] jn/gitweb-blame fixes
From: Stephen Boyd @ 2009-11-23 4:52 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git
In-Reply-To: <200911210132.44649.jnareb@gmail.com>
Jakub Narebski wrote:
> I have tested gitweb with both of your patches applied, serving gitweb
> as CGI script using Apache 2.0.54 on Linux, and viewing from separate
> computer on MS Windows XP, with the following results:
>
> * For the following browsers blame_incremental view on gitweb/gitweb.perl
> file produces correct output, but for progress info which instead of
> ( 1%) -> ( 29%) -> (100%) looks more like ( 1%) -> (29%) -> (100%)
This is due to an off-by-one error in the while loop. This should fix
it. I'll probably squash this into patch 2 and resend.
--->8----
diff --git a/gitweb/gitweb.js b/gitweb/gitweb.js
index 30597dd..9214497 100644
--- a/gitweb/gitweb.js
+++ b/gitweb/gitweb.js
@@ -43,7 +43,7 @@ function padLeftStr(input, width, str) {
var prefix = '';
width -= input.toString().length;
- while (width > 1) {
+ while (width > 0) {
prefix += str;
width--;
}
^ permalink raw reply related
* Re: [PATCH 2/2] remote-curl.c: fix rpc_out()
From: Sverre Rabbelier @ 2009-11-23 5:53 UTC (permalink / raw)
To: Tay Ray Chuan; +Cc: git, Shawn O. Pearce, Junio C Hamano
In-Reply-To: <20091123110338.2b230359.rctay89@gmail.com>
Heya,
On Mon, Nov 23, 2009 at 04:03, Tay Ray Chuan <rctay89@gmail.com> wrote:
> remote-curl.c | 17 +++++++++++------
> 1 files changed, 11 insertions(+), 6 deletions(-)
Seems like this type of patch would do very well with a test case or two?
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* Re: [PATCH 1/2] Do curl option disabling before enabling new options
From: Tay Ray Chuan @ 2009-11-23 3:05 UTC (permalink / raw)
To: git; +Cc: Martin Storsjö
In-Reply-To: <20091123110328.748fcf09.rctay89@gmail.com>
Hi,
On Mon, Nov 23, 2009 at 11:03 AM, Tay Ray Chuan <rctay89@gmail.com> wrote:
> Squashed in another potential trigger for this bug in remote-curl.c,
> introduced in 'next'.
sorry, this should now read 'master'.
--
Cheers,
Ray Chuan
^ permalink raw reply
* What's cooking in git.git (Nov 2009, #05; Sun, 22)
From: Junio C Hamano @ 2009-11-23 6:16 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
Tonight's tip of 'master' is at v1.6.6-rc0. I am aware of a handful of
patches sent today but they didn't arraive before I started today's
integration cycle and are left out from today's tree.
--------------------------------------------------
[Graduated to "master"]
* ls/maint-mailinfo-no-inbody (2009-11-20) 1 commit.
(merged to 'next' on 2009-11-21 at dba8141)
+ git am/mailinfo: Don't look at in-body headers when rebasing
* rj/maint-t9700 (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-21 at 29e149b)
+ t9700-perl-git.sh: Fix a test failure on Cygwin
* jn/faster-completion-startup (2009-11-17) 1 commit.
+ Speed up bash completion loading
* th/maint-remote-update-help-string (2009-11-15) 1 commit.
+ Update 'git remote update' usage string to match man page.
* tc/format-attribute (2009-11-14) 1 commit
+ Check the format of more printf-type functions
* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
(merged to 'next' on 2009-11-16 at 5b5a93f)
+ diffcore-break: save cnt_data for other phases
+ diffcore-break: free filespec data as we go
* bc/grep-i-F (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-17 at a9b138c)
+ grep: Allow case insensitive search of fixed-strings
* mm/config-pathname-tilde-expand (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 7ba213d)
+ Expand ~ and ~user in core.excludesfile, commit.template
* pb/maint-use-custom-perl (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 1ee8d46)
+ Make sure $PERL_PATH is defined when the test suite is run.
* th/remote-usage (2009-11-16) 1 commit.
+ git remote: Separate usage strings for subcommands
* mo/maint-crlf-doc (2009-11-14) 1 commit.
(merged to 'next' on 2009-11-17 at abd9133)
+ core.autocrlf documentation: mention the crlf attribute
* rj/cygwin-msvc (2009-11-09) 2 commits.
+ MSVC: Add support for building with NO_MMAP
+ Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
(merged to 'next' on 2009-11-15 at db0f967)
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
* jn/help-everywhere (2009-11-09) 21 commits
(merged to 'next' on 2009-11-17 at 3a2dffe)
+ diff --no-index: make the usage string less scary
+ merge-{recursive,subtree}: use usagef() to print usage
+ Introduce usagef() that takes a printf-style format
+ Let 'git <command> -h' show usage without a git dir
+ Show usage string for 'git http-push -h'
+ Let 'git http-fetch -h' show usage outside any git repository
+ Show usage string for 'git stripspace -h'
+ Show usage string for 'git unpack-file -h'
+ Show usage string for 'git show-index -h'
+ Show usage string for 'git rev-parse -h'
+ Show usage string for 'git merge-one-file -h'
+ Show usage string for 'git mailsplit -h'
+ Show usage string for 'git imap-send -h'
+ Show usage string for 'git get-tar-commit-id -h'
+ Show usage string for 'git fast-import -h'
+ Show usage string for 'git check-ref-format -h'
+ Show usage string for 'git show-ref -h'
+ Show usage string for 'git merge-ours -h'
+ Show usage string for 'git commit-tree -h'
+ Show usage string for 'git cherry -h'
+ Show usage string for 'git grep -h'
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
(merged to 'next' on 2009-11-17 at cd35125)
+ http-fetch: add missing initialization of argv0_path
(this branch is used by jn/help-everywhere.)
* jn/remove-fetch--tool (2009-11-09) 1 commit
(merged to 'next' on 2009-11-17 at 72f6c3b)
+ Retire fetch--tool helper to contrib/examples
(this branch is used by jn/help-everywhere.)
* jn/gitweb-log-history (2009-11-13) 3 commits
(merged to 'next' on 2009-11-17 at d225f7d)
+ gitweb: Make 'history' view (re)use git_log_generic()
+ gitweb: Refactor common parts of 'log' and 'shortlog' views
+ gitweb: Refactor 'log' action generation, adding git_log_body()
* rg/doc-workflow (2009-11-17) 1 commit.
+ Add branch management for releases to gitworkflows
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
(merged to 'next' on 2009-11-17 at c383204)
+ ls-tree: migrate to parse-options
+ t3101: test more ls-tree options
* jl/submodule-add-noname (2009-09-22) 1 commit.
(merged to 'next' on 2009-11-15 at 3a77d01)
+ git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sc/protocol-doc (2009-11-03) 1 commit.
(merged to 'next' on 2009-11-15 at 32d6de8)
+ Update packfile transfer protocol documentation
* tr/filter-branch (2009-11-10) 2 commits.
(merged to 'next' on 2009-11-15 at 79c6a1d)
+ filter-branch: nearest-ancestor rewriting outside subdir filter
+ filter-branch: stop special-casing $filter_subdir argument
* bg/format-patch-doc-update (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-17 at 68b9056)
+ format-patch: Add "--no-stat" as a synonym for "-p"
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Always generate a patch
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
+ Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
* jn/editor-pager (2009-10-30) 9 commits
(merged to 'next' on 2009-11-15 at 7f3e3ae)
+ Provide a build time default-pager setting
+ Provide a build time default-editor setting
+ am -i, git-svn: use "git var GIT_PAGER"
+ add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
+ Teach git var about GIT_PAGER
+ Teach git var about GIT_EDITOR
+ Suppress warnings from "git var -l"
+ Do not use VISUAL editor on dumb terminals
+ Handle more shell metacharacters in editor names
* bw/autoconf-more (2009-11-04) 2 commits
(merged to 'next' on 2009-11-15 at e86a8c9)
+ configure: add settings for gitconfig, editor and pager
+ configure: add macro to set arbitrary make variables
* sp/smart-http (2009-11-14) 37 commits
(merged to 'next' on 2009-11-17 at 11067eb)
+ http-backend: Let gcc check the format of more printf-type functions.
+ http-backend: Fix access beyond end of string.
(merged to 'next' on 2009-11-15 at 2a326b2)
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
+ t5551-http-fetch: Work around broken Accept header in libcurl
+ t5551-http-fetch: Work around some libcurl versions
+ http-backend: Protect GIT_PROJECT_ROOT from /../ requests
+ Git-aware CGI to provide dumb HTTP transport
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
--------------------------------------------------
[New Topics]
* bg/apply-doc (2009-11-22) 4 commits
(merged to 'next' on 2009-11-22 at b42fece)
+ apply: Use the term "working tree" consistently
+ apply: Format all options using back-quotes
+ apply: apply works outside a repository
+ Clarify and correct -z
* cc/replace (2009-11-19) 3 commits
(merged to 'next' on 2009-11-21 at 2aaf84b)
+ Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
+ Documentation: fix typos and spelling in replace documentation
+ replace: use a GIT_NO_REPLACE_OBJECTS env variable
* fc/send-email-envelope (2009-11-22) 1 commit.
- t9001: test --envelope-sender option of send-email
The new feature itself looked promising; this is just an unrelated test
patch.
* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
(merged to 'next' on 2009-11-22 at c0f64c2)
+ user-manual: Document that "git merge" doesn't like uncommited changes.
+ merge-recursive: point the user to commit when file would be overwritten.
* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
+ git-count-objects: Fix a disk-space under-estimate on Cygwin
* rs/color-escape-has-zero-width (2009-11-23) 1 commit
- Teach %w() that color escape codes have zero width
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
--------------------------------------------------
[Stalled]
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh...
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
It seemed to be moving again soon, but nothing has happened yet...
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Early part has been lived in 'next' for a while and has graduated. This
is a reroll of the remainder. Is everybody happy with merging this to
'next'? I saw some checkpatch style violations, but didn't find anything
objectionable in the logic.
* jn/gitweb-blame (2009-11-19) 6 commits.
- gitweb.js: fix null object exception in initials calculation
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame, with a few recent fixes.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
* jc/log-stdin (2009-11-20) 4 commits
(merged to 'next' on 2009-11-21 at c3e2e52)
+ Make --stdin option to "log" family read also pathspecs
+ setup_revisions(): do not call get_pathspec() too early
+ Teach --stdin option to "log" family
+ read_revision_from_stdin(): use strbuf
Still no tests yet but with docs from Peff.
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions, but this needs to be
rethought.
* bg/fetch-multi (2009-11-10) 9 commits.
(merged to 'next' on 2009-11-21 at 282f464)
+ Re-implement 'git remote update' using 'git fetch'
+ builtin-fetch: add --dry-run option
+ builtin-fetch: add --prune option
+ teach warn_dangling_symref to take a FILE argument
+ remote: refactor some logic into get_stale_heads()
+ Add missing test for 'git remote update --prune'
+ Add the configuration option skipFetchAll
+ Teach the --multiple option to 'git fetch'
+ Teach the --all option to 'git fetch'
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Any comments? Should it go to Documentation/technical instead?
* sr/vcs-helper (2009-11-18) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to report in "list" command that the ref is unchanged
- Fix various memory leaks in transport-helper.c
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Replaced again. Is everybody happy with merging this to 'next'?
* mr/gitweb-snapshot (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-21 at e825ad9)
+ gitweb: Smarter snapshot names
+ gitweb: Document current snapshot rules via new tests
+ t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Soon in 'master'.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
The latest update I didn't look at very closely but I had an impression
that it was touching very generic codepath that would affect non sparse
cases, iow the patch looked very scary (the entire series already is).
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply
* Re: What's cooking in git.git (Nov 2009, #05; Sun, 22)
From: Sverre Rabbelier @ 2009-11-23 6:24 UTC (permalink / raw)
To: Git List
In-Reply-To: <7vhbsl935q.fsf@alter.siamese.dyndns.org>
Heya,
On Mon, Nov 23, 2009 at 07:16, Junio C Hamano <gitster@pobox.com> wrote:
> * sr/gfi-options (2009-09-06) 6 commits.
> - fast-import: test the new option command
> - fast-import: add option command
> - fast-import: test the new feature command
> - fast-import: add feature command
> - fast-import: put marks reading in it's own function
> - fast-import: put option parsing code in separate functions
>
> It seemed to be moving again soon, but nothing has happened yet...
To those following this series, I've done a reroll addressing Shawn's
comments, but am holding back on sending it out since I want to add
the import-marks and export-marks features as well (which were the
sole reason for this series in the first place, to me at least). It
should not be much work, but I have to redo the test cases as well, so
it will take a little while longer to finish.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* [PATCH] instaweb: restart server if already running
From: Stephen Boyd @ 2009-11-23 7:09 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Running 'git instaweb' when an instaweb server is already running will
fail (at least when the port is the same) and overwrite the pid file
used to track the currently running server. This turns out to be
especially annoying when the user tries to stop the previously running
server with 'git instaweb --stop' and is instead greeted with an error
message because the pid file has been destroyed.
Instead of allowing a user to start two instaweb servers, stop the
currently running server first and then start the new one. This should
be fine because it was never really possible to start two instaweb
servers in the first place due to the pid file issue outlined above.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
git-instaweb.sh | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 622a5f0..ffc2ab6 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -73,6 +73,11 @@ resolve_full_httpd () {
}
start_httpd () {
+ if test -f "$fqgitdir/pid"; then
+ say "Instance already running. Restarting..."
+ stop_httpd
+ fi
+
# here $httpd should have a meaningful value
resolve_full_httpd
--
1.6.5.3.299.gb65c9
^ permalink raw reply related
* [PATCH] Fix over-simplified documentation for 'git log -z'
From: Björn Gustavsson @ 2009-11-23 7:40 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
In commit 64485b4a, the documentation for 'git log -z' was
simplified too much. The -z option actually changes the behavior
of 'git log' in two ways: commits will be ended with a NUL
instead of a LF (correctly documented) and the --raw and
--numstat will have NUL as field terminators (omitted in
the documentation for 'git log').
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
---
I wrongly assumed that 'git log' ignores the --raw
and --numstat options, because I tested it in a repository
with only merge commits. They do have an effect for
plain commits, and consequently -z will modify their
behavior for 'git log' too.
This patch applies on 'next'.
Documentation/diff-options.txt | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 18366b1..8707d0e 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -87,19 +87,21 @@ endif::git-format-patch[]
ifndef::git-format-patch[]
-z::
+ifdef::git-log[]
+ Separate the commits with NULs instead of with new newlines.
++
+Also, when `--raw` or `--numstat` has been given, do not munge
+pathnames and use NULs as output field terminators.
+endif::git-log[]
ifndef::git-log[]
When `--raw` or `--numstat` has been given, do not munge
pathnames and use NULs as output field terminators.
+endif::git-log[]
+
Without this option, each pathname output will have TAB, LF, double quotes,
and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`,
respectively, and the pathname will be enclosed in double quotes if
any of those replacements occurred.
-endif::git-log[]
-
-ifdef::git-log[]
- Separate the commits with NULs instead of with new newlines.
-endif::git-log[]
--name-only::
Show only names of changed files.
--
1.6.5.3.298.g39add
^ permalink raw reply related
* Re: [PATCH 2/2] user-manual: Document that "git merge" doesn't like uncommited changes.
From: Matthieu Moy @ 2009-11-23 7:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vy6lyaz9b.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> The work tree is overwritten by the result of the
> merge when this combining is done cleanly, and the result is
> committed. Otherwise it is
> overwritten by a half-merged results when this combining results
I thought of something like this, but this is slightly incorrect in
case of fast-forward (Git doesn't "commit", but "reuses" a commit), so
I prefered making a separate paragraph.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply
* Re: [PATCH 2/2] remote-curl.c: fix rpc_out()
From: Tay Ray Chuan @ 2009-11-23 8:38 UTC (permalink / raw)
To: Sverre Rabbelier; +Cc: git, Shawn O. Pearce, Junio C Hamano
In-Reply-To: <fabb9a1e0911222153n633ade94w179513d4aa42a3d4@mail.gmail.com>
Hi,
On Mon, Nov 23, 2009 at 1:53 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
> Seems like this type of patch would do very well with a test case or two?
ah, but to trigger the code involved, a sufficiently large test
repository is needed. The git repository would be enough. :)
Any idea on how I could go about accessing this repository?
--
Cheers,
Ray Chuan
^ permalink raw reply
* Re: [ANNOUNCE] codeBeamer MR - Easy ACL for Git
From: Intland Software @ 2009-11-23 9:34 UTC (permalink / raw)
To: Sitaram Chamarty; +Cc: Petr Baudis, git
In-Reply-To: <2e24e5b90911210512g5ec26307te63d10912a7906fb@mail.gmail.com>
Sitaram Chamarty wrote:
> Intland: do you have a page that describes your role based ACL stuff a
> little more?
This is a good starting point in our Knowledge Base, to read more about
the permission model used in MR:
https://codebeamer.com/cb/wiki/11121
--
Intland Team
Follow @intland on Twitter: http://twitter.com/intland
Find codeBeamer on Facebook: http://bit.ly/rcTuX
^ permalink raw reply
* Re: 'error: unable to set permission to './objects/...'
From: Rafal Rusin @ 2009-11-23 9:35 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vd43acf7y.fsf@alter.siamese.dyndns.org>
2009/11/23 Junio C Hamano <gitster@pobox.com>:
> Rafal Rusin <rafal.rusin@gmail.com> writes:
>
>> I'm hosting git repository on filesystem with 'chmod <some-file>'
>> causing permission denied error (it's smbfs mounted directory),
>> When I was doing push to such repo using file:// protocol, I got
>> following error:
>> error: unable to set permission to './objects/...'
>>
>> I did a small fix to sha1_file.c (patch in attachment) and git now
>> warns when unable to chmod, and continues push. This resolved problem.
>> What do you think about applying it?
>
> Suppose the user wanted to use this as a shared public repository and
> configured core.sharedrepository. If we try to set shared-perm and notice
> a failure but keep going, what happens to the resulting repository?
>
> For example, the umask of the user who is pushing objects, causing this
> codepath to run, might be too tight to be usable for the purpose of making
> the file readable for other members of the group. And the chmod() fails
> in this codepath. Then what? Wouldn't it make the resulting repository
> unusable?
>
> I think a _fix_ needs to first know why chmod is failing for you and
> either
>
> (1) make it not to fail; or
>
> (2) Perhaps your filesystem is lying and the result of chmod happens to
> be Ok (iow, the resulting file may be readable/writable by people who
> are supposed to be able to, accoring to the core.sharedrepository
> settings), in which case make the code notice the situation and keep
> going _only when_ it is safe to do so.
>
> I do not think your change to _unconditionally_ keep going is a fix.
Thanks for reply. You are right about sharedrepository argument.
As for detecting this particular case, I think it's not possible.
I think the best solution is to add repository config switch like
'usefilepermissions' true by default. If set to false, git would skip
chmod during push.
Does that make sense to you?
Regards,
--
Rafał Rusin
http://rrusin.blogspot.com
http://www.touk.pl
http://top.touk.pl
^ permalink raw reply
* [PATCH] t4014-format-patch: do not assume 'test' is available as non-builtin
From: Johannes Sixt @ 2009-11-23 9:35 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
From: Johannes Sixt <j6t@kdbg.org>
One test case used 'xargs test', which assumes that 'test' is available
as external program. At least on MinGW it is not.
Moreover, 'git format-patch' was invoked in a pipeline, but not as the
last command. Rewrite the test case to catch breakage in 'git format-patch'
as well.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
t/t4014-format-patch.sh | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 5689d59..7f267f9 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -549,9 +549,7 @@ test_expect_success 'options no longer allowed for format-patch' '
test_cmp expect.check output'
test_expect_success 'format-patch --numstat should produce a patch' '
- git format-patch --numstat --stdout master..side |
- grep "^diff --git a/" |
- wc -l |
- xargs test 6 = '
+ git format-patch --numstat --stdout master..side > output &&
+ test 6 = $(grep "^diff --git a/" output | wc -l)'
test_done
--
1.6.6.rc0.1059.gdce25
^ permalink raw reply related
* Re: Git graph with branch labels for all paths in text environment
From: rhlee @ 2009-11-23 9:56 UTC (permalink / raw)
To: git
In-Reply-To: <2c6b72b30911210950m7f90f210saf3c32c1a3cbdebe@mail.gmail.com>
Jonas Fonseca wrote:
>
> You can browse all branches by using: tig --all
>
Thanks this great as this saves me from quitting tig to view all branch
histories.
Jonas Fonseca wrote:
>
> However, the graph drawing is rather poor for complex git histories.
>
I'm working on 3-4 current branches and it's fine for me.
Thanks,
Richard
--
View this message in context: http://n2.nabble.com/Git-graph-with-branch-labels-for-all-paths-in-text-environment-tp4011651p4050140.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: What's cooking in git.git (Nov 2009, #05; Sun, 22)
From: Johan Herland @ 2009-11-23 9:59 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Shawn O. Pearce
In-Reply-To: <7vhbsl935q.fsf@alter.siamese.dyndns.org>
On Monday 23 November 2009, Junio C Hamano wrote:
> * jh/notes (2009-11-20) 10 commits
> - Add more testcases to test fast-import of notes
> - Rename t9301 to t9350, to make room for more fast-import tests
> - fast-import: Proper notes tree manipulation using the notes API
> - Refactor notes concatenation into a flexible interface for combining notes
> - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
> - Notes API: for_each_note(): Traverse the entire notes tree with a callback
> - Notes API: get_note(): Return the note annotating the given object
> - Notes API: add_note(): Add note objects to the internal notes tree structure
> - Notes API: init_notes(): Initialize the notes tree from the given notes ref
> - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
>
> Early part has been lived in 'next' for a while and has graduated. This
> is a reroll of the remainder. Is everybody happy with merging this to
> 'next'?
I really want an Ack from Shawn on the fast-import patch (patch 8/10)
before putting this in 'next'. The rest of the series is good AFAICS,
although there might be some changes needed if I need to rework the
fast-import patch.
> I saw some checkpatch style violations, but didn't find anything
> objectionable in the logic.
Ok. I fixed most of them locally, but there are still some remaining in
fast-import.c, where I'd rather follow fast-import.c's existing style,
which seems to disagree somewhat with checkpatch.
The style fixes will be part of the next iteration (which will also
include the rebase back onto the early part of the jh/notes series).
I'll wait for Shawn's comments before resending, though.
> [...]
>
> * sr/vcs-helper (2009-11-18) 12 commits
> - Add Python support library for remote helpers
> - Basic build infrastructure for Python scripts
> - Allow helpers to report in "list" command that the ref is unchanged
> - Fix various memory leaks in transport-helper.c
> - Allow helper to map private ref names into normal names
> - Add support for "import" helper command
> - Allow specifying the remote helper in the url
> - Add a config option for remotes to specify a foreign vcs
> - Allow fetch to modify refs
> - Use a function to determine whether a remote is valid
> - Allow programs to not depend on remotes having urls
> - Fix memory leak in helper method for disconnect
>
> Replaced again. Is everybody happy with merging this to 'next'?
Yep, assuming Daniel is happy with the transport layer parts.
For the record, you can add this to the last patch of the series:
Signed-off-by: Johan Herland <johan@herland.net>
Have fun! :)
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
^ permalink raw reply
* Re: 'error: unable to set permission to './objects/...'
From: Martin Langhoff @ 2009-11-23 9:52 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Rafal Rusin, git
In-Reply-To: <7vd43acf7y.fsf@alter.siamese.dyndns.org>
On Mon, Nov 23, 2009 at 12:27 AM, Junio C Hamano <gitster@pobox.com> wrote:
> And the chmod() fails
> in this codepath. Then what? Wouldn't it make the resulting repository
> unusable?
Slightly off-topic: I keep encountering hosts where
core.sharedrepository doesn't always work with git+ssh. It may be
related to old git versions (I see 1.5.8 in a host where I've seen it
happen recently), but I never fails to baffle me.
Been sysadmin'ing and developing on linux since '98 and there is
nothing to prevent git from chmod'ing things right. And I know a few
things about git's plumbing :-) -- don't think it should be
mysteriously failing.
(And in several git repo servers I've spotted a cronjob doing chmod -R
g+rwx, applied by sysadmins to make the devs STFU about it ;-) ).
Is there a shortlist somewhere of reasons for it to be ignored?
Perhaps it is a known bug in old versions? -- the repo servers are
often behind...
Puzzled minds want to know.
m
--
martin.langhoff@gmail.com
martin@laptop.org -- School Server Architect
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.laptop.org/go/User:Martinlanghoff
^ permalink raw reply
* Re: [PATCH 2/2] remote-curl.c: fix rpc_out()
From: Johannes Schindelin @ 2009-11-23 10:39 UTC (permalink / raw)
To: Tay Ray Chuan; +Cc: Sverre Rabbelier, git, Shawn O. Pearce, Junio C Hamano
In-Reply-To: <be6fef0d0911230038y13c23e3ek5591ee0dc3eaa47a@mail.gmail.com>
Hi,
On Mon, 23 Nov 2009, Tay Ray Chuan wrote:
> On Mon, Nov 23, 2009 at 1:53 PM, Sverre Rabbelier <srabbelier@gmail.com>
> wrote:
> > Seems like this type of patch would do very well with a test case or
> > two?
>
> ah, but to trigger the code involved, a sufficiently large test
> repository is needed. The git repository would be enough. :)
I guess you meant "not be enough", as an int can hold a pretty large
number until it turns negative.
So I think in this case it is more harm- than helpful to have a test case.
For future reference: if you need a repository with special featurs
for testing, it is best to generate it in a test script (see the many test
cases labeled 'setup' in our test suite for examples).
Ciao,
Dscho
^ permalink raw reply
* Re: 'error: unable to set permission to './objects/...'
From: Junio C Hamano @ 2009-11-23 10:54 UTC (permalink / raw)
To: Rafal Rusin; +Cc: git
In-Reply-To: <9bbf67fa0911230135j7cfe5bcem991e750b6754f344@mail.gmail.com>
Rafal Rusin <rafal.rusin@gmail.com> writes:
> As for detecting this particular case, I think it's not possible.
Why not?
> I think the best solution is to add repository config switch like
> 'usefilepermissions' true by default. If set to false, git would skip
> chmod during push.
> Does that make sense to you?
Not at all. That is like creating an "allow broken behaviour" option and
hoping for the best.
You shouldn't have to invent such a configuration variable to begin with,
as "let umask set whatever permission and leave it be" should already be
the case for !core.sharedrepository. There is something wrong in your
set up and you need to get to the bottom of it, instead of coming up with
an even worse breakage as a unworkable workaround.
There are some things I noticed while looking at the codepaths that are
involved.
move_temp_to_file() is designed to move a temporary file that was created
by odb_mkstemp(). As the latter eventually uses mkstemp(), some
implementations of which ignore umask and create a file that is readable
only by the user, move_temp_to_file() must loosen the permission, even in
a private repository that honors umask (i.e. not in a shared repository)..
Side note. The creation of the temporary files in http.c that are
given to move_temp_to_file() is not quite correct; they are created by
fopen() without proper locking with mkstemp(). But that is a separate
issue.
But the codepath tries to loosen it a bit too much. Even if user's umask
is 077, files created in this codepath end up with world-readable because
we pretend that lstat() on the file returned 0444 (that is what a non-zero
value given as the second parameter to set_shared_perm() means). We
should tighten it perhaps like the attached patch does.
In case it is not obvious, this patch is _not_ meant to help you work
around the chmod() failure you are seeing on your filesystem. You need to
first see _why_ it fails for you, in order to come closer to the real
solution.
-- >8 --
Subject: [PATCH] move_temp_to_file(): don't loosen permission too much
We always feed 0444 as the second parameter to set_shared_perm() when
finalizing a temporary file we created using mkstemp(), as some versions
of glibc creates a temporary file with too tight a permission, ignoring
the user's umask. As the second parameter tells set_shared_perm() to
pretend that it is the permission bits the file currently has (i.e. what
should have been set by the user's umask), we should make it just as
restrictive as user's umask suggests.
---
sha1_file.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index 63981fb..f0b8969 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2233,6 +2233,21 @@ static void write_sha1_file_prepare(const void *buf, unsigned long len,
git_SHA1_Final(sha1, &c);
}
+static int fix_tempfile_mode(const char *filename)
+{
+ static mode_t user_mode;
+
+ if (!user_mode) {
+ user_mode = umask(0);
+ umask(user_mode);
+ user_mode = S_IFREG | ((user_mode ^ 0777) & 0666);
+ }
+
+ if (!set_shared_perm(filename, user_mode))
+ return 0;
+ return error("unable to set permission to '%s'", filename);
+}
+
/*
* Move the just written object into its final resting place.
* NEEDSWORK: this should be renamed to finalize_temp_file() as
@@ -2274,9 +2289,7 @@ int move_temp_to_file(const char *tmpfile, const char *filename)
}
out:
- if (set_shared_perm(filename, (S_IFREG|0444)))
- return error("unable to set permission to '%s'", filename);
- return 0;
+ return fix_tempfile_mode(filename);
}
static int write_buffer(int fd, const void *buf, size_t len)
^ permalink raw reply related
* Re: [PATCH] unset GREP_OPTIONS in test-lib.sh
From: Carlo Marcelo Arenas Belon @ 2009-11-23 11:22 UTC (permalink / raw)
To: Ren? Scharfe; +Cc: Junio C Hamano, Bert Wesarg, git
In-Reply-To: <4B095F91.8030305@lsrfire.ath.cx>
On Sun, Nov 22, 2009 at 04:58:09PM +0100, Ren? Scharfe wrote:
> Junio C Hamano schrieb:
> > Do we kill that environment variable when we call out to external grep in
> > grep.c? If not, we should. An alternative is to teach our internal one
> > to also honor it, but I personally do not find it too attractive to mimic
> > the design mistake of GREP_OPTIONS myself.
>
> We don't. Here's a patch with a simple test case that makes git grep
> unset GREP_OPTIONS before it calls the external grep.
>
> While we're at it, also unset GREP_COLOR and GREP_COLORS in case
> colouring is not enabled, to be on the safe side. The presence of
> these variables alone is not sufficient to trigger coloured output with
> GNU grep, but other implementations may behave differently.
why not better to apply the proposed patch from Junio in :
http://article.gmane.org/gmane.comp.version-control.git/127980/
it would IMHO correct all reported issues and serve as well as a catch
all from other tools that could be introduced in the future and that
will be similarly affected by this misfeature.
Carlo
^ permalink raw reply
* git describe oddity: ignoring recent tags...
From: Martin Langhoff @ 2009-11-23 12:01 UTC (permalink / raw)
To: Git Mailing List
Clone this repo: git://dev.laptop.org/projects/olpc-update -- or just
check visually the recent history here
http://dev.laptop.org/git/projects/olpc-update/log/
git describe origin/master will respond olpc-update-2.16-20-g2d4e4b8
when it is fairly clear to me that it should be
olpc-update-2.19-1g<hash>.
For some reason, recent tags are being ignored -- and cgit even
displays them differently in
http://dev.laptop.org/git/projects/olpc-update/log/ though it is
unclear to me why.
These tags are not 'lightweight', and no tags are signed either.
Passing --tags and --debug has not helped much.
Tested with 1.6.0.6 (Fedora 9 rpm) and 1.6.3.1.26.gf5b223 (on Karmic).
m
--
martin.langhoff@gmail.com
martin@laptop.org -- School Server Architect
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.laptop.org/go/User:Martinlanghoff
^ permalink raw reply
* Re: git describe oddity: ignoring recent tags...
From: Björn Steinbrink @ 2009-11-23 12:30 UTC (permalink / raw)
To: Martin Langhoff; +Cc: Git Mailing List
In-Reply-To: <46a038f90911230401sb2b1dd7u21b5d7edefe510eb@mail.gmail.com>
On 2009.11.23 13:01:51 +0100, Martin Langhoff wrote:
> Clone this repo: git://dev.laptop.org/projects/olpc-update -- or just
> check visually the recent history here
> http://dev.laptop.org/git/projects/olpc-update/log/
>
> git describe origin/master will respond olpc-update-2.16-20-g2d4e4b8
> when it is fairly clear to me that it should be
> olpc-update-2.19-1g<hash>.
>
> For some reason, recent tags are being ignored -- and cgit even
> displays them differently in
> http://dev.laptop.org/git/projects/olpc-update/log/ though it is
> unclear to me why.
>
> These tags are not 'lightweight', and no tags are signed either.
> Passing --tags and --debug has not helped much.
They are lightweight:
$ git cat-file -t olpc-update-2.19
commit
And using --tags "helps" here:
$ git describe
olpc-update-2.16-20-g2d4e4b8
$ git describe --tags
olpc-update-2.19-3-g2d4e4b8
Bjoern
^ permalink raw reply
* Re: git describe oddity: ignoring recent tags...
From: Martin Langhoff @ 2009-11-23 12:38 UTC (permalink / raw)
To: Björn Steinbrink; +Cc: Git Mailing List
In-Reply-To: <20091123123048.GA10172@atjola.homenet>
2009/11/23 Björn Steinbrink <B.Steinbrink@gmx.de>:
> They are lightweight:
> $ git cat-file -t olpc-update-2.19
> commit
Hmmm. I thought a tag with a _message_ was not lightweight.
$ git tag -ln
...
olpc-update-2.16 Release 2.16
olpc-update-2.17 Release 2.17.
olpc-update-2.18 Rlease 2.18.
olpc-update-2.19 Release 2.19.
Argh... I see now - git tag is being helpful and showing the first
line of the commit msg instead of the tag msg, so I thought they were
full tags.
DWIM bites again! ;-(
> And using --tags "helps" here:
> $ git describe
> olpc-update-2.16-20-g2d4e4b8
>
> $ git describe --tags
> olpc-update-2.19-3-g2d4e4b8
Right. Doesn't make a difference with 1.6.0.6 but it does with
1.6.3.1.26.gf5b223
m
--
martin.langhoff@gmail.com
martin@laptop.org -- School Server Architect
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.laptop.org/go/User:Martinlanghoff
^ permalink raw reply
* Re: git describe oddity: ignoring recent tags...
From: Thomas Rast @ 2009-11-23 12:39 UTC (permalink / raw)
To: Björn Steinbrink; +Cc: Martin Langhoff, Git Mailing List
In-Reply-To: <20091123123048.GA10172@atjola.homenet>
Björn Steinbrink wrote:
> On 2009.11.23 13:01:51 +0100, Martin Langhoff wrote:
> > git describe origin/master will respond olpc-update-2.16-20-g2d4e4b8
> > when it is fairly clear to me that it should be
> > olpc-update-2.19-1g<hash>.
[...]
> They are lightweight:
> $ git cat-file -t olpc-update-2.19
> commit
>
> And using --tags "helps" here:
> $ git describe
> olpc-update-2.16-20-g2d4e4b8
>
> $ git describe --tags
> olpc-update-2.19-3-g2d4e4b8
Note that Gits that do not have 7e425c4 (describe: Make --tags and
--all match lightweight tags more often, 2008-10-13; first released in
1.6.1) will prefer the annotated tag over the unannotated ones even
with --tags, which explains your observation
> > For some reason, recent tags are being ignored -- and cgit even
> > displays them differently in
> > http://dev.laptop.org/git/projects/olpc-update/log/ though it is
> > unclear to me why.
at least with the first Git version mentioned:
> > Tested with 1.6.0.6 (Fedora 9 rpm) and 1.6.3.1.26.gf5b223 (on Karmic).
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply
* Re: Android needs repo, Chrome needs gclient. Neither work. What does that say about git?
From: tytso @ 2009-11-23 13:58 UTC (permalink / raw)
To: Adrian May; +Cc: git, chromium-discuss
In-Reply-To: <65e170e70911222011l776a6aean7bd75f072a806616@mail.gmail.com>
On Mon, Nov 23, 2009 at 12:11:29PM +0800, Adrian May wrote:
> As for gclient and repo, without pretending to be an expert on what
> they actually do, I'm getting a strong gut feeling that if what I'm
> trying to do is pull or push code, then that's about as close as you
> can get to a definition of source control's central purpose. In the
> days of cvs or svn, I'd expect to use the source control for that. How
> come git needs help?
> > these "bolt-on scripts" give the savvy user freedom
>
> Actually, I think their purpose is precisely the opposite: to regiment
> the ordinary developer into following their process. So having that
> code under the developer's control is a weakness.
If you don't have bolt-on scripts, and you move that into the the core
SCM, then you force *all* projects to use whatever workflow was
decided as being the One True Way of doing things as seen by the SCM
designer. So the question is whether the SCM *should* regiment all
projects into following the SCM's designers idea of the One True
Workflow.
Git's approach is to say that it will be fairly flexible about
dictating workflow --- who pushs to whom; whether there is a single
"star" repository topology, or something that is more flexible, etc.
You seem to hate this flexibility, because it makes life harder until
you set up these bolt-on scripts. But that's what many of us like
about git; that it doesn't force us (the project lead) into a single
way of doing things.
As far as my wanting to impose a particular regimen on my project's
developers, I've never been a big fan of the Bondage and Discpline
school of software engineering. They can use whatever workflow they
like; they just have to deliver patches that are clean. If they are,
I'll pull from their repository. If they aren't, I won't.
- Ted
^ permalink raw reply
* Re: how to suppress progress percentage in git-push
From: Jeff King @ 2009-11-23 15:00 UTC (permalink / raw)
To: bill lam; +Cc: Nicolas Pitre, git
In-Reply-To: <20091122145352.GA3941@debian.b2j>
On Sun, Nov 22, 2009 at 10:53:53PM +0800, bill lam wrote:
> I set crontab to push to another computer for backup. It sent
> confirmation email after finished. It looked like
>
> Counting objects: 1
> Counting objects: 9, done.
> Delta compression using up to 2 threads.
> Compressing objects: 20% (1/5)
> Compressing objects: 40% (2/5)
> Compressing objects: 60% (3/5)
> Compressing objects: 80% (4/5)
> Compressing objects: 100% (5/5)
> Compressing objects: 100% (5/5), done.
> Writing objects: 20% (1/5)
> Writing objects: 40% (2/5)
> Writing objects: 60% (3/5)
> Writing objects: 80% (4/5)
> Writing objects: 100% (5/5)
> Writing objects: 100% (5/5), 549 bytes, done.
> Total 5 (delta 3), reused 0 (delta 0)
>
> Often the list of progress % can be a page long. I want output but
> not those percentage progress status. Will that be possible?
Hmm. There seems to be a bug. pack-objects is supposed to see that
stderr is not a tty and suppress the progress messages. But it doesn't,
because send-pack gives it the --all-progress flag, which
unconditionally tells it to display progress, when the desired impact is
actually to just make the progress more verbose.
We need to do one of:
1. make --all-progress imply "if we are using progress, then make it
more verbose. Otherwise, ignore."
2. fix all callers to check isatty(2) before unconditionally passing
the option
The patch for (1) would look something like what's below. It's simpler,
but it does change the semantics; anyone who was relying on
--all-progress to turn on progress unconditionally would need to now
also use --progress. However, turning on progress unconditionally is
usually an error (the except is if you are piping output in real-time to
the user and need to overcome the isatty check).
Nicolas, this is your code. Which do you prefer?
-Peff
---
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 4c91e94..50dd429 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -75,6 +75,7 @@ static int ignore_packed_keep;
static int allow_ofs_delta;
static const char *base_name;
static int progress = 1;
+static int all_progress;
static int window = 10;
static uint32_t pack_size_limit, pack_size_limit_cfg;
static int depth = 50;
@@ -2220,7 +2221,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
continue;
}
if (!strcmp("--all-progress", arg)) {
- progress = 2;
+ all_progress = 1;
continue;
}
if (!strcmp("-q", arg)) {
@@ -2295,6 +2296,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
usage(pack_usage);
}
+ if (progress && all_progress)
+ progress = 2;
+
/* Traditionally "pack-objects [options] base extra" failed;
* we would however want to take refs parameter that would
* have been given to upstream rev-list ourselves, which means
^ permalink raw reply related
* Re: how to suppress progress percentage in git-push
From: Petr Baudis @ 2009-11-23 15:50 UTC (permalink / raw)
To: Jeff King; +Cc: bill lam, Nicolas Pitre, git
In-Reply-To: <20091123145959.GA13138@sigill.intra.peff.net>
On Mon, Nov 23, 2009 at 10:00:00AM -0500, Jeff King wrote:
> The patch for (1) would look something like what's below. It's simpler,
> but it does change the semantics; anyone who was relying on
> --all-progress to turn on progress unconditionally would need to now
> also use --progress. However, turning on progress unconditionally is
> usually an error (the except is if you are piping output in real-time to
> the user and need to overcome the isatty check).
I'm actually doing exactly that in the mirrorproj.cgi of Girocco, so I
would be unhappy if I would have to go through creating ptys or whatever
now. Maybe conditioning this by an environment variable?
Petr "Pasky" Baudis
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox