* What's cooking in git.git (Jun 2009, #01; Fri, 12)
@ 2009-06-12 9:11 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2009-06-12 9:11 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 branches, but I am still
holding onto them.
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
Unfortunately I am unusually short of time these days, and some of the
topics unfortunately got less "final review before deciding to merge up"
than I would have liked to give them. This message itself has more
"please comment/review" requests than usual.
----------------------------------------------------------------
[New Topics]
* tr/die_errno (Mon Jun 8 23:02:20 2009 +0200) 4 commits
- Use die_errno() instead of die() when checking syscalls
- Convert existing die(..., strerror(errno)) to die_errno()
- die_errno(): double % in strerror() output just in case
- Introduce die_errno() that appends strerror(errno) to die()
I didn't check the individual conversion from die() to die_errno()
in this latest round; comments?
* cb/maint-no-double-merge (Mon Jun 1 11:20:56 2009 +0200) 1 commit
+ refuse to merge during a merge
Will merge to 'master' soonish.
* sp/msysgit (Thu Jun 11 22:56:12 2009 +0200) 13 commits
+ compat/ has subdirectories: do not omit them in 'make clean'
+ Fix typo in nedmalloc warning fix
+ MinGW: Teach Makefile to detect msysgit and apply specific
settings
+ Fix warnings in nedmalloc when compiling with GCC 4.4.0
+ Add custom memory allocator to MinGW and MacOS builds
+ MinGW readdir reimplementation to support d_type
+ connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
+ git: browsing paths with spaces when using the start command
+ MinGW: fix warning about implicit declaration of _getch()
+ test-chmtime: work around Windows limitation
+ Work around a regression in Windows 7, causing erase_in_line() to
crash sometimes
+ Quiet make: do not leave Windows behind
+ MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
A silly typo I failed to spot was fixed by J6t; should be ready for
'master' now.
* mh/master-send-email (Sun Jun 7 23:40:52 2009 +0200) 8 commits
- send-email: fix a typo in a comment
- Merge branch 'mh/maint-send-email' into mh/master-send-email
- Merge branch 'mh/master-send-email-threaded-fix' into mh/master-
send-email
- add a test for git-send-email for threaded mails without chain-
reply-to
- send-email: fix threaded mails without chain-reply-to
- doc/send-email: clarify the behavior of --in-reply-to with --no-
thread
- send-email: fix non-threaded mails
- add a test for git-send-email for non-threaded mails
The author seems to have a better organization than the way I queued this
topic, so I am holding off merging it to 'next' yet. My goal was to have
two topics, one eventually mergeable to 'maint', the other to 'master'.
* mn/maint-iconv-autoconf (Mon Jun 8 20:46:38 2009 -0700) 1 commit
- fix handling of iconv configuration options
Will merge to 'next' soon.
* rc/maint-http-local-slot-fix (Sat Jun 6 16:43:26 2009 +0800) 1 commit
+ http*: cleanup slot->local after fclose
* sb/parse-options-integer (Thu Jun 4 16:43:57 2009 -0700) 2 commits
+ parse-options: simplify usage argh handling
+ parse-options: make OPT_INTEGER's argh explicit
* sb/pull-rebase (Fri Jun 12 00:39:21 2009 +0200) 3 commits
- parse-remote: remove unused functions
- parse-remote: support default reflist in get_remote_merge_branch
- parse-remote: function to get the tracking branch to be merge
Will merge to 'next' soon, but it would be nice if we can fix the
"currently works only for the default mapping" before it goes to
'master'.
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
- Shift object enumeration out of upload-pack
* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
- http.c: add http.sslCertNoPass option
- http.c: prompt for SSL client certificate password
I think "sslCertNoPass" is a mistake. We should aim for the ideal (i.e.
detect when we do not need passphrase), and live with a configuration
kludge until the code achives the ideal (i.e. "needPass" to trigger the
new codepath to ask for passphrase), _if_ that ideal is achievable. And
in this particular case, I think the ideal is not rocket science.
* mg/pushurl (Tue Jun 9 18:01:38 2009 +0200) 5 commits
- builtin-remote: Make "remote -v" display push urls
- builtin-remote: Show push urls as well
- technical/api-remote: Describe new struct remote member pushurl
- t5516: Check pushurl config setting
- Allow push and fetch urls to be different
Will merge to 'next' soon.
----------------------------------------------------------------
[Graduated to "master"]
* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit
+ Documentation: teach stash/pop workflow instead of stash/apply
* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits
+ diff: generate pretty filenames in prep_temp_blob()
+ compat: add a basename() compatibility function
+ compat: add a mkstemps() compatibility function
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
+ Change xdl_merge to generate output even for null merges
+ t6023: merge-file fails to output anything for a degenerate merge
----------------------------------------------------------------
[Will merge to "master" soon]
* bc/solaris (Sun Jun 7 07:40:29 2009 +0200) 10 commits
- configure: test whether -lresolv is needed
+ Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
+ git-compat-util.h: avoid using c99 flex array feature with Sun
compiler 5.8
+ Makefile: add section for SunOS 5.7
+ Makefile: introduce SANE_TOOL_PATH for prepending required
elements to PATH
+ Makefile: define __sun__ on SunOS
+ git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
+ On Solaris choose the OLD_ICONV iconv() declaration based on the
UNIX spec
+ Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
arguments
+ Makefile: use /usr/ucb/install on SunOS platforms rather than
ginstall
We saw some success report with Sun's c99 compiler, which would allow us
to include the last remaining patch from Brandon with updates. I lost
track of the status of the tip patch for autoconf. Is it ready to go?
Comments from Solaris folks are appreciated.
* cb/match_refs_internal_tail (Sun May 31 16:26:48 2009 +0200) 1 commit
+ match_refs: search ref list tail internally
* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
+ git-cvsexportcommit can't commit files which have been removed
from CVS
* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
+ for-each-ref: Do not lookup objects when they will not be used
I think this makes sense, except that I have this nagging feeling that its
use of for_each_rawref() where the original used for_each_ref() may have
some unintended side effects in corner cases.
* ph/submodule-rebase (Wed Jun 3 00:59:12 2009 +0200) 3 commits
- git-submodule: add support for --merge.
+ Rename submodule.<name>.rebase to submodule.<name>.update
+ git-submodule: add support for --rebase.
I think people do not have issues with the first two, even though some
might still argue that "update --merge" is not a good mode of
operation.
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
+ mergetool--lib: add support for araxis merge
* cc/bisect (Sat Jun 6 06:41:35 2009 +0200) 5 commits
+ t6030: test skipping away from an already skipped commit
+ bisect: when skipping, choose a commit away from a skipped commit
+ bisect: add parameters to "filter_skipped"
+ bisect: display first bad commit without forking a new process
+ bisect: drop unparse_commit() and use clear_commit_marks()
Regardless of metrics, this is an improvement from the current one. Will
merge to 'master', and let the finer details taken care of later.
* rc/http-push (Sat Jun 6 16:44:02 2009 +0800) 24 commits
+ http*: add helper methods for fetching objects (loose)
+ http*: add helper methods for fetching packs
+ http: use new http API in fetch_index()
+ http*: add http_get_info_packs
+ http-push.c::fetch_symref(): use the new http API
+ http-push.c::remote_exists(): use the new http API
+ http.c::http_fetch_ref(): use the new http API
+ transport.c::get_refs_via_curl(): use the new http API
+ http.c: new functions for the http API
+ http: create function end_url_with_slash
+ http*: move common variables and macros to http.[ch]
+ transport.c::get_refs_via_curl(): do not leak refs_url
+ Don't expect verify_pack() callers to set pack_size
+ http-push: do not SEGV after fetching a bad pack idx file
+ http*: copy string returned by sha1_to_hex
+ http-walker: verify remote packs
+ http-push, http-walker: style fixes
+ t5550-http-fetch: test fetching of packed objects
+ http-push: fix missing "#ifdef USE_CURL_MULTI" around
"is_running_queue"
+ http-push: send out fetch requests on queue
+ t5540-http-push: test fetching of packed objects
+ t5540-http-push: test fetching of loose objects
+ Merge branch 'rc/maint-http-local-slot-fix' into rc/http-push
+ http*: cleanup slot->local after fclose
I do not use http-push myself, and as I said, I have shortage of git time
in recent weeks, so these are not as carefully reviewed as usual; but
RCTay is proving to be a very reliable HTTP guy I can trust, so unless
there are regression reports from people who actually use http-push, this
will be in 'master' soon.
----------------------------------------------------------------
[Stalled and may need help and prodding to go forward]
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
Dscho asked about the performance implications of this; I do not think I
saw any progress on that yet...
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
- Add initial support for pathname conversion to UTF-8
- read_directory(): infrastructure for pathname character set
conversion
- Add 'fill_directory()' helper function for directory traversal
Before adding the real "conversion", this needs a few real fixups, I
think. For example there is one hardcoded array that is used without
bounds check.
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
- Fix for a merge where a branch has an F->D transition
- Add a reminder test case for a merge with F/D transition
Although the reported breakage is covered with the patch, Alex feels the
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
may be long overdue but seems to be a hard problem.
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
- blame.c: start libifying the blame infrastructure
A few minor point remains in this initial one.
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
- Allow --date=local --date=other-format to work as expected
The one I posted had a few corner-case bugs that was caught with the test
suite; this one has them fixed. People did not like the UI so it is kept
out of 'next'
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
- git-merge-file: allow converting the results for the work tree
This is a feature waiting for a user.
We did not give scripted Porcelains a way to say "this temporary file I am
using for merging is for this path, so use the core.autocrlf and attributes
rules for that final path". Instead, merge-file simply wrote out the
data in the canonical repository representation.
rerere has the same issue, but it is a lot worse. It reads the three
files (preimage, postimage and thisimage) from the work tree in the work
tree representation, merges them without converting them to the canonical
representation first but inserts the conflict markers with the canonical
representation and writes the resulting mess out. It needs to be fixed to
read with convert_to_git(), merge them while they are still in the
canonical representation and possibly add conflict markers, and then write
the results out after convert_to_working_tree(). It also needs to write
in binary mode as well.
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
- Add option for using a foreign VCS
- Document details of transport function APIs
- Allow late reporting of fetched hashes
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
- t/t9600: remove exit after test_done
- cvsimport: extend testcase about patchset order to contain
branches
- cvsimport: add test illustrating a bug in cvsps
- Add a test of "git cvsimport"'s handling of tags and branches
- Add some tests of git-cvsimport's handling of vendor branches
- Test contents of entire cvsimported "master" tree contents
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
- Start a library for cvsimport-related tests
----------------------------------------------------------------
[Actively cooking]
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
- git-am: refactor 'cleaning up and aborting'
- git-am foreign patch support: StGIT support
- git-am foreign patch support: autodetect some patch formats
- git-am foreign patch support: introduce patch_format
Should re-review and merge to 'next' but I am short of time these days.
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
+ Avoid "diff-index --cached" optimization under --find-copies-
harder
+ Optimize "diff-index --cached" using cache-tree
+ t4007: modernize the style
+ cache-tree.c::cache_tree_find(): simplify internal API
+ write-tree --ignore-cache-tree
I believe the code is right, but this touches a very low-level code with
high chance of subtle breakages unless you are really careful. I'll let
it simmer a bit longer in 'next'.
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
- diff: Rename QUIET internal option to QUICK
- diff: change semantics of "ignore whitespace" options
I am not sure if it should wait for a major version bump but this is a
good semantics change. Perhaps merge to 'next' soonish, but I am
undecided. Comments?
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
- t6050: check pushing something based on a replaced commit
- Documentation: add documentation for "git replace"
- Add git-replace to .gitignore
- builtin-replace: use "usage_msg_opt" to give better error messages
- parse-options: add new function "usage_msg_opt"
- builtin-replace: teach "git replace" to actually replace
- Add new "git replace" command
- environment: add global variable to disable replacement
- mktag: call "check_sha1_signature" with the replacement sha1
- replace_object: add a test case
- object: call "check_sha1_signature" with the replacement sha1
- sha1_file: add a "read_sha1_file_repl" function
- replace_object: add mechanism to replace objects found in
"refs/replace/"
- refs: add a "for_each_replace_ref" function
----------------------------------------------------------------
[On Hold]
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
- receive-pack: default receive.denyDeleteCurrent to refuse
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
- Refuse updating the current branch in a non-bare repository via
push
These are for 1.7.0, but the messages when they trigger together may need
to be rethought.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (May 2009, #04; Sun, 31)
@ 2009-06-01 1:24 2% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2009-06-01 1:24 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 branches, but I am still
holding onto them.
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
----------------------------------------------------------------
[New Topics]
All of these are soon to be in 'next'.
* bc/solaris (Wed May 27 21:17:08 2009 -0500) 4 commits
- Makefile: introduce SANE_TOOL_PATH for prepending required
elements to PATH
- Makefile: add section for SunOS 5.7
- Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
arguments
- Makefile: use /usr/ucb/install on SunOS platforms rather than
ginstall
* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
- git-cvsexportcommit can't commit files which have been removed
from CVS
* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit
- Documentation: teach stash/pop workflow instead of stash/apply
* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits
- diff: generate pretty filenames in prep_temp_blob()
- compat: add a basename() compatibility function
- compat: add a mkstemps() compatibility function
* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
- for-each-ref: Do not lookup objects when they will not be used
* cb/match_refs_internal_tail (Wed May 27 22:13:44 2009 +0200) 1 commit
- match_refs: search ref list tail internally
I need to replace this with the new iteration...
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
- git-am: refactor 'cleaning up and aborting'
- git-am foreign patch support: StGIT support
- git-am foreign patch support: autodetect some patch formats
- git-am foreign patch support: introduce patch_format
----------------------------------------------------------------
[Graduated to "master"]
* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 2 commits
+ parse-opts: add OPT_FILENAME and transition builtins
+ parse-opts: prepare for OPT_FILENAME
* rs/maint-grep-word-regexp-fix (Sat May 23 13:45:26 2009 +0200) 1 commit
+ grep: fix word-regexp at the beginning of lines
* mm/apply-double-slash (Thu May 21 14:25:11 2009 +0200) 1 commit
+ apply: handle filenames with double slashes better
* bc/old-iconv (Fri May 22 18:47:06 2009 -0500) 10 commits
+ t8005: convert CP1251 character set to ISO8859-5
+ t8005: use more portable character encoding names
+ t5100: use ancient encoding syntax for backwards compatibility
+ t9301: use ISO8859-1 rather than ISO-8859-1
+ t3901: Use ISO8859-1 instead of ISO-8859-1 for backward
compatibility
+ t3901: avoid negation on right hand side of '|'
+ builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as
fallback encoding
+ builtin-mailinfo.c: compare character encodings case insensitively
+ Use 'UTF-8' rather than 'utf-8' everywhere for backward
compatibility
+ t3900: use ancient iconv names for backward compatibility
* sb/show-branch-parse-options (Thu May 21 00:33:18 2009 -0700) 3 commits
+ show-branch: migrate to parse-options API
+ Merge branch 'mh/show-branch-color' into sb/show-branch-parse-
options
+ parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated
argh's
* sb/maint-1.6.2-opt-filename-fix (Sat May 23 11:53:11 2009 -0700) 2 commits
+ apply, fmt-merge-msg: use relative filenames
+ commit: -F overrides -t
* jc/solaris-0811 (Fri May 22 22:55:31 2009 -0700) 2 commits
- OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
- Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
+ send-email: Remove superfluous `my $editor = ...'
+ send-email: 'References:' should only reference what is sent
+ send-email: Handle "GIT:" rather than "GIT: " during --compose
+ Docs: send-email: --smtp-server-port can take symbolic ports
+ Docs: send-email: Refer to CONFIGURATION section for
sendemail.multiedit
+ Docs: send-email: Put options back into alphabetical order
* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits
+ mktree: validate entry type in input
+ mktree --batch: build more than one tree object
+ mktree --missing: updated usage message and man page
+ mktree --missing: allow missing objects
+ t1010: add mktree test
+ mktree: do not barf on a submodule commit
+ builtin-mktree.c: use a helper function to handle one line of
input
+ mktree: use parse-options
+ build-in git-mktree
* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits
+ Revert "git-add--interactive: remove hunk coalescing"
+ Splitting a hunk that adds a line at the top fails in "add -p"
* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit
+ format-patch: migrate to parse-options API
* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits (early part)
+ bisect: check ancestors without forking a "git rev-list" process
+ commit: add function to unparse a commit and its parents
+ bisect: rework some rev related functions to make them more
reusable
----------------------------------------------------------------
[Stalled and may need help and prodding to go forward]
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
Dscho asked about the performance implications of this; I do not think I
saw any progress on that yet...
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
+ git-submodule: add support for --rebase.
There was a discussion on --rebase vs --merge and needs for unified
configuration variable handling for this patch...
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
- Add initial support for pathname conversion to UTF-8
- read_directory(): infrastructure for pathname character set
conversion
- Add 'fill_directory()' helper function for directory traversal
Before adding the real "conversion", this needs a few real fixups, I
think. For example there is one hardcoded array that is used without
bounds check.
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
- Fix for a merge where a branch has an F->D transition
- Add a reminder test case for a merge with F/D transition
Although the reported breakage is covered with the patch, Alex feels the
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
may be long overdue but seems to be a hard problem.
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
- blame.c: start libifying the blame infrastructure
A few minor point remains in this initial one. I hate to do these minor
fix-ups myself, but I may end up doing so...
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
- Allow --date=local --date=other-format to work as expected
The one I posted had a few corner-case bugs that was caught with the test
suite; this one has them fixed. People did not like the UI so it is kept
out of 'next'
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
- git-merge-file: allow converting the results for the work tree
This is a feature waiting for a user.
We did not give scripted Porcelains a way to say "this temporary file I am
using for merging is for this path, so use the core.autocrlf and attributes
rules for that final path". Instead, merge-file simply wrote out the
data in the canonical repository representation.
rerere has the same issue, but it is a lot worse. It reads the three
files (preimage, postimage and thisimage) from the work tree in the work
tree representation, merges them without converting them to the canonical
representation first but inserts the conflict markers with the canonical
representation and writes the resulting mess out. It needs to be fixed to
read with convert_to_git(), merge them while they are still in the
canonical representation and possibly add conflict markers, and then write
the results out after convert_to_working_tree(). It also needs to write
in binary mode as well.
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
- Add option for using a foreign VCS
- Document details of transport function APIs
- Allow late reporting of fetched hashes
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
- t/t9600: remove exit after test_done
- cvsimport: extend testcase about patchset order to contain
branches
- cvsimport: add test illustrating a bug in cvsps
- Add a test of "git cvsimport"'s handling of tags and branches
- Add some tests of git-cvsimport's handling of vendor branches
- Test contents of entire cvsimported "master" tree contents
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
- Start a library for cvsimport-related tests
----------------------------------------------------------------
[Actively cooking]
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
+ mergetool--lib: add support for araxis merge
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
+ Avoid "diff-index --cached" optimization under --find-copies-
harder
+ Optimize "diff-index --cached" using cache-tree
+ t4007: modernize the style
+ cache-tree.c::cache_tree_find(): simplify internal API
+ write-tree --ignore-cache-tree
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
- Change xdl_merge to generate output even for null merges
- t6023: merge-file fails to output anything for a degenerate merge
Soon in 'next';
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
- diff: Rename QUIET internal option to QUICK
- diff: change semantics of "ignore whitespace" options
* cc/bisect (Thu May 28 23:21:16 2009 +0200) 2 commits
- bisect: display first bad commit without forking a new process
- bisect: drop unparse_commit() and use clear_commit_marks()
Soon in 'next';
* rc/http-push (Sat May 30 01:59:50 2009 +0800) 21 commits
- http*: add helper methods for fetching objects (loose)
- http*: add helper methods for fetching packs
- http: use new http API in fetch_index()
- http*: add http_get_info_packs
- Use the new http API in fetch_symref()
- Use the new http API in update_remote_info_refs()
- Use the new http API in http_fetch_ref()
- Use the new http API in get_refs_via_curl()
- Two new functions for the http API
- http: create function end_url_with_slash
- http*: move common variables and macros to http.[ch]
- Some cleanup in get_refs_via_curl()
- Don't expect verify_pack() callers to set pack_size
- http-push: do not SEGV after fetching a bad pack idx file
- http*: copy string returned by sha1_to_hex
- http-walker: verify remote packs
- http-push, http-walker: style fixes
- http-push: fix missing "#ifdef USE_CURL_MULTI" around
"is_running_queue"
- http-push: send out fetch requests on queue
- t5540-http-push: test fetching of packed objects
- t5540-http-push: test fetching of loose objects
Updated (but not yet with the "slot->local = NULL" patch)
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
- t6050: check pushing something based on a replaced commit
- Documentation: add documentation for "git replace"
- Add git-replace to .gitignore
- builtin-replace: use "usage_msg_opt" to give better error messages
- parse-options: add new function "usage_msg_opt"
- builtin-replace: teach "git replace" to actually replace
- Add new "git replace" command
- environment: add global variable to disable replacement
- mktag: call "check_sha1_signature" with the replacement sha1
- replace_object: add a test case
- object: call "check_sha1_signature" with the replacement sha1
- sha1_file: add a "read_sha1_file_repl" function
- replace_object: add mechanism to replace objects found in
"refs/replace/"
- refs: add a "for_each_replace_ref" function
Rebased to master.
----------------------------------------------------------------
[On Hold]
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
- receive-pack: default receive.denyDeleteCurrent to refuse
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
- Refuse updating the current branch in a non-bare repository via
push
These are for 1.7.0, but the messages when they trigger together may need
to be rethought.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (May 2009, #03; Mon, 25)
@ 2009-05-25 8:33 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2009-05-25 8:33 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 branches, but I am still
holding onto them.
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
----------------------------------------------------------------
[New Topics]
* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 5 commits
- parse-opts: add OPT_FILENAME and transition builtins
- parse-opts: prepare for OPT_FILENAME
- Merge branch 'jc/mktree' into sb/opt-filename
- Merge branch 'sb/format-patch-parseopt' into sb/opt-filename
- Merge branch 'sb/show-branch-parse-options' into sb/opt-filename
- Merge branch 'master' into sb/opt-filename
+ apply, fmt-merge-msg: use relative filenames
+ commit: -F overrides -t
There are quite a few new callers to parse_options() in 'next' and 'pu'
that are more likely to graduate before this series, so for now I merged a
few of them and adjusted the commit "prepare for OPT_FILENAME". I tried
to be careful but extra sets of eyeballs would be helpful.
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
+ mergetool--lib: add support for araxis merge
I admit that I feel certain distaste in supporting a closed tool, but we
already make things bearable for people on Windows; Araxis is no worse,
right?
* rs/maint-grep-word-regexp-fix (Sat May 23 13:45:26 2009 +0200) 1 commit
+ grep: fix word-regexp at the beginning of lines
* mm/apply-double-slash (Thu May 21 14:25:11 2009 +0200) 1 commit
+ apply: handle filenames with double slashes better
* bc/old-iconv (Fri May 22 18:47:06 2009 -0500) 10 commits
+ t8005: convert CP1251 character set to ISO8859-5
+ t8005: use more portable character encoding names
+ t5100: use ancient encoding syntax for backwards compatibility
+ t9301: use ISO8859-1 rather than ISO-8859-1
+ t3901: Use ISO8859-1 instead of ISO-8859-1 for backward
compatibility
+ t3901: avoid negation on right hand side of '|'
+ builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as
fallback encoding
+ builtin-mailinfo.c: compare character encodings case insensitively
+ Use 'UTF-8' rather than 'utf-8' everywhere for backward
compatibility
+ t3900: use ancient iconv names for backward compatibility
* sb/show-branch-parse-options (Thu May 21 00:33:18 2009 -0700) 3 commits
+ show-branch: migrate to parse-options API
+ Merge branch 'mh/show-branch-color' into sb/show-branch-parse-
options
+ parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated
argh's
* sb/maint-1.6.2-opt-filename-fix (Sat May 23 11:53:11 2009 -0700) 2 commits
+ apply, fmt-merge-msg: use relative filenames
+ commit: -F overrides -t
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
- Avoid "diff-index --cached" optimization under --find-copies-
harder
- Optimize "diff-index --cached" using cache-tree
- t4007: modernize the style
- cache-tree.c::cache_tree_find(): simplify inernal API
- write-tree --ignore-cache-tree
* jc/solaris-0811 (Fri May 22 22:55:31 2009 -0700) 2 commits
- OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
- Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
- Change xdl_merge to generate output even for null merges
- t6023: merge-file fails to output anything for a degenerate merge
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
- diff: Rename QUIET internal option to QUICK
- diff: change semantics of "ignore whitespace" options
----------------------------------------------------------------
[Graduated to "master"]
* cc/bisect (Sat May 9 17:55:47 2009 +0200) 20 commits
+ bisect: make "git bisect" use new "--next-all" bisect-helper
function
+ bisect: add "check_good_are_ancestors_of_bad" function
+ bisect: implement the "check_merge_bases" function
+ bisect: automatically sort sha1_array if needed when looking it up
+ bisect: make skipped array functions more generic
+ bisect: remove too much function nesting
+ bisect: use new "struct argv_array" to prepare argv for
"setup_revisions"
+ bisect: store good revisions in a "sha1_array"
+ bisect: implement "rev_argv_push" to fill an argv with revs
+ bisect: use "sha1_array" to store skipped revisions
+ am: simplify "sq" function by using "git rev-parse --sq-quote"
+ bisect: use "git rev-parse --sq-quote" instead of a custom "sq"
function
+ rev-parse: add --sq-quote to shell quote arguments
+ rev-list: remove stringed output flag from "show_bisect_vars"
+ bisect--helper: remove "--next-vars" option as it is now useless
+ bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
+ bisect--helper: add "--next-exit" to output bisect results
+ bisect: move common bisect functionality to "bisect_common"
+ rev-list: refactor printing bisect vars
+ rev-list: make "estimate_bisect_steps" non static
Rewriting major part of "git-bisect" shell script continues. The patches
seem to be reasonably clean.
* fc/decorate-tag (Thu May 14 00:32:53 2009 +0300) 2 commits
+ Prettify log decorations even more
+ Change prettify_ref to prettify_refname
* mg/track (Mon May 11 16:42:54 2009 +0200) 2 commits
+ Fix behavior with non-commit upstream references
+ Test tracking of non-commit upstreams
* jn/gitweb-cleanup (Mon May 11 19:45:11 2009 +0200) 8 commits
+ gitweb: Remove unused $hash_base parameter from
normalize_link_target
+ gitweb: Simplify snapshot format detection logic in
evaluate_path_info
+ gitweb: Use capturing parentheses only when you intend to capture
+ gitweb: Replace wrongly added tabs with spaces
+ gitweb: Use block form of map/grep in a few cases more
+ gitweb: Always use three argument form of open
+ gitweb: Always use three argument form of open
+ gitweb: Do not use bareword filehandles
* js/maint-no-ln-across-libexec-and-bin (Mon May 11 13:02:18 2009 +0200) 1 commit
+ Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
* tp/send-email-from-config (Tue May 12 15:48:56 2009 -0700) 1 commit
+ send-email: Add config option for sender address
* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit
+ fetch: Strip usernames from url's before storing them
* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit
+ graph API: Use horizontal lines for more compact graphs
* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits
+ bash completion: show-branch color support
+ show-branch: color the commit status signs
* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit
+ diff: do not color --stat output like patch context
* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits
+ t3702: fix reliance on SHELL_PATH being '/bin/sh'
+ git-add: introduce --edit (to edit the diff vs. the index)
* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit
+ add: don't complain when adding empty project root
* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits
+ print unlink(2) errno in copy_or_link_directory
+ replace direct calls to unlink(2) with unlink_or_warn
+ Introduce an unlink(2) wrapper which gives warning if unlink
failed
* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit
+ Clarify kind of conflict in merge-one-file helper
* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit
+ allow OFS_DELTA objects during a push
* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit
+ Add --reference option to git submodule.
* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits
+ Git.pm: Always set Repository to absolute path if autodetecting
+ Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits
+ grep: use parseopt
+ grep: remove global variable builtin_grep
+ parseopt: add PARSE_OPT_NODASH
+ parseopt: add OPT_NUMBER_CALLBACK
+ parseopt: add OPT_NEGBIT
* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits
+ parseopt: add OPT_NEGBIT
+ parseopt: add OPT_NEGBIT
* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit
+ fix GIT_TRACE segfault with shell-quoted aliases
* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit
+ Extend sample update hook, disable modifying of existing tags
* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit
+ Disallow '\' in ref names
* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit
+ merge-recursive: never leave index unmerged while recursing
* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit
+ format-patch let -k override a config-specified format.numbered
* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits
+ Teach 'git checkout' to preload the index contents
+ Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit
+ mergetool--lib: specialize diff options for emerge and ecmerge
----------------------------------------------------------------
[Will merge to "master" soon]
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
+ send-email: Remove superfluous `my $editor = ...'
+ send-email: 'References:' should only reference what is sent
+ send-email: Handle "GIT:" rather than "GIT: " during --compose
+ Docs: send-email: --smtp-server-port can take symbolic ports
+ Docs: send-email: Refer to CONFIGURATION section for
sendemail.multiedit
+ Docs: send-email: Put options back into alphabetical order
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
+ git-submodule: add support for --rebase.
* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits
+ bisect: check ancestors without forking a "git rev-list" process
+ commit: add function to unparse a commit and its parents
+ bisect: rework some rev related functions to make them more
reusable
----------------------------------------------------------------
[Stalled and may need help and prodding to go forward]
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
- Add initial support for pathname conversion to UTF-8
- read_directory(): infrastructure for pathname character set
conversion
- Add 'fill_directory()' helper function for directory traversal
Before adding the real "conversion", this needs a few real fixups, I
think. For example there is one hardcoded array that is used without
bounds check.
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
- Fix for a merge where a branch has an F->D transition
- Add a reminder test case for a merge with F/D transition
Although the reported breakage is covered with the patch, Alex feels the
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
may be long overdue but seems to be a hard problem.
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
- blame.c: start libifying the blame infrastructure
A few minor point remains in this initial one. I hate to do these minor
fix-ups myself, but I may end up doing so...
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
- Allow --date=local --date=other-format to work as expected
The one I posted had a few corner-case bugs that was caught with the test
suite; this one has them fixed. People did not like the UI so it is kept
out of 'next'
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
- git-merge-file: allow converting the results for the work tree
This is a feature waiting for a user.
We did not give scripted Porcelains a way to say "this temporary file I am
using for merging is for this path, so use the core.autocrlf and attributes
rules for that final path". Instead, merge-file simply wrote out the
data in the canonical repository representation.
rerere has the same issue, but it is a lot worse. It reads the three
files (preimage, postimage and thisimage) from the work tree in the work
tree representation, merges them without converting them to the canonical
representation first but inserts the conflict markers with the canonical
representation and writes the resulting mess out. It needs to be fixed to
read with convert_to_git(), merge them while they are still in the
canonical representation and possibly add conflict markers, and then write
the results out after convert_to_working_tree(). It also needs to write
in binary mode as well.
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
- Add option for using a foreign VCS
- Document details of transport function APIs
- Allow late reporting of fetched hashes
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
- t/t9600: remove exit after test_done
- cvsimport: extend testcase about patchset order to contain
branches
- cvsimport: add test illustrating a bug in cvsps
- Add a test of "git cvsimport"'s handling of tags and branches
- Add some tests of git-cvsimport's handling of vendor branches
- Test contents of entire cvsimported "master" tree contents
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
- Start a library for cvsimport-related tests
----------------------------------------------------------------
[Actively cooking]
* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits
+ mktree: validate entry type in input
+ mktree --batch: build more than one tree object
+ mktree --missing: updated usage message and man page
+ mktree --missing: allow missing objects
+ t1010: add mktree test
+ mktree: do not barf on a submodule commit
+ builtin-mktree.c: use a helper function to handle one line of
input
+ mktree: use parse-options
+ build-in git-mktree
* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits
+ Revert "git-add--interactive: remove hunk coalescing"
+ Splitting a hunk that adds a line at the top fails in "add -p"
* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit
+ format-patch: migrate to parse-options API
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
* rc/http-push (Mon May 18 16:14:24 2009 +0800) 15 commits
- http*: add helper methods for fetching objects (loose)
- http*: add helper methods for fetching objects/info/packs
- http*: add helper methods for fetching packs
- http*: add fetch_http_pack_index
- http: create function end_url_with_slash
- http*: move common variables and macros to http.[ch]
- http-push: do not SEGV after fetching a bad pack idx file
- http*: copy string returned by sha1_to_hex
- http-walker: verify remote packs
- http-push, http-walker: style fixes
- t5550-http-fetch: test fetching of packed objects
- http-push: fix missing "#ifdef USE_CURL_MULTI" around
"is_running_queue"
- http-push: send out fetch requests on queue
- t5540-http-push: test fetching of packed objects
- t5540-http-push: test fetching of loose objects
This is not the re-rolled 18-patch series we discussed yesterday.
* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
- Documentation: add documentation for "git replace"
- Add git-replace to .gitignore
- builtin-replace: use "usage_msg_opt" to give better error messages
- parse-options: add new function "usage_msg_opt"
- builtin-replace: teach "git replace" to actually replace
- Add new "git replace" command
- environment: add global variable to disable replacement
- mktag: call "check_sha1_signature" with the replacement sha1
- replace_object: add a test case
- object: call "check_sha1_signature" with the replacement sha1
- sha1_file: add a "read_sha1_file_repl" function
- replace_object: add mechanism to replace objects found in
"refs/replace/"
- refs: add a "for_each_replace_ref" function
I suspect an attempt to replace an object that is directly listed on the
command line would not work very well with this series.
----------------------------------------------------------------
[On Hold]
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
- receive-pack: default receive.denyDeleteCurrent to refuse
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
- Refuse updating the current branch in a non-bare repository via
push
These are for 1.7.0, but the messages when they trigger together may need
to be rethought.
^ permalink raw reply [relevance 3%]
* [ANNOUNCE] GIT 1.6.3.rc4
@ 2009-05-03 21:59 2% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2009-05-03 21:59 UTC (permalink / raw)
To: git
A release candidate GIT 1.6.3.rc4 is available at the usual places
for testing:
http://www.kernel.org/pub/software/scm/git/
git-1.6.3.rc4.tar.{gz,bz2} (source tarball)
git-htmldocs-1.6.3.rc4.tar.{gz,bz2} (preformatted docs)
git-manpages-1.6.3.rc4.tar.{gz,bz2} (preformatted docs)
The RPM binary packages for a few architectures are found in:
testing/git-*-1.6.3.rc4-1.fc9.$arch.rpm (RPM)
This is hopefully the final rc before the real thing; it includes the
updates to git-gui and gitk.
----------------------------------------------------------------
Changes since v1.6.3-rc3 are as follows:
Alex Riesen (3):
git-gui: Update Russian translation
improve error message in config.c
gitk: Add Russian translation
Alexander Gavrilov (3):
git-gui: Fix post-commit status with subject in non-locale encoding
git-gui: Avoid an infinite rescan loop in handle_empty_diff.
git-gui: Support more git version notations.
Allan Caffee (2):
builtin-merge: fix a typo in an error message
Documentation: fix a grammatical error in api-builtin.txt
Benjamin Kramer (1):
daemon.c: fix segfault on OS X
Christian Stimming (1):
gitk: Mark forgotten string for translation
Daniel A. Steffen (2):
gitk: Fixes for Mac OS X TkAqua
git-gui: Fixes for Mac OS X TkAqua
Eric Blake (2):
Makefile: installing git in cygwin 1.7.0
doc: consistently use ASCIIDOC_EXTRA
Felipe Contreras (2):
git config: error when editing a repo config and not being in one
Fix a bunch of pointer declarations (codestyle)
Ferry Huberts (1):
git-gui: Ensure consistent usage of mergetool.keepBackup
Giuseppe Bilotta (1):
gitk: Provide a window icon if possible
Jeff King (1):
Makefile: fix NO_PERL bug with gitweb
Jens Lehmann (4):
git-gui: Fix merge conflict display error when filename contains spaces
git-gui: When calling post-commit hook wrong variable was cleared.
git-gui: run post-checkout hook on checkout
git-gui: run post-checkout hook after clone
Joerg Bornemann (1):
git-gui: fix use of undeclared variable diff_empty_count
Johannes Schindelin (2):
t5701: do not get stuck in empty-push/
Rename core.unreliableHardlinks to core.createObject
Johannes Sixt (1):
prune-packed: advanced progress even for non-existing fan-out directories
Junio C Hamano (3):
diff -c -p: do not die on submodules
merge-recursive: do not die on a conflicting submodule
GIT 1.6.3-rc4
Linus Torvalds (1):
grep: fix segfault when "git grep '('" is given
Mark Drago (1):
Add semicolon to curly brace group in main Makefile
Markus Heidelberg (5):
git-gui: don't hide the Browse button when resizing the repo chooser
git-gui: fix deleting from the context menu with empty selection
git-gui: use `git --html-path` to get the location of installed HTML docs
git-gui (Win): make "Explore Working Copy" more robust
git-gui (Win): make starting via "Git GUI Here" on .git/ possible
Michele Ballabio (2):
gitk: Mark some more strings for translation
gitk: Map KP_Divide to focus the search box
Pat Thoyts (4):
gitk: Handle blobs containing a DOS end-of-file marker
gitk: Remember and restore the window state with the geometry
gitk: Handle external diff tool with spaces in the path
gitk: Avoid crash if closed while reading references
Patrick Welche (1):
NetBSD compilation fix
Paul Mackerras (4):
gitk: Add a way to mark a commit, plus a "find descendant" command
gitk: Add a command to compare two strings of commits
gitk: Make .gitk a hidden file under windows
gitk: Fix compare-commits function when we have local changes
Phil Lawrence (1):
Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
René Scharfe (1):
ctype.c: fix typo in comment
Sam Hocevar (2):
git-gui: various French translation fixes
git-gui: minor spelling fix and string factorisation.
Sam Vilain (1):
SubmittingPatches: itemize and reflect upon well written changes
Stephen Boyd (1):
gitk: Provide a 32x32 window icon based on the git logo
Uwe Kleine-König (1):
parseopt: fix documentation for --keep-dashdash
^ permalink raw reply [relevance 2%]
* What's in git.git (Apr 2009, #02; Wed, 29)
@ 2009-04-30 5:33 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2009-04-30 5:33 UTC (permalink / raw)
To: git
It's been a while since I sent the "What's in" report. Hopefully we can
do an -rc4 this weekend and then 1.6.3 final next week.
* The 'maint' branch has these fixes since 1.6.2.3
Allan Caffee (2):
builtin-merge: fix a typo in an error message
Documentation: fix a grammatical error in api-builtin.txt
Björn Steinbrink (1):
tree_entry_interesting: a pathspec only matches at directory boundary
Clemens Buchacher (3):
add tests for merging with submodules
update cache for conflicting submodule entries
simplify output of conflicting merge
Erik Faye-Lund (4):
test-suite: adding a test for fast-export with tag variants
builtin-fast-export.c: turn error into warning
builtin-fast-export.c: fix crash on tagged trees
builtin-fast-export.c: handle nested tags
Frank Lichtenheld (2):
init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
gitcvs-migration: Link to git-cvsimport documentation
Jeff King (2):
doc/gitattributes: clarify location of config text
add-interactive: refactor mode hunk handling
Johan Herland (1):
Update docs on behaviour of 'core.sharedRepository' and 'git init
--shared'
Johannes Schindelin (2):
Fix 'git checkout <submodule>' to update the index
Fix off-by-one in read_tree_recursive
Johannes Sixt (1):
t1301-shared-repo: fix forced modes test
Junio C Hamano (4):
match_tree_entry(): a pathspec only matches at directory boundaries
Describe fixes since 1.6.2.3
GIT 1.6.2.4
diff -c -p: do not die on submodules
Junio Hamano (1):
Speed up reflog pruning of unreachable commits
Linus Torvalds (2):
Clean up reflog unreachability pruning decision
grep: fix segfault when "git grep '('" is given
Markus Heidelberg (2):
doc/git-daemon: add missing arguments to options
doc/git-daemon: add missing arguments to max-connections option
Matthieu Moy (2):
git add -p: new "quit" command at the prompt.
Update git-add.txt according to the new possibilities of 'git add -p'.
Nguyễn Thái Ngọc Duy (1):
Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
Paul Bolle (1):
imap-send: use correct configuration variable in documentation
Stephen Boyd (1):
test-genrandom: Add newline to usage string
Thomas Jarosch (1):
Fix buffer overflow in config parser
Ulrich Windl (1):
git-apply: fix option description
* The 'master' branch has these since 1.6.3-rc0
in addition to the above.
Alex Riesen (3):
Wait for git diff to finish in git difftool
Explain seemingly pointless use of system in difftool
improve error message in config.c
Allan Caffee (4):
graph API: Added logic for colored edges
t4202-log: extend test coverage of graphing
graph API: fix extra space during pre_commit_line state
graph API: fix a bug in the rendering of octopus merges
Ben Jackson (1):
Work around ash "alternate value" expansion bug
Benjamin Kramer (2):
connect: replace inet_ntop with getnameinfo
daemon.c: fix segfault on OS X
Bert Wesarg (3):
shorten_unambiguous_ref(): add strict mode
for-each-ref: utilize core.warnAmbiguousRefs for :short-format
rev-parse: --abbrev-ref option to shorten ref name
Bill Pemberton (1):
Add parsing of elm aliases to git-send-email
Brandon Casey (2):
t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
t7700-repack: repack -a now works properly, expect success from test
Dan Loewenherz (1):
Convert to use quiet option when available
David Aguilar (11):
difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
difftool: remove the backup file feature
difftool: use perl built-ins when testing for msys
difftool: add a -y shortcut for --no-prompt
difftool: move 'git-difftool' out of contrib
difftool: add various git-difftool tests
difftool: add support for a difftool.prompt config variable
bash completion: add git-difftool
mergetool: use $( ... ) instead of `backticks`
difftool/mergetool: refactor commands to use git-mergetool--lib
mergetool--lib: simplify API usage by removing more global variables
Eric Blake (2):
Makefile: installing git in cygwin 1.7.0
doc: consistently use ASCIIDOC_EXTRA
Erik Broes (1):
git-shell: Add 'git-upload-archive' to allowed commands.
Felipe Contreras (1):
git config: error when editing a repo config and not being in one
Ferry Huberts (1):
Fix misspelled mergetool.keepBackup
Holger Weiß (1):
gitweb: Fix snapshots requested via PATH_INFO
Jeff King (8):
doc: clarify --no-track option
doc: refer to tracking configuration as "upstream"
doc/checkout: refer to git-branch(1) as appropriate
doc/checkout: split checkout and branch creation in synopsis
docs/checkout: clarify what "non-branch" means
add-interactive: refactor mode hunk handling
t7800: respect NO_PERL
Makefile: fix NO_PERL bug with gitweb
Johannes Schindelin (3):
Add an option not to use link(src, dest) && unlink(src) when that is
unreliable
t5701: do not get stuck in empty-push/
Rename core.unreliableHardlinks to core.createObject
Johannes Sixt (5):
Windows: Work around intermittent failures in mingw_rename
Windows: Skip fstat/lstat optimization in write_entry()
builtin-help: silently tolerate unknown keys
remote.c: do not trigger remote.<name>.<var> codepath for two-level names
prune-packed: advanced progress even for non-existing fan-out directories
Junio C Hamano (11):
gitignore git-bisect--helper
unpack-trees: do not muck with attributes when we are not checking out
Update draft release notes to 1.6.3
read-tree A B: do not corrupt cache-tree
Move prime_cache_tree() to cache-tree.c
read-tree -m A B: prime cache-tree from the switched-to tree
checkout branch: prime cache-tree fully
Revert "stat_tracking_info(): only count real commits"
Makefile: ignore perl/ subdirectory under NO_PERL
GIT 1.6.3-rc2
merge-recursive: do not die on a conflicting submodule
Linus Torvalds (4):
Allow users to un-configure rename detection
process_{tree,blob}: show objects without buffering
show_object(): push path_name() call further down
t4202: fix typo
Mark Drago (1):
Add semicolon to curly brace group in main Makefile
Markus Heidelberg (4):
doc/merge-config: list ecmerge as a built-in merge tool
git-mergetool/difftool: make (g)vimdiff workable under Windows
git-mergetool: add new merge tool TortoiseMerge
grep: don't support "grep.color"-like config options
Matthieu Moy (3):
git add -p: new "quit" command at the prompt.
Update git-add.txt according to the new possibilities of 'git add -p'.
clone: add test for push on an empty clone.
Michael J Gruber (3):
remote.c: use shorten_unambiguous_ref
test-lib.sh: Help test_create_repo() find the templates dir
Fix more typos/spelling in comments
Michał Kiedrowicz (6):
tests: test applying criss-cross rename patch
builtin-apply: keep information about files to be deleted
Documentation: boolean value may be given by on/off
tests: test applying criss-cross rename patch
builtin-apply: keep information about files to be deleted
tests: make test-apply-criss-cross-rename more robust
Mike Ralphson (3):
builtin-remote: fix typo in option description
Documentation: fix typos / spelling mistakes
Fix typos / spelling in comments
Nanako Shiraishi (1):
git-am: teach git-am to apply a patch to an unborn branch
Nguyễn Thái Ngọc Duy (3):
get_local_heads(): do not return random pointer if there is no head
attr: add GIT_ATTR_INDEX "direction"
archive: do not read .gitattributes in working directory
Nicolas Pitre (1):
progress bar: round to the nearest instead of truncating down
Patrick Welche (1):
NetBSD compilation fix
Pierre Habouzit (1):
hook/update: example of how to prevent branch creation
René Scharfe (2):
archive tests: do not use .gitattributes in working directory
archive test: attributes
Sam Vilain (1):
SubmittingPatches: itemize and reflect upon well written changes
Sebastian Pipping (1):
difftool/mergetool: add diffuse as merge and diff tool
Sitaram Chamarty (1):
Remove obsolete bug warning in man git-update-server-info
Stephen Boyd (7):
config.txt: add missing format.{subjectprefix,cc,attach} variables
Documentation: use lowercase for shallow and deep threading
git-show-branch.txt: cleanup example description
git-format-patch.txt: general rewordings and cleanups
config.txt: add missing 'the's and make words plural
config.txt: clarify sentences in the configuration and syntax sections
config.txt: Make configuration paragraph more consistent
Uwe Kleine-König (1):
parseopt: fix documentation for --keep-dashdash
Wesley J. Landaker (4):
Documentation: git-svn: fix spurious bolding that mangles the output
Documentation: git-svn: fix a grammatical error without awkwardness
Documentation: git-clean: fix minor grammatical errors
Documentation: git-clean: make description more readable
Wincent Colaiuta (1):
git add -p: add missing "q" to patch prompt
^ permalink raw reply [relevance 3%]
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-27 15:41 2% ` Allan Caffee
@ 2009-04-27 16:37 2% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2009-04-27 16:37 UTC (permalink / raw)
To: Allan Caffee; +Cc: Miklos Vajna, git
Allan Caffee <allan.caffee@gmail.com> writes:
> Hello Junio,
>
> On Tue, 14 Apr 2009, Miklos Vajna wrote:
>
>> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:
>> > - die("Could open %s for writing", git_path("MERGE_MSG"));
>> > + die("Could not open %s for writing", git_path("MERGE_MSG"));
>>
>> Acked-by: Miklos Vajna <vmiklos@frugalware.org>
>
> Is this one ready for maint? (The issue dates back to 1c7b76be.)
Indeed it is; I do not know how this one slipped.
Thanks.
^ permalink raw reply [relevance 2%]
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 23:12 2% ` Miklos Vajna
@ 2009-04-27 15:41 2% ` Allan Caffee
2009-04-27 16:37 2% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Allan Caffee @ 2009-04-27 15:41 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Miklos Vajna
Hello Junio,
On Tue, 14 Apr 2009, Miklos Vajna wrote:
> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:
> > - die("Could open %s for writing", git_path("MERGE_MSG"));
> > + die("Could not open %s for writing", git_path("MERGE_MSG"));
>
> Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Is this one ready for maint? (The issue dates back to 1c7b76be.)
^ permalink raw reply [relevance 2%]
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 18:10 2% [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
2009-04-13 21:41 2% ` Allan Caffee
@ 2009-04-13 23:12 2% ` Miklos Vajna
2009-04-27 15:41 2% ` Allan Caffee
1 sibling, 1 reply; 58+ results
From: Miklos Vajna @ 2009-04-13 23:12 UTC (permalink / raw)
To: Allan Caffee; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:
> - die("Could open %s for writing", git_path("MERGE_MSG"));
> + die("Could not open %s for writing", git_path("MERGE_MSG"));
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Thanks.
PS: Please use 'unset followup_to' when sending messages to the git
list, see
http://thread.gmane.org/gmane.comp.version-control.git/83140/focus=83234.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 18:10 2% [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
@ 2009-04-13 21:41 2% ` Allan Caffee
2009-04-13 23:12 2% ` Miklos Vajna
1 sibling, 0 replies; 58+ results
From: Allan Caffee @ 2009-04-13 21:41 UTC (permalink / raw)
To: git
On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee <allan.caffee@gmail.com> wrote:
>
> Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
> ---
> builtin-merge.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin-merge.c b/builtin-merge.c
> index 6a51823..0b58e5e 100644
> --- a/builtin-merge.c
> +++ b/builtin-merge.c
> @@ -764,7 +764,7 @@ static int suggest_conflicts(void)
>
> fp = fopen(git_path("MERGE_MSG"), "a");
> if (!fp)
> - die("Could open %s for writing", git_path("MERGE_MSG"));
> + die("Could not open %s for writing", git_path("MERGE_MSG"));
On second thought this commit message should probably read something more like:
builtin-merge.c: correct error message for failed open
Since the original message is actually wrong.
^ permalink raw reply [relevance 2%]
* [PATCH] builtin-merge: fix a typo in an error message
@ 2009-04-13 18:10 2% Allan Caffee
2009-04-13 21:41 2% ` Allan Caffee
2009-04-13 23:12 2% ` Miklos Vajna
0 siblings, 2 replies; 58+ results
From: Allan Caffee @ 2009-04-13 18:10 UTC (permalink / raw)
To: git
Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
---
builtin-merge.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c
index 6a51823..0b58e5e 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -764,7 +764,7 @@ static int suggest_conflicts(void)
fp = fopen(git_path("MERGE_MSG"), "a");
if (!fp)
- die("Could open %s for writing", git_path("MERGE_MSG"));
+ die("Could not open %s for writing", git_path("MERGE_MSG"));
fprintf(fp, "\nConflicts:\n");
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
--
1.5.6.3
^ permalink raw reply related [relevance 2%]
* [ANNOUNCE] GIT 1.6.1.3
@ 2009-02-07 21:54 2% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2009-02-07 21:54 UTC (permalink / raw)
To: git; +Cc: linux-kernel
The latest maintenance release GIT 1.6.1.3 is available at the
usual places:
http://www.kernel.org/pub/software/scm/git/
git-1.6.1.3.tar.{gz,bz2} (source tarball)
git-htmldocs-1.6.1.3.tar.{gz,bz2} (preformatted docs)
git-manpages-1.6.1.3.tar.{gz,bz2} (preformatted docs)
The RPM binary packages for a few architectures are also provided
as courtesy.
RPMS/$arch/git-*-1.6.1.3-1.fc9.$arch.rpm (RPM)
GIT v1.6.1.3 Release Notes
==========================
Fixes since v1.6.1.2
--------------------
* "git diff --binary | git apply" pipeline did not work well when
a binary blob is changed to a symbolic link.
* Some combinations of -b/-w/--ignore-space-at-eol to "git diff" did
not work as expected.
* "git grep" did not pass the -I (ignore binary) option when
calling out an external grep program.
* "git log" and friends include HEAD to the set of starting points
when --all is given. This makes a difference when you are not
on any branch.
* "git mv" to move an untracked file to overwrite a tracked
contents misbehaved.
* "git merge -s octopus" with many potential merge bases did not
work correctly.
* RPM binary package installed the html manpages in a wrong place.
Also includes minor documentation fixes and updates.
----------------------------------------------------------------
Changes since v1.6.1.2 are as follows:
Anders Melchiorsen (2):
Documentation: more git push examples
Documentation: rework src/dst description in git push
David J. Mellor (1):
Fixed broken git help -w when installing from RPM
Guanqun Lu (2):
fix typo in Documentation
add test-dump-cache-tree in Makefile
Johannes Schindelin (2):
revision walker: include a detached HEAD in --all
apply: fix access to an uninitialized mode variable, found by valgrind
Junio C Hamano (6):
bundle: allow the same ref to be given more than once
Documentation: simplify refspec format description
diff.c: output correct index lines for a split diff
builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
grep: pass -I (ignore binary) down to external grep
GIT 1.6.1.3
Keith Cascio (2):
test more combinations of ignore-whitespace options to diff
Fix combined use of whitespace ignore options to diff
Linus Torvalds (1):
Wrap inflate and other zlib routines for better error reporting
Matthieu Moy (3):
Missing && in t/t7001.sh.
Add a testcase for "git mv -f" on untracked files.
builtin-mv.c: check for unversionned files before looking at the destination.
René Scharfe (1):
merge: fix out-of-bounds memory access
SZEDER Gábor (1):
Fix gitdir detection when in subdir of gitdir
Stefan Naewe (1):
urls.txt: document optional port specification in git URLS
William Pursell (1):
User-manual: "git stash <comment>" form is long gone
^ permalink raw reply [relevance 2%]
* What's in git.git (Feb 2009, #01; Sun, 01)
@ 2009-02-02 8:05 2% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2009-02-02 8:05 UTC (permalink / raw)
To: git
There are yet more fixes that have been cooking in next and then master
that have been merged to 'maint' in preparation for the next 1.6.1.X
maintenance release.
On the 'master' front, I think we are ready to plan for 1.6.2 release.
Tonight's "What's cooking" should be a pretty good guide for estimating
what will be in -rc0, in addition to what we already have in 'master'.
* The 'maint' branch has these fixes since the last announcement.
Björn Steinbrink (1):
Rename detection: Avoid repeated filespec population
Jeff King (1):
avoid 31-bit truncation in write_loose_object
Junio C Hamano (3):
ls-tree: add --full-tree option
Teach format-patch to handle output directory relative to cwd
GIT 1.6.1.2
Marcel M. Cary (1):
git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
Markus Heidelberg (2):
git-commit: color status output when color.ui is set
git-status -v: color diff output when color.ui is set
Nanako Shiraishi (1):
Document git-ls-tree --full-tree
Nguyễn Thái Ngọc Duy (2):
grep: support --no-ext-grep to test builtin grep
grep: grep cache entries if they are "assume unchanged"
Nicolas Pitre (1):
objects to be pruned immediately don't have to be loosened
René Scharfe (1):
merge: fix out-of-bounds memory access
* The 'master' branch has these since the last announcement
in addition to the above.
Anders Melchiorsen (2):
Documentation: more git push examples
Documentation: rework src/dst description in git push
David Aguilar (1):
contrib/difftool: Don't repeat merge tool candidates
Giuseppe Bilotta (3):
gitweb: make static files accessible with PATH_INFO
gitweb: webserver config for PATH_INFO
gitweb: align comments to code
Jake Goulding (3):
Make opt_parse_with_commit() non-static
Make has_commit() non-static
git-tag: Add --contains option
Jakub Narebski (1):
gitweb: Update README that gitweb works better with PATH_INFO
Jeff King (5):
diff: refactor tempfile cleanup handling
chain kill signals for cleanup functions
refactor signal handling for cleanup functions
pager: do wait_for_pager on signal death
t0005: use SIGTERM for sigchain test
Johannes Gilger (1):
mergetool: Don't repeat merge tool candidates
Johannes Schindelin (8):
Fix submodule squashing into unrelated commit
t3404 & t3411: undo copy&paste
lib-rebase.sh: Document what set_fake_editor() does
test-lib.sh: introduce test_commit() and test_merge() helpers
Simplify t3410
Simplify t3411
Simplify t3412
Fix 'git diff --no-index' with a non-existing symlink target
Johannes Sixt (1):
Windows: Fix signal numbers
Junio C Hamano (6):
Documentation: simplify refspec format description
diff.c: output correct index lines for a split diff
revision traversal: allow UNINTERESTING objects to be missing
rebase -i squashes submodule changes into unrelated commit
builtin-apply.c: do not set bogus mode in check_preimage() for deleted
path
Update draft release notes to 1.6.2
Kirill Smelkov (5):
mailinfo: correctly handle multiline 'Subject:' header
mailinfo: 'From:' header should be unfold as well
mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U
Thor)'
mailinfo: tests for RFC2047 examples
mailinfo: cleanup extra spaces for complex 'From:'
Markus Heidelberg (1):
contrib/difftool: add support for Kompare
Michele Ballabio (1):
git-shortlog.txt: fix example about .mailmap
Stefan Karpinski (2):
git-cvsserver: handle CVS 'noop' command.
git-cvsserver: run post-update hook *after* update.
Steffen Prohaska (6):
Move computation of absolute paths from Makefile to runtime (in
preparation for RUNTIME_PREFIX)
git_extract_argv0_path(): Move check for valid argv0 from caller to
callee
Add calls to git_extract_argv0_path() in programs that call git_config_*
Modify setup_path() to only add git_exec_path() to PATH
Compute prefix at runtime if RUNTIME_PREFIX is set
Windows: Revert to default paths and convert them by RUNTIME_PREFIX
Steve Haslam (1):
Refactor git_set_argv0_path() to git_extract_argv0_path()
Thomas Rast (2):
t3412: clean up GIT_EDITOR usage
t3412: use log|name-rev instead of log --graph
^ permalink raw reply [relevance 2%]
* [PATCH] merge: fix out-of-bounds memory access
@ 2009-01-31 14:39 2% ` René Scharfe
0 siblings, 0 replies; 58+ results
From: René Scharfe @ 2009-01-31 14:39 UTC (permalink / raw)
To: Ingo Molnar
Cc: Junio C Hamano, H. Peter Anvin, Git Mailing List, Daniel Barkalow
The following on top of master lets git finish the merge without segfault
(reporting a merge conflict) and valgrind doesn't find an more memory
errors here. Can you confirm that, Ingo?
-- 8< --
The parameter n of unpack_callback() can have a value of up to
MAX_UNPACK_TREES. The check at the top of unpack_trees() (its only
(indirect) caller) makes sure it cannot exceed this limit.
unpack_callback() passes it and the array src to unpack_nondirectories(),
which has this loop:
for (i = 0; i < n; i++) {
/* ... */
src[i + o->merge] = o->df_conflict_entry;
o->merge can be 0 or 1, so unpack_nondirectories() potentially accesses
the array src at index MAX_UNPACK_TREES. This patch makes it big enough.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
---
unpack-trees.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 16bc2ca..e547282 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -240,8 +240,11 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, con
return ce;
}
-static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmask, struct cache_entry *src[5],
- const struct name_entry *names, const struct traverse_info *info)
+static int unpack_nondirectories(int n, unsigned long mask,
+ unsigned long dirmask,
+ struct cache_entry **src,
+ const struct name_entry *names,
+ const struct traverse_info *info)
{
int i;
struct unpack_trees_options *o = info->data;
@@ -291,7 +294,7 @@ static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmas
static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
{
- struct cache_entry *src[5] = { NULL, };
+ struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
struct unpack_trees_options *o = info->data;
const struct name_entry *p = names;
--
1.6.1
^ permalink raw reply related [relevance 2%]
* Re: having to pull twice
2008-09-25 23:25 2% ` Miklos Vajna
@ 2008-09-27 14:16 0% ` Thomas Rast
0 siblings, 0 replies; 58+ results
From: Thomas Rast @ 2008-09-27 14:16 UTC (permalink / raw)
To: Miklos Vajna; +Cc: Shawn O. Pearce, Michael P. Soulier, git
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
Miklos Vajna wrote:
> On Thu, Sep 25, 2008 at 09:05:02AM +0200, Thomas Rast <trast@student.ethz.ch> wrote:
> > On the other hand, as near as I can tell this is a regression in
> > builtin-merge. Miklos, do you know if/how this can be fixed?
>
> I think Junio already fixed this in 446247d (merge: fix numerus bugs
> around "trivial merge" area, 2008-08-23), so 1.6.0.1 or 1.6.0.2 should
> not have this bug.
>
> Michael, could you please upgrade frm 1.6.0 and confirm your problem
> goes away?
That won't help. I decided this was a good opportunity to learn about
'git bisect run', and bisected it to 1c7b76b (Build in merge,
2008-07-07). This was with bad = 47a765d (pulled from Shawn's repo
this week) and good = v1.5.6.
In case you want to check my logic, the commands are below.
- Thomas
* Setup:
mkdir $temp_repo
cd $temp_repo
git init
echo foo > foo
git add foo
git commit -m initial
echo a > foo
git commit -m a foo
git checkout -b side HEAD^
echo b > foo
git commit -m b foo
git checkout master
* Bisection script:
-- 8< --
#!/bin/sh
rm -rf $temp_repo/{bin,libexec}
make -j3 prefix=$temp_repo install
PATH=$temp_repo/bin:$PATH
cd $temp_repo
touch foo
git merge side
test -f .git/MERGE_HEAD
s=$?
git reset --hard
if test $s != 0; then
echo did not work
exit 1
else
echo worked
exit 0
fi
-- >8 --
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [relevance 0%]
* Re: having to pull twice
@ 2008-09-25 23:25 2% ` Miklos Vajna
2008-09-27 14:16 0% ` Thomas Rast
0 siblings, 1 reply; 58+ results
From: Miklos Vajna @ 2008-09-25 23:25 UTC (permalink / raw)
To: Thomas Rast; +Cc: Shawn O. Pearce, Michael P. Soulier, git
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
On Thu, Sep 25, 2008 at 09:05:02AM +0200, Thomas Rast <trast@student.ethz.ch> wrote:
> On the other hand, as near as I can tell this is a regression in
> builtin-merge. Miklos, do you know if/how this can be fixed?
I think Junio already fixed this in 446247d (merge: fix numerus bugs
around "trivial merge" area, 2008-08-23), so 1.6.0.1 or 1.6.0.2 should
not have this bug.
Michael, could you please upgrade frm 1.6.0 and confirm your problem
goes away?
Thanks.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [relevance 2%]
* What's in git.git (Aug 2008, #07; Wed, 27)
@ 2008-08-28 3:01 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2008-08-28 3:01 UTC (permalink / raw)
To: git
Handful fixes went to 1.6.0.1 and then a few more are on 'maint'.
On the 'master' front, among other things:
- "git cherry-pick" can reuse earlier conflict resolution.
- "git merge" can use a custom strategy (if you write one).
- "git-shell" was broken and then fixed.
- "git submodule sync" is a new subcommand.
* The 'maint' branch has these fixes since the last announcement.
Alexander Gavrilov (1):
Respect core.autocrlf in combined diff
Jeff King (1):
Fix "git log -i --grep"
Jonathan Nieder (2):
Documentation: clarify pager.<cmd> configuration
Documentation: clarify pager configuration
Junio C Hamano (3):
merge: fix numerous bugs around "trivial merge" area
GIT 1.6.0.1
ctype.c: protect tiny C preprocessor constants
Linus Torvalds (1):
index-pack: be careful after fixing up the header/footer
Miklos Vajna (1):
Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
Nguyễn Thái Ngọc Duy (1):
index-pack: setup git repository
Ramsay Allan Jones (2):
Fix a warning (on cygwin) to allow -Werror
Suppress some bash redirection error messages
Simon Hausmann (1):
Clean up the git-p4 documentation
* The 'master' branch has these since the last announcement
in addition to the above.
Abhijit Menon-Sen (1):
Make cherry-pick use rerere for conflict resolution.
Andreas Färber (1):
Makefile: always provide a fallback when hardlinks fail
David Aguilar (1):
git-submodule: add "sync" command
Gustaf Hendeby (1):
Update .gitignore to ignore git-help
Jeff King (1):
format-patch: use default diff format even with patch options
Junio C Hamano (7):
builtin-add.c: restructure the code for maintainability
builtin-add.c: optimize -A option and "git add ."
shell: do not play duplicated definition games to shrink the executable
Build-in "git-shell"
Fix "git-merge -s bogo" help text
t7606: fix custom merge test
Revert "Build-in "git-shell""
Mark Levedahl (3):
git-submodule.sh - Remove trailing / from URL if found
git-submodule.sh - Remove trailing / from URL if found
git-submodule - Use "get_default_remote" from git-parse-remote
Miklos Vajna (6):
builtin-help: make some internal functions available to other builtins
builtin-merge: allow using a custom strategy
Add a new test for using a custom merge strategy
Add a second testcase for handling invalid strategies in git-merge
builtin-help: always load_command_list() in cmd_help()
Builtin git-help.
Nicolas Pitre (1):
discard revindex data when pack list changes
Simon Hausmann (1):
Make it possible to abort the submission of a change to Perforce
Tommi Virtanen (1):
Install git-shell in bindir, too
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Aug 2008, #08; Wed, 27)
@ 2008-08-28 2:54 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2008-08-28 2:54 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 topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
----------------------------------------------------------------
[New Topics]
* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
- Teach git.el to mark/unmark files by regexp
- git.el: Diff only file at point by default
With my limited elisp expertise I did not see anything obviously wrong
with these two patches from David Kågedal and David Christensen.
* tl/p4 (Thu Aug 28 00:36:12 2008 +0200) 1 commit
- git-p4: Fix checkout bug when using --import-local.
A fix forked from 'maint' waiting for an Ack.
----------------------------------------------------------------
[Stalled -- Needs Action to Proceed (or to be dropped)]
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
. Use xdiff caching to improve git blame performance
. Allow xdiff machinery to cache hash results for a file
. Always initialize xpparam_t to 0
. Bypass textual patch generation and parsing in git blame
. Allow alternate "low-level" emit function from xdl_diff
Réne had good comments on how the callback should be structured.
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
- discard_cache: reset lazy name_hash bit
I spotted this by accident while working on something unrelated.
When a program calls discard_cache() to read the index again, we do not
properly re-initialize the name_hash structure that is used by the case
insensitivitly logic. This _might_ improve issues people may be having on
case insensitive filesystems. I dunno.
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
- configure: auto detect dynamic library path switches
- Makefile: Allow CC_LD_DYNPATH to be overriden
Needs success reports from people who do use user-defined dynamic library
path when they build their "git" before this series can go anywhere.
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
- date/time: do not get confused by fractional seconds
Linus hints further enhancements as "the right way", so let's see if
somebody else steps up and tries it before merging this to 'next'.
----------------------------------------------------------------
[Actively Cooking]
* sb/daemon (Sun Aug 24 13:27:10 2008 -0700) 5 commits
+ daemon.c: minor style fixup
+ git-daemon: rewrite kindergarden, new option --max-connections
+ git-daemon: Simplify dead-children reaping logic
+ git-daemon: use LOG_PID, simplify logging code
+ git-daemon: call logerror() instead of error()
I re-reviewed the changes and they look quite sane. Hopefully be moved to
'master' soonish.
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 3 commits
- git-add --intent-to-add (-N)
- cached_object: learn empty blob
- sha1_object_info(): pay attention to cached objects
Teaches "git add" to record only the intent to add a path later.
I think this is better done without the hardcoded empty blob object.
* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits
+ bisect: only check merge bases when needed
+ bisect: test merge base if good rev is not an ancestor of bad rev
* mv/merge-recursive (Mon Aug 25 16:25:57 2008 +0200) 3 commits
- merge-recursive: introduce merge_options
- merge-recursive.c: Add more generic merge_recursive_generic()
- Split out merge_recursive() to merge-recursive.c
Miklos's update; will move to 'next' shortly after reading it again.
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
- diff: vary default prefix depending on what are compared
As some people may have noticed, I've been running with this one when
sending out "How about this" patches to the discussion threads.
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
+ pack-objects: Allow missing base objects when creating thin packs
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 7 commits
+ filter-branch: use --simplify-merges
+ filter-branch: fix ref rewriting with --subdirectory-filter
+ filter-branch: Extend test to show rewriting bug
Fixes a longstanding filter branch bug. Success stories?
Later parts depends on the earlier part of "--simplify-merges"
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
- revision --simplify-merges: incremental simplification
- revision --simplify-merges: prepare for incremental simplification
- revision --simplify-merges: make it a no-op without pathspec
+ revision --simplify-merges: do not leave commits unprocessed
+ revision --simplify-merges: use decoration instead of commit->util
field
+ Topo-sort before --simplify-merges
+ revision traversal: show full history with merge simplification
+ revision.c: whitespace fix
"log --full-history" is with too much clutter, "log" itself is too cleverer
than some people, and here is the middle level of merge simplification.
I started making this incremental but the progress is not so great.
* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 5 commits
+ Documentation: rev-list-options: move --simplify-merges
documentation
----------------------------------------------------------------
[On Hold]
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
- git-am --forge: add Signed-off-by: line for the author
- git-am: clean-up Signed-off-by: lines
- stripspace: add --log-clean option to clean up signed-off-by:
lines
- stripspace: use parse_options()
- Add "git am -s" test
- git-am: refactor code to add signed-off-by line for the committer
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
- WIP: start teaching the --whitespace=fix to merge machinery
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
have been hearing, it might not be a bad idea to drop this.
* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
. Make clients ask for "git program" over ssh and local transport
And this is now dropped.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Graduated to "master"]
* mv/maint-merge-fix (Sat Aug 23 12:56:57 2008 -0700) 1 commit
+ merge: fix numerus bugs around "trivial merge" area
* ml/submodule (Thu Aug 21 19:54:01 2008 -0400) 2 commits
+ git-submodule.sh - Remove trailing / from URL if found
+ git-submodule.sh - Remove trailing / from URL if found
Soon to be in 'master', I guess.
* np/verify-pack (Fri Aug 22 15:45:53 2008 -0400) 1 commit
+ discard revindex data when pack list changes
* jc/no-slim-shell (Tue Aug 19 18:05:43 2008 -0700) 2 commits
+ Build-in "git-shell"
+ shell: do not play duplicated definition games to shrink the
executable
* mv/merge-custom (Sat Aug 23 19:23:22 2008 -0700) 9 commits
+ t7606: fix custom merge test
+ Fix "git-merge -s bogo" help text
+ Update .gitignore to ignore git-help
+ Builtin git-help.
+ builtin-help: always load_command_list() in cmd_help()
+ Add a second testcase for handling invalid strategies in git-merge
+ Add a new test for using a custom merge strategy
+ builtin-merge: allow using a custom strategy
+ builtin-help: make some internal functions available to other
builtins
The one at the tip fixes a test that assumed git-merge has a broken
"trivial merge" implementation.
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
+ builtin-add.c: optimize -A option and "git add ."
+ builtin-add.c: restructure the code for maintainability
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
+ Make cherry-pick use rerere for conflict resolution.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Aug 2008, #07; Sat, 23)
@ 2008-08-24 3:38 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2008-08-24 3:38 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 topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
Here is a list of issues/topics we saw on the mailing list but haven't
resulted in anything queuable in 'pu' yet. They need further work by
interested parties:
* Windows relocatable install
Steffen Prohaska ($gmane/92605), Johannes Sixt.
* Haiku port
Andreas Färber ($gmane/92582)
* ksh "trap foo EXIT" triggers on function return, loses exit status
Brandon Casey ($gmane/92873)
* document webdav debugging tip with davfs2
Giovanni Funchal ($gmane/92745)
* update "rebase -i" documentation with examples
Eric Hanchrow ($gmane/92669)
* pre-push hook
Scott Chacon ($gmane/92900, $gmane/92936)
* "git commit --author=nickname" expanding nickname from somewhere
Michael J Gruber ($gmane/93274)
* Handling (possibly $HOME-) relative paths in config files
Karl Chen ($gmane/93250)
* "submodule sync"
David Aguilar ($gmane/93265)
* "rev-list --bisect --first-parent"
Avery Pennarun, me ($gmane/93420)
* "apply --include"
Joe Perches ($gmane/93505)
----------------------------------------------------------------
[New Topics]
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
. Use xdiff caching to improve git blame performance
. Allow xdiff machinery to cache hash results for a file
. Always initialize xpparam_t to 0
. Bypass textual patch generation and parsing in git blame
. Allow alternate "low-level" emit function from xdl_diff
Réne had a good comments on how the callback is structured.
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
- discard_cache: reset lazy name_hash bit
I spotted this by accident while working on something unrelated.
When a program calls discard_cache() to read the index again, we do not
properly re-initialize the name_hash structure that is used by the case
insensitivitly logic. This _might_ improve issues people may be having on
case insensitive filesystems. I dunno.
* mv/maint-merge-fix (Sat Aug 23 12:56:57 2008 -0700) 1 commit
+ merge: fix numerus bugs around "trivial merge" area
* ml/submodule (Thu Aug 21 19:54:01 2008 -0400) 2 commits
+ git-submodule.sh - Remove trailing / from URL if found
+ git-submodule.sh - Remove trailing / from URL if found
Soon to be in 'master', I guess.
* np/verify-pack (Fri Aug 22 15:45:53 2008 -0400) 1 commit
+ discard revindex data when pack list changes
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 3 commits
- git-add --intent-to-add (-N)
- cached_object: learn empty blob
- sha1_object_info(): pay attention to cached objects
Teaches "git add" to record only the intent to add a path later.
I think this is better done without the hardcoded empty blob object.
----------------------------------------------------------------
[Stalled -- Needs Action to Proceed (or to be dropped)]
* sb/daemon (Thu Aug 14 20:02:20 2008 +0200) 4 commits
- git-daemon: rewrite kindergarden, new option --max-connections
- git-daemon: Simplify dead-children reaping logic
- git-daemon: use LOG_PID, simplify logging code
- git-daemon: call logerror() instead of error()
Can somebody who actually runs the daemon standalone comment on this one?
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
- configure: auto detect dynamic library path switches
- Makefile: Allow CC_LD_DYNPATH to be overriden
Needs success reports from people who do use user-defined dynamic library
path when they build their "git" before this series can go anywhere.
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
- date/time: do not get confused by fractional seconds
Linus hints further enhancements as "the right way", so let's see if
somebody else steps up and tries it before merging this to 'next'.
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
- [do not merge -- original version] Add Git-aware CGI for Git-aware
smart HTTP transport
- Add backdoor options to receive-pack for use in Git-aware CGI
The "magic" detection protocol was revised to use POST to info/refs; the
top one queued is from before that discussion.
----------------------------------------------------------------
[Actively Cooking]
* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits
- bisect: only check merge bases when needed
- bisect: test merge base if good rev is not an ancestor of bad rev
* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
. Make builtin-revert.c use merge_recursive_generic()
. merge-recursive.c: Add more generic merge_recursive_generic()
. Split out merge_recursive() to merge-recursive.c
Miklos will be working on updates based on comments.
* lw/gitweb (Mon Aug 18 21:39:49 2008 +0200) 3 commits
. gitweb: use new Git::Repo API, and add optional caching
. add new Perl API: Git::Repo, Git::Commit, Git::Tag, and
Git::RepoRoot
. gitweb: add test suite with Test::WWW::Mechanize::CGI
Tentatively dropped as its tests do not seem to pass and I have no time to
look at them.
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
- diff: vary default prefix depending on what are compared
As some people may have noticed, I've been running with this one when
sending out "How about this" patches to the discussion threads.
* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
+ pack-objects: Allow missing base objects when creating thin packs
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 3 commits
+ filter-branch: use --simplify-merges
+ filter-branch: fix ref rewriting with --subdirectory-filter
+ filter-branch: Extend test to show rewriting bug
Fixes a longstanding filter branch bug. Success stories?
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
- revision --simplify-merges: incremental simplification
- revision --simplify-merges: prepare for incremental simplification
- revision --simplify-merges: make it a no-op without pathspec
+ revision --simplify-merges: do not leave commits unprocessed
+ revision --simplify-merges: use decoration instead of commit->util
field
+ Topo-sort before --simplify-merges
+ revision traversal: show full history with merge simplification
+ revision.c: whitespace fix
"log --full-history" is with too much clutter, "log" itself is too cleverer
than some people, and here is the middle level of merge simplification.
I started making this incremental but the progress is not so great.
* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
+ Documentation: rev-list-options: move --simplify-merges
documentation
----------------------------------------------------------------
[Will merge to master soon]
* jc/no-slim-shell (Tue Aug 19 18:05:43 2008 -0700) 2 commits
+ Build-in "git-shell"
+ shell: do not play duplicated definition games to shrink the
executable
* mv/merge-custom (Sat Aug 23 19:23:22 2008 -0700) 9 commits
+ t7606: fix custom merge test
+ Fix "git-merge -s bogo" help text
+ Update .gitignore to ignore git-help
+ Builtin git-help.
+ builtin-help: always load_command_list() in cmd_help()
+ Add a second testcase for handling invalid strategies in git-merge
+ Add a new test for using a custom merge strategy
+ builtin-merge: allow using a custom strategy
+ builtin-help: make some internal functions available to other
builtins
The one at the tip fixes a test that assumed git-merge has a broken
"trivial merge" implementation.
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
+ builtin-add.c: optimize -A option and "git add ."
+ builtin-add.c: restructure the code for maintainability
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
+ Make cherry-pick use rerere for conflict resolution.
----------------------------------------------------------------
[On Hold]
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
- git-am --forge: add Signed-off-by: line for the author
- git-am: clean-up Signed-off-by: lines
- stripspace: add --log-clean option to clean up signed-off-by:
lines
- stripspace: use parse_options()
- Add "git am -s" test
- git-am: refactor code to add signed-off-by line for the committer
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
- WIP: start teaching the --whitespace=fix to merge machinery
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
- Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Graduated to "master"]
* ml/submodule-foreach (Sun Aug 10 19:10:04 2008 -0400) 1 commit
+ git-submodule - Add 'foreach' subcommand
* pm/log-exit-code (Mon Aug 11 08:46:25 2008 +0200) 2 commits
+ Teach git log --exit-code to return an appropriate exit code
+ Teach git log --check to return an appropriate exit code
* sb/commit-tree-minileak (Tue Aug 12 00:35:11 2008 +0200) 1 commit
+ Fix commit_tree() buffer leak
* pb/reflog-dwim (Sun Aug 10 22:22:21 2008 +0200) 1 commit
+ builtin-reflog: Allow reflog expire to name partial ref
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
+ add: refuse to add working tree items beyond symlinks
+ update-index: refuse to add working tree items beyond symlinks
Fix for a longstanding bug that allows "git add" and "git update-index" to
add a path "a/b" to the index when "a" is a symbolic link. We would need
a similar fix for the case where "a" is a submodule.
* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
+ Add test for diff-tree --stdin with two trees
+ Teach git diff-tree --stdin to diff trees
+ diff-tree: Note that the commit ID is printed with --stdin
+ Refactoring: Split up diff_tree_stdin
* mg/count-objects (Fri Aug 15 00:20:20 2008 -0400) 1 commit
+ count-objects: Add total pack size to verbose output
This one is without the human readable bits.
* mz/push-verbose (Sat Aug 16 19:58:32 2008 +0200) 1 commit
+ Make push more verbose about illegal combination of options
* jc/index-extended-flags (Sat Aug 16 23:02:08 2008 -0700) 1 commit
+ index: future proof for "extended" index entries
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
+ git-merge-octopus: use (merge-base A (merge B C D E...)) for
stepwise merge
+ merge-base-many: add trivial tests based on the documentation
+ documentation: merge-base: explain "git merge-base" with more than
2 args
+ merge-base: teach "git merge-base" to drive underlying
merge_bases_many()
* js/parallel-test (Mon Aug 18 12:25:40 2008 -0400) 4 commits
+ Update t/.gitignore to ignore all trash directories
+ Enable parallel tests
+ tests: Clarify dependencies between tests, 'aggregate-results' and
'clean'
+ t9700: remove useless check
* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
+ tests: use $TEST_DIRECTORY to refer to the t/ directory
This does not actually move "t/test directory" any deeper, but fixes test
scripts that assume they run immediately below "t/" to use TEST_DIRECTORY
variable.
* js/mingw-stat (Mon Aug 18 22:01:06 2008 +0200) 2 commits
+ Revert "Windows: Use a customized struct stat that also has the
st_blocks member."
+ compat: introduce on_disk_bytes()
This gets rid of use of st_blocks member (which is XSI but not POSIX
proper), which was originally prompted by recent Haiku port but it turns
out MinGW has the same issue as well. Queued on 'pu' just to have a
chance to make sure I munged the version j6t sent me correctly before
merging it upwards.
* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
+ checkout --track: make up a sensible branch name if '-b' was
omitted
Alex has update to dwim "checkout --track remotes/origin/hack" as well.
* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
+ xdiff-interface: hide the whole "xdiff_emit_state" business from
the caller
+ Use strbuf for struct xdiff_emit_state's remainder
+ Make xdi_diff_outf interface for running xdiff_outf diffs
Gives measurable performance improvement to textual diff generation. For
improving "blame" performance, it might be more effective to hook directly
to lower level of xdiff machinery so that we do not even have to generate
patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
would be a separate topic.
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
+ add --no-filters option to git hash-object
+ add --path option to git hash-object
+ use parse_options() in git hash-object
+ correct usage help string for git-hash-object
+ correct argument checking test for git hash-object
+ teach index_fd to work with pipes
Gives a bit more flexibility to hash-objects by allowing us to lie about
the path the contents comes from.
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
+ Documentation: Improve documentation for git-imap-send(1)
+ imap-send.c: more style fixes
+ imap-send.c: style fixes
+ git-imap-send: Support SSL
+ git-imap-send: Allow the program to be run from subdirectories of
a git tree
Some people seem to prefer having this feature available also with gnutls.
Such an enhancement can be done in-tree on top of this series if they are
so inclined.
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
+ spawn pager via run_command interface
+ run-command: add pre-exec callback
This changes the parent-child relationship between the pager and the git
process. We used to make pager the parent which meant that the exit
status from git is lost from the caller.
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
+ Enable threaded delta search on *BSD and Linux.
^ permalink raw reply [relevance 3%]
* Re: [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area
2008-08-23 19:56 2% ` [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area Junio C Hamano
@ 2008-08-24 1:58 3% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2008-08-24 1:58 UTC (permalink / raw)
To: Miklos Vajna; +Cc: Paolo Bonzini, Jeff King, git
Junio C Hamano <gitster@pobox.com> writes:
> The primary logic of the merge, however, had an assumption that the
> process never read the index in-core, and write_cache_as_tree() call it
> makes from write_tree_trivial() will always read from the on-disk index
> the strategies created and write it out as a tree. This assumption is now
> broken by the above fix. It now calls discard_cache() before calling
> write_tree_trivial() when it wants to write the on-disk index as a tree to
> fix this issue.
By the way, in the medium term, if we are serious about making an internal
call to merge_recursive() from cmd_merge(), I think we may be better off
making it the responsibility for try_merge_strategy() to leave an
committable state in the in-core index (aka "the_index") when they return
with 0 (success) status. After calling external ones via the run_command
interface, it should do a read_cache() (after calling discard_cache() if
needed); if it calls merge_recursive(), hopefully you already have the
committable state in the in-core index.
That way, when automerge succeeds, write_tree_trivial() can write that
in-core index out and create the tree object to be committed. The
callchain to use merge_recursive() can avoid having to write to the
on-disk index, read it again and write out the tree from it.
^ permalink raw reply [relevance 3%]
* [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area
2008-08-23 19:55 2% ` Junio C Hamano
@ 2008-08-23 19:56 2% ` Junio C Hamano
2008-08-24 1:58 3% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2008-08-23 19:56 UTC (permalink / raw)
To: Miklos Vajna; +Cc: Paolo Bonzini, Jeff King, git
The "trivial merge" codepath wanted to optimize itself by making an
internal call to the read-tree machinery, but it did not read the index
before doing so, and the codepath was never exercised. Incidentally, this
failure to read the index upfront meant that the safety to refuse doing
anything when the index is unmerged did not kick in, either.
These two problem are fixed by using read_cache_unmerged() that does read
the index before checking if it is unmerged at the beginning of
cmd_merge().
The primary logic of the merge, however, had an assumption that the
process never read the index in-core, and write_cache_as_tree() call it
makes from write_tree_trivial() will always read from the on-disk index
the strategies created and write it out as a tree. This assumption is now
broken by the above fix. It now calls discard_cache() before calling
write_tree_trivial() when it wants to write the on-disk index as a tree to
fix this issue.
When multiple strategies are tried, their results are evaluated by reading
the resulting index and inspecting it. The codepath needs to make a call
to read_cache() for each successful strategy, and for that to work, they
need to discard_cache() the one from the previous round.
Also the "trivial merge" forgot that the current commit is one of the
parents of the resulting commit.
This still has breakage in the way it writes out the resulting tree out of
the trivial merge codepath, which is a topic of the next patch. One test
in t7605-merge-resolve.sh exposes this breakage.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin-merge.c | 16 +++++++++-------
t/t3030-merge-recursive.sh | 11 +++++++++++
t/t7600-merge.sh | 9 +++++++++
t/t7605-merge-resolve.sh | 6 ++++--
4 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c
index a201c66..b280444 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -564,8 +564,6 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
struct dir_struct dir;
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
- if (read_cache_unmerged())
- die("you need to resolve your current index first");
refresh_cache(REFRESH_QUIET);
fd = hold_locked_index(lock_file, 1);
@@ -651,13 +649,15 @@ static void add_strategies(const char *string, unsigned attr)
static int merge_trivial(void)
{
unsigned char result_tree[20], result_commit[20];
- struct commit_list parent;
+ struct commit_list *parent = xmalloc(sizeof(struct commit_list *));
write_tree_trivial(result_tree);
printf("Wonderful.\n");
- parent.item = remoteheads->item;
- parent.next = NULL;
- commit_tree(merge_msg.buf, result_tree, &parent, result_commit);
+ parent->item = lookup_commit(head);
+ parent->next = xmalloc(sizeof(struct commit_list *));
+ parent->next->item = remoteheads->item;
+ parent->next->next = NULL;
+ commit_tree(merge_msg.buf, result_tree, parent, result_commit);
finish(result_commit, "In-index merge");
drop_save();
return 0;
@@ -743,6 +743,7 @@ static int evaluate_result(void)
int cnt = 0;
struct rev_info rev;
+ discard_cache();
if (read_cache() < 0)
die("failed to read the cache");
@@ -776,7 +777,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
struct commit_list **remotes = &remoteheads;
setup_work_tree();
- if (unmerged_cache())
+ if (read_cache_unmerged())
die("You are in the middle of a conflicted merge.");
/*
@@ -1073,6 +1074,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
}
/* Automerge succeeded. */
+ discard_cache();
write_tree_trivial(result_tree);
automerge_was_ok = 1;
break;
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index aff3603..f288015 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -269,6 +269,17 @@ test_expect_success 'merge-recursive result' '
'
+test_expect_success 'fail if the index has unresolved entries' '
+
+ rm -fr [abcd] &&
+ git checkout -f "$c1" &&
+
+ test_must_fail git merge "$c5" &&
+ test_must_fail git merge "$c5" 2> out &&
+ grep "You are in the middle of a conflicted merge" out
+
+'
+
test_expect_success 'merge-recursive remove conflict' '
rm -fr [abcd] &&
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index fee8fb7..dbc90bc 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -498,4 +498,13 @@ test_expect_success 'merge fast-forward in a dirty tree' '
test_debug 'gitk --all'
+test_expect_success 'in-index merge' '
+ git reset --hard c0 &&
+ git merge --no-ff -s resolve c1 > out &&
+ grep "Wonderful." out &&
+ verify_parents $c0 $c1
+'
+
+test_debug 'gitk --all'
+
test_done
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index ee21a10..5c53608 100755
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -27,7 +27,7 @@ test_expect_success 'setup' '
git tag c3
'
-test_expect_success 'merge c1 to c2' '
+test_expect_failure 'merge c1 to c2' '
git reset --hard c1 &&
git merge -s resolve c2 &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
@@ -36,7 +36,9 @@ test_expect_success 'merge c1 to c2' '
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
- test -f c2.c
+ test -f c2.c &&
+ test 3 = $(git ls-tree -r HEAD | wc -l) &&
+ test 3 = $(git ls-files | wc -l)
'
test_expect_success 'merge c2 to c3 (fails)' '
--
1.6.0.51.g078ae
^ permalink raw reply related [relevance 2%]
* Re: [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge
@ 2008-08-23 19:55 2% ` Junio C Hamano
2008-08-23 19:56 2% ` [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2008-08-23 19:55 UTC (permalink / raw)
To: Miklos Vajna; +Cc: Paolo Bonzini, Jeff King, git
We've exchanged quite a few "here is a better one", "oops, that is not
enough", which is confusing to bystanders. Here is my proposed final
series, meant to be applied to 'maint'.
[1/2] merge: fix numerus bugs around "trivial merge" area
[2/2] unpack_trees(): protect the handcrafted in-core index from read_cache()
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (topics)
2008-07-14 5:11 2% ` Junio C Hamano
@ 2008-07-16 3:33 2% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2008-07-16 3:33 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 topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
It so happens that the topics clearly separated between the ones that are
obviously ready for 1.6.0 and the others that aren't yet as of tonight.
It seems that it is a good time to draw that line and tag -rc0 tomorrow,
after merging the remaining topics in 'next'.
----------------------------------------------------------------
[New Topics]
I could apply these directly to master, but I am just playing it safe.
* sp/maint-index-pack (Tue Jul 15 04:45:34 2008 +0000) 4 commits
+ index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
+ index-pack: Track the object_entry that creates each base_data
+ index-pack: Chain the struct base_data on the stack for traversal
+ index-pack: Refactor base arguments of resolve_delta into a struct
* rs/rebase-checkout-not-so-quiet (Mon Jul 14 14:05:35 2008 -0700) 1 commit
+ git-rebase: report checkout failure
* ag/blame (Wed Jul 16 02:00:58 2008 +0400) 2 commits
+ Do not try to detect move/copy for entries below threshold.
+ Avoid rescanning unchanged entries in search for copies.
This gives a drastic performance improvement to "git-blame -C -C" with
quite straightforward and obvious code change.
* rs/archive (Mon Jul 14 21:22:05 2008 +0200) 6 commits
+ archive: remove extra arguments parsing code
+ archive: unify file attribute handling
+ archive: centralize archive entry writing
+ archive: add baselen member to struct archiver_args
+ add context pointer to read_tree_recursive()
+ archive: remove args member from struct archiver
----------------------------------------------------------------
[Will merge to master soon]
* sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits
+ Make usage strings dash-less
+ t/: Use "test_must_fail git" instead of "! git"
+ t/test-lib.sh: exit with small negagive int is ok with
test_must_fail
* mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits
+ make remove-dashes: apply to scripts and programs as well, not
just to builtins
+ git-bisect: use dash-less form on git bisect log
+ t1007-hash-object.sh: use quotes for the test description
+ t0001-init.sh: change confusing directory name
* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits
+ git-mailinfo: use strbuf's instead of fixed buffers
+ Add some useful functions for strbuf manipulation.
+ Make some strbuf_*() struct strbuf arguments const.
----------------------------------------------------------------
[Graduated to "master"]
* sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit
+ bash completion: Append space after file names have been completed
Early parts were already merged to 'master' and need to be merged down to
maint as well, as this is about a "performance bug" that has been with us
almost forever.
* ag/rewrite_one (Sat Jul 12 22:00:57 2008 +0400) 1 commit
+ Fix quadratic performance in rewrite_one.
* sp/win (Fri Jul 11 18:52:42 2008 +0200) 3 commits
+ We need to check for msys as well as Windows in add--interactive.
+ Convert CR/LF to LF in tag signatures
+ Fixed text file auto-detection: treat EOF character 032 at the end
of file as printable
* js/merge-rr (Sat Jul 12 15:56:19 2008 +0100) 2 commits
+ Move MERGE_RR from .git/rr-cache/ into .git/
+ builtin-rerere: more carefully find conflict markers
* sb/rerere-lib (Wed Jul 9 14:58:57 2008 +0200) 2 commits
+ rerere: Separate libgit and builtin functions
+ builtin-rerere: more carefully find conflict markers
* js/maint-pretty-mailmap (Sat Jul 12 00:28:18 2008 +0100) 1 commit
+ Add pretty format %aN which gives the author name, respecting
.mailmap
* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 3 commits
+ help (Windows): Display HTML in default browser using Windows'
shell API
+ help.c: Add support for htmldir relative to git_exec_path()
+ Move code interpreting path relative to exec-dir to new function
system_path()
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
+ Teach "am" and "rebase" to mark the original position with
ORIG_HEAD
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
+ branch --merged/--no-merged: allow specifying arbitrary commit
+ branch --contains: default to HEAD
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
+ builtin-rerere: more carefully find conflict markers
* ls/maint-mailinfo-patch-label (Thu Jul 10 23:41:33 2008 +0200) 1 commit
+ git-mailinfo: Fix getting the subject from the in-body [PATCH]
line
* mv/merge-in-c (Mon Jul 14 00:09:41 2008 -0700) 20 commits
+ reduce_heads(): protect from duplicate input
+ reduce_heads(): thinkofix
+ Add a new test for git-merge-resolve
+ t6021: add a new test for git-merge-resolve
+ Teach merge.log to "git-merge" again
+ Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
----------------------------------------------------------------
[On Hold]
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
- Documentation: Improve documentation for git-imap-send(1)
- imap-send.c: more style fixes
- imap-send.c: style fixes
- git-imap-send: Support SSL
- git-imap-send: Allow the program to be run from subdirectories of
a git tree
Some people seem to prefer having this feature available also with gnutls.
If such a patch materializes soon, that would be good, but otherwise I'll
merge this as-is to 'next'. Such an enhancement can be done in-tree on
top of this series.
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
+ Teach git-merge -X<option> again.
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
+ builtin-merge.c: use parse_options_step() "incremental parsing"
machinery
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
This needs to be merged to master iff/when merge-theirs gets merged,
but I do not think this series is widely supported, so both are on hold.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
. cherry: cache patch-ids to avoid repeating work
* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
. gitweb: use new Git::Repo API, and add optional caching
. Add new Git::Repo API
. gitweb: add test suite with Test::WWW::Mechanize::CGI
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
. Migrate git-am to use git-sequencer
. Add git-sequencer test suite (t3350)
. Add git-sequencer prototype documentation
. Add git-sequencer shell prototype
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- [BROKEN wrt shallow clones] Ignore graft during object transfer
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
This is for peeling to see what's behind the blamed commit, which may or
may not help applications like gitweb.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (topics)
2008-07-10 2:32 2% ` Junio C Hamano
@ 2008-07-14 5:11 2% ` Junio C Hamano
2008-07-16 3:33 2% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2008-07-14 5:11 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 topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
I think most of the important stuff is already in 'next'. Let's start
talking about closing the merge window for 1.6.0.
----------------------------------------------------------------
[New Topics]
* sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits
- Make usage strings dash-less
- t/: Use "test_must_fail git" instead of "! git"
- t/test-lib.sh: exit with small negagive int is ok with
test_must_fail
* mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits
- make remove-dashes: apply to scripts and programs as well, not
just to builtins
- git-bisect: use dash-less form on git bisect log
- t1007-hash-object.sh: use quotes for the test description
- t0001-init.sh: change confusing directory name
* sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit
+ bash completion: Append space after file names have been completed
Early parts are already merged to 'master' and need to be merged down to
maint as well, as this is about a "performance bug" that has been with us
almost forever.
* ag/rewrite_one (Sat Jul 12 22:00:57 2008 +0400) 1 commit
+ Fix quadratic performance in rewrite_one.
* sp/win (Fri Jul 11 18:52:42 2008 +0200) 3 commits
+ We need to check for msys as well as Windows in add--interactive.
+ Convert CR/LF to LF in tag signatures
+ Fixed text file auto-detection: treat EOF character 032 at the end
of file as printable
* js/merge-rr (Sat Jul 12 15:56:19 2008 +0100) 2 commits
+ Move MERGE_RR from .git/rr-cache/ into .git/
+ builtin-rerere: more carefully find conflict markers
* sb/rerere-lib (Wed Jul 9 14:58:57 2008 +0200) 2 commits
+ rerere: Separate libgit and builtin functions
+ builtin-rerere: more carefully find conflict markers
* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits
- git-mailinfo: use strbuf's instead of fixed buffers
- Add some useful functions for strbuf manipulation.
- Make some strbuf_*() struct strbuf arguments const.
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
- cherry: cache patch-ids to avoid repeating work
This does not seem to pass tests even on its own.
* js/maint-pretty-mailmap (Sat Jul 12 00:28:18 2008 +0100) 1 commit
+ Add pretty format %aN which gives the author name, respecting
.mailmap
* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 6 commits
- Allow add_path() to add non-existent directories to the path
- Allow the built-in exec path to be relative to the command
invocation path
- Fix relative built-in paths to be relative to the command
invocation
+ help (Windows): Display HTML in default browser using Windows'
shell API
+ help.c: Add support for htmldir relative to git_exec_path()
+ Move code interpreting path relative to exec-dir to new function
system_path()
The earlier parts are obvious; Dscho seemed to have some comments on the
later ones that are in 'pu'.
* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
- gitweb: use new Git::Repo API, and add optional caching
- Add new Git::Repo API
- gitweb: add test suite with Test::WWW::Mechanize::CGI
This does not pass t9710, at least for me X-<.
----------------------------------------------------------------
[Will merge to master soon]
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
+ Teach "am" and "rebase" to mark the original position with
ORIG_HEAD
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
+ branch --merged/--no-merged: allow specifying arbitrary commit
+ branch --contains: default to HEAD
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
This builds on top of the parse-options enhancement series that
has been cooking in 'next' for some time.
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
+ builtin-rerere: more carefully find conflict markers
* ls/maint-mailinfo-patch-label (Thu Jul 10 23:41:33 2008 +0200) 1 commit
+ git-mailinfo: Fix getting the subject from the in-body [PATCH]
line
----------------------------------------------------------------
[Actively Cooking]
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
+ Teach git-merge -X<option> again.
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
+ builtin-merge.c: use parse_options_step() "incremental parsing"
machinery
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
I've described what this is in a separate message.
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
- Documentation: Improve documentation for git-imap-send(1)
- imap-send.c: more style fixes
- imap-send.c: style fixes
- git-imap-send: Support SSL
- git-imap-send: Allow the program to be run from subdirectories of
a git tree
Some people seem to prefer having this feature available also with gnutls.
If such a patch materializes soon, that would be good, but otherwise I'll
merge this as-is to 'next'. Such an enhancement can be done in-tree on
top of this series.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
* mv/merge-in-c (Sun Jul 13 08:13:55 2008 +0000) 19 commits
+ reduce_heads(): thinkofix
+ Add a new test for git-merge-resolve
+ t6021: add a new test for git-merge-resolve
+ Teach merge.log to "git-merge" again
+ Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
Sverre seems to have a yet another fixup on top of this that came late and
I haven't looked at.
----------------------------------------------------------------
[Graduated to "master"]
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
+ Allow cherry-picking root commits
* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
+ Teach git-bundle to read revision arguments from stdin like git-
rev-list.
* sg/stash-k-i (Tue Jul 8 00:40:56 2008 -0700) 2 commits
+ Documentation: tweak use case in "git stash save --keep-index"
+ stash: introduce 'stash save --keep-index' option
One weakness of our "partial commit" workflow support used to be that the
user can incrementally build what is to be committed in the index but that
state cannot be tested as a whole in the working tree. This allows you to
temporarily stash the remaining changes in the working tree so that the
index state before running "stash save --keep-index" can be seen in the
working tree to be tested and then committed.
* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits
+ Add a test for "git stash branch"
+ Implement "git stash branch <newbranch> <stash>"
Creates a new branch out of the stashed state, after returning from the
interrupt that forced you to create the stash in the first place.
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
+ git-add--interactive: manual hunk editing mode
+ git-add--interactive: remove hunk coalescing
+ git-add--interactive: replace hunk recounting with apply --recount
Adds 'e/dit' action to interactive add command.
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
+ branch -r -v: do not spit out garbage
+ stat_tracking_info(): clear object flags used during counting
+ git-branch -v: show the remote tracking statistics
+ git-status: show the remote tracking statistics
+ Refactor "tracking statistics" code used by "git checkout"
Makes the "your branch is ahead of the tracked one by N commits" logic and
messages available to other commands; status and branch are updated.
* ph/parseopt-step-blame (Wed Jul 9 23:38:34 2008 +0200) 18 commits
+ revisions: refactor handle_revision_opt into parse_revision_opt.
+ git-shortlog: migrate to parse-options partially.
+ git-blame: fix lapsus
+ git-blame: migrate to incremental parse-option [2/2]
+ git-blame: migrate to incremental parse-option [1/2]
+ revisions: split handle_revision_opt() from setup_revisions()
+ Merge branch 'jc/blame' (early part) into HEAD
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
+ parse-opt: fake short strings for callers to believe in.
+ parse-opt: do not print errors on unknown options, return -2
intead.
+ parse-opt: create parse_options_step.
+ parse-opt: Export a non NORETURN usage dumper.
+ parse-opt: have parse_options_{start,end}.
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
Became active again ;-) This probably is ready for 'master' already,
except for the last two which I only looked at the patch and have not
used heavily in production yet.
----------------------------------------------------------------
[On Hold]
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
. Migrate git-am to use git-sequencer
. Add git-sequencer test suite (t3350)
. Add git-sequencer prototype documentation
. Add git-sequencer shell prototype
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- [BROKEN wrt shallow clones] Ignore graft during object transfer
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
This is for peeling to see what's behind the blamed commit, which may or
may not help applications like gitweb.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (topics)
2008-07-08 2:46 2% ` Junio C Hamano
@ 2008-07-10 2:32 2% ` Junio C Hamano
2008-07-14 5:11 2% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2008-07-10 2:32 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 topics list the commits in reverse chronological order. The topics
meant to be applied to the maintenance series have "maint-" in their
names.
It already is beginning to become clear what 1.6.0 will look like. What's
already in 'next' all are well intentioned (I do not guarantee they are
already bug-free --- that is what cooking them in 'next' is for) and are
good set of feature enhancements. Bigger changes will be:
* Port for MinGW.
* With the default Makefile settings, most of the programs will be
installed outside your $PATH, except for "git", "gitk", "git-gui" and
some server side programs that need to be accessible for technical
reasons. Invoking a git subcommand as "git-xyzzy" from the command
line has been deprecated since early 2006 (and officially announced in
1.5.4 release notes); use of them from your scripts after adding
output from "git --exec-path" to the $PATH will still be supported in
1.6.0, but users are again strongly encouraged to adjust their
scripts to use "git xyzzy" form, as we will stop installing
"git-xyzzy" hardlinks for built-in commands in later releases.
* git-merge will be rewritten in C.
* default pack and idx versions will be updated as scheduled for some
time ago.
* GIT_CONFIG, which was only documented as affecting "git config", but
actually affected all git commands, now only affects "git config".
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
not different from GIT_CONFIG in a useful way, is removed.
----------------------------------------------------------------
[New Topics]
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
+ Teach git-merge -X<option> again.
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
+ builtin-merge.c: use parse_options_step() "incremental parsing"
machinery
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
I've described what this is in a separate message.
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
+ branch --merged/--no-merged: allow specifying arbitrary commit
+ branch --contains: default to HEAD
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
This builds on top of the parse-options enhancement series that
has been cooking in 'next' for some time.
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
+ Documentation: Improve documentation for git-imap-send(1)
+ imap-send.c: more style fixes
+ imap-send.c: style fixes
+ git-imap-send: Support SSL
+ git-imap-send: Allow the program to be run from subdirectories of
a git tree
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
+ builtin-rerere: more carefully find conflict markers
----------------------------------------------------------------
[Will merge to master soon]
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
+ Allow cherry-picking root commits
* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
+ Teach git-bundle to read revision arguments from stdin like git-
rev-list.
* sg/stash-k-i (Tue Jul 8 00:40:56 2008 -0700) 2 commits
+ Documentation: tweak use case in "git stash save --keep-index"
+ stash: introduce 'stash save --keep-index' option
One weakness of our "partial commit" workflow support used to be that the
user can incrementally build what is to be committed in the index but that
state cannot be tested as a whole in the working tree. This allows you to
temporarily stash the remaining changes in the working tree so that the
index state before running "stash save --keep-index" can be seen in the
working tree to be tested and then committed.
* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits
+ Add a test for "git stash branch"
+ Implement "git stash branch <newbranch> <stash>"
Creates a new branch out of the stashed state, after returning from the
interrupt that forced you to create the stash in the first place.
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
+ git-add--interactive: manual hunk editing mode
+ git-add--interactive: remove hunk coalescing
+ git-add--interactive: replace hunk recounting with apply --recount
Adds 'e/dit' action to interactive add command.
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
+ branch -r -v: do not spit out garbage
+ stat_tracking_info(): clear object flags used during counting
+ git-branch -v: show the remote tracking statistics
+ git-status: show the remote tracking statistics
+ Refactor "tracking statistics" code used by "git checkout"
Makes the "your branch is ahead of the tracked one by N commits" logic and
messages available to other commands; status and branch are updated.
----------------------------------------------------------------
[Actively Cooking]
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
+ Teach "am" and "rebase" to mark the original position with
ORIG_HEAD
* ph/parseopt-step-blame (Wed Jul 9 23:38:34 2008 +0200) 18 commits
+ revisions: refactor handle_revision_opt into parse_revision_opt.
+ git-shortlog: migrate to parse-options partially.
+ git-blame: fix lapsus
+ git-blame: migrate to incremental parse-option [2/2]
+ git-blame: migrate to incremental parse-option [1/2]
+ revisions: split handle_revision_opt() from setup_revisions()
+ Merge branch 'jc/blame' (early part) into HEAD
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
+ parse-opt: fake short strings for callers to believe in.
+ parse-opt: do not print errors on unknown options, return -2
intead.
+ parse-opt: create parse_options_step.
+ parse-opt: Export a non NORETURN usage dumper.
+ parse-opt: have parse_options_{start,end}.
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
Became active again ;-) This probably is ready for 'master' already,
except for the last two which I only looked at the patch and have not
used heavily in production yet.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits
+ Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
----------------------------------------------------------------
[Graduated to "master"]
* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
+ git-apply --directory: make --root more similar to GNU diff
+ apply --root: thinkofix.
+ Teach "git apply" to prepend a prefix with "--root=<root>"
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
+ Make default expiration period of reflog used for stash infinite
+ Per-ref reflog expiry configuration
As 1.6.0 will be a good time to make backward incompatible changes, the
tip commit makes the default expiry period of stash 'never', unless you
configure them to expire explicitly using gc.refs/stash.* variables.
Needs consensus, but I am guessing that enough people would want stash
that does not expire.
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
+ Allow per-command pager config
----------------------------------------------------------------
[On Hold]
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
. Migrate git-am to use git-sequencer
. Add git-sequencer test suite (t3350)
. Add git-sequencer prototype documentation
. Add git-sequencer shell prototype
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- [BROKEN wrt shallow clones] Ignore graft during object transfer
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
The blame that finds where each line in the original lines moved to. This
may help a GSoC project that wants to gather statistical overview of the
history. The final presentation may need tweaking (see the log message of
the commit ""git-blame --reverse" on the series).
The tip two commits are for peeling to see what's behind the blamed
commit, which we should be able to separate out into an independent topic
from the rest.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (topics)
2008-07-06 10:04 2% ` Junio C Hamano
@ 2008-07-08 2:46 2% ` Junio C Hamano
2008-07-10 2:32 2% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2008-07-08 2:46 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 topics list the commits in reverse chronological order. The topics
meant to be applied to the maintenance series have "maint-" in their
names.
It already is beginning to become clear what 1.6.0 will look like. What's
already in 'next' all are well intentioned (I do not guarantee they are
already bug-free --- that is what cooking them in 'next' is for) and are
good set of feature enhancements. Bigger changes will be:
* Port for MinGW.
* With the default Makefile settings, most of the programs will be
installed outside your $PATH, except for "git", "gitk", "git-gui" and
some server side programs that need to be accessible for technical
reasons. Invoking a git subcommand as "git-xyzzy" from the command
line has been deprecated since early 2006 (and officially announced in
1.5.4 release notes); use of them from your scripts after adding
output from "git --exec-path" to the $PATH will still be supported in
1.6.0, but users are again strongly encouraged to adjust their
scripts to use "git xyzzy" form, as we will stop installing
"git-xyzzy" hardlinks for built-in commands in later releases.
* git-merge will be rewritten in C.
* default pack and idx versions will be updated as scheduled for some
time ago.
* GIT_CONFIG, which was only documented as affecting "git config", but
actually affected all git commands, now only affects "git config".
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
not different from GIT_CONFIG in a useful way, is removed.
----------------------------------------------------------------
[New Topics]
* jc/rebase-orig-head (Mon Jul 7 00:16:38 2008 -0700) 1 commit
+ Teach "am" and "rebase" to mark the original position with
ORIG_HEAD
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
. Migrate git-am to use git-sequencer
. Add git-sequencer test suite (t3350)
. Add git-sequencer prototype documentation
. Add git-sequencer shell prototype
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
+ Allow cherry-picking root commits
* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
+ Teach git-bundle to read revision arguments from stdin like git-
rev-list.
----------------------------------------------------------------
[Will merge to master soon]
* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
+ git-apply --directory: make --root more similar to GNU diff
+ apply --root: thinkofix.
+ Teach "git apply" to prepend a prefix with "--root=<root>"
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
+ Make default expiration period of reflog used for stash infinite
+ Per-ref reflog expiry configuration
As 1.6.0 will be a good time to make backward incompatible changes, the
tip commit makes the default expiry period of stash 'never', unless you
configure them to expire explicitly using gc.refs/stash.* variables.
Needs consensus, but I am guessing that enough people would want stash
that does not expire.
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
+ Allow per-command pager config
----------------------------------------------------------------
[Actively Cooking]
* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit
+ stash: introduce 'stash save --keep-index' option
One weakness of our "partial commit" workflow support used to be that the
user can incrementally build what is to be committed in the index but that
state cannot be tested as a whole in the working tree. This allows you to
temporarily stash the remaining changes in the working tree so that the
index state before running "stash save --keep-index" can be seen in the
working tree to be tested and then committed.
* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits
+ Add a test for "git stash branch"
+ Implement "git stash branch <newbranch> <stash>"
Creates a new branch out of the stashed state, after returning from the
interrupt that forced you to create the stash in the first place.
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
+ git-add--interactive: manual hunk editing mode
+ git-add--interactive: remove hunk coalescing
+ git-add--interactive: replace hunk recounting with apply --recount
Adds 'e/dit' action to interactive add command.
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
+ branch -r -v: do not spit out garbage
+ stat_tracking_info(): clear object flags used during counting
+ git-branch -v: show the remote tracking statistics
+ git-status: show the remote tracking statistics
+ Refactor "tracking statistics" code used by "git checkout"
Makes the "your branch is ahead of the tracked one by N commits" logic and
messages available to other commands; status and branch are updated.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
The -X<option> part may change, Dscho mentions that a single-letter -X
that take stuck option is against syntax rules, and I think he's right.
This is more "because we can", not "because we need to".
* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits
- Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
----------------------------------------------------------------
[Graduated to "master"]
* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
+ Add another fast-import example, this time for .zip files
* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
+ Only use GIT_CONFIG in "git config", not other programs
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
+ Eliminate an unnecessary chdir("..")
+ Add support for GIT_CEILING_DIRECTORIES
+ Fold test-absolute-path into test-path-utils
+ Implement normalize_absolute_path
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
+ rerere.autoupdate
+ t4200: fix rerere test
+ rerere: remove dubious "tail_optimization"
+ git-rerere: detect unparsable conflicts
+ rerere: rerere_created_at() and has_resolution() abstraction
A new configuration will allow paths that have been resolved cleanly by
rerere to be updated in the index automatically.
* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit
+ git daemon: avoid calling syslog() from a signal handler
Meant for 'maint' as well.
----------------------------------------------------------------
[On Hold]
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- [BROKEN wrt shallow clones] Ignore graft during object transfer
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
- Migrate git-blame to parse-option partially.
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
+ parse-opt: fake short strings for callers to believe in.
+ parse-opt: do not print errors on unknown options, return -2
intead.
+ parse-opt: create parse_options_step.
+ parse-opt: Export a non NORETURN usage dumper.
+ parse-opt: have parse_options_{start,end}.
I recall Pierre said something about cleaning up the last one when he
finds time, but other than that vague recollection, I lost track of this
series. I am tempted to fork a few topics off of the penúltimo one to
convert a few more commands as examples and merge the result to 'next'.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
The blame that finds where each line in the original lines moved to. This
may help a GSoC project that wants to gather statistical overview of the
history. The final presentation may need tweaking (see the log message of
the commit ""git-blame --reverse" on the series).
The tip two commits are for peeling to see what's behind the blamed
commit, which we should be able to separate out into an independent topic
from the rest.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (topics)
@ 2008-07-06 10:04 2% ` Junio C Hamano
2008-07-08 2:46 2% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2008-07-06 10:04 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 topics list the commits in reverse chronological order. The topics
meant to be applied to the maintenance series have "maint-" in their
names.
It already is beginning to become clear what 1.6.0 will look like. What's
already in 'next' all are well intentioned (I do not guarantee they are
already bug-free --- that is what cooking them in 'next' is for) and are
good set of feature enhancements. Bigger changes will be:
* Port for MinGW.
* With the default Makefile settings, most of the programs will be
installed outside your $PATH, except for "git", "gitk", "git-gui" and
some server side programs that need to be accessible for technical
reasons. Invoking a git subcommand as "git-xyzzy" from the command
line has been deprecated since early 2006 (and officially announced in
1.5.4 release notes); use of them from your scripts after adding
output from "git --exec-path" to the $PATH will still be supported in
1.6.0, but users are again strongly encouraged to adjust their
scripts to use "git xyzzy" form, as we will stop installing
"git-xyzzy" hardlinks for built-in commands in later releases.
* git-merge will be rewritten in C.
* default pack and idx versions will be updated as scheduled for some
time ago.
* GIT_CONFIG, which was only documented as affecting "git config", but
actually affected all git commands, now only affects "git config".
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
not different from GIT_CONFIG in a useful way, is removed.
----------------------------------------------------------------
[New Topics]
* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit
- [PARKED improvement suggested not rolled in] git daemon: avoid
calling syslog() from a signal handler
This will eventually appear in 'maint'; currently parked on 'pu', though.
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
- branch -r -v: do not spit out garbage
+ stat_tracking_info(): clear object flags used during counting
+ git-branch -v: show the remote tracking statistics
+ git-status: show the remote tracking statistics
+ Refactor "tracking statistics" code used by "git checkout"
Makes the "your branch is ahead of the tracked one by N commits" logic and
messages available to other commands; status and branch are updated.
* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit
- stash: introduce 'stash save --keep-index' option
One weakness of our "partial commit" workflow support used to be that the
user can incrementally build what is to be committed in the index but that
state cannot be tested as a whole in the working tree. This allows you to
temporarily stash the remaining changes in the working tree so that the
index state before running "stash save --keep-index" can be seen in the
working tree to be tested and then committed. A recommended workflow to
use after that commit is made needs to be documented (and support needs to
be added if necessary).
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
+ git-add--interactive: manual hunk editing mode
+ git-add--interactive: remove hunk coalescing
+ git-add--interactive: replace hunk recounting with apply --recount
Adds 'e/dit' action to interactive add command.
* am/stash-branch (Thu Jul 3 11:46:05 2008 +0530) 1 commit
+ Implement "git stash branch <newbranch> <stash>"
Creates a new branch out of the stashed state, after returning from the
interrupt that forced you to create the stash in the first place.
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- Ignore graft during object transfer [broken wrt shallow clones]
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
- Allow per-command pager config
----------------------------------------------------------------
[Will merge to master soon]
* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
+ Add another fast-import example, this time for .zip files
* js/apply-root (Wed Jul 2 15:28:22 2008 -0700) 2 commits
+ apply --root: thinkofix.
+ Teach "git apply" to prepend a prefix with "--root=<root>"
* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
+ Only use GIT_CONFIG in "git config", not other programs
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
+ Make default expiration period of reflog used for stash infinite
+ Per-ref reflog expiry configuration
As 1.6.0 will be a good time to make backward incompatible changes, the
tip commit makes the default expiry period of stash 'never', unless you
configure them to expire explicitly using gc.refs/stash.* variables.
Needs consensus, but I am guessing that enough people would want stash
that does not expire.
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
+ Eliminate an unnecessary chdir("..")
+ Add support for GIT_CEILING_DIRECTORIES
+ Fold test-absolute-path into test-path-utils
+ Implement normalize_absolute_path
This still feels "because we can", not "because we need to", but it came
from somebody who had the need to, and I do not think it hurts people
without the environment variable set.
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
+ rerere.autoupdate
+ t4200: fix rerere test
+ rerere: remove dubious "tail_optimization"
+ git-rerere: detect unparsable conflicts
+ rerere: rerere_created_at() and has_resolution() abstraction
A new configuration will allow paths that have been resolved cleanly by
rerere to be updated in the index automatically.
To me, this is "because we can", but was something requested by Ingo, so
presumably some people may feel it useful in their workflow.
----------------------------------------------------------------
[Actively Cooking]
* mv/merge-in-c (Tue Jul 1 04:37:50 2008 +0200) 15 commits
- [REJECT -- over-abuse of path-list] Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
The last one is still not quite there, I am afraid.
----------------------------------------------------------------
[Graduated to "master"]
* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
+ compat/pread.c: Add a forward declaration to fix a warning
+ Windows: Fix ntohl() related warnings about printf formatting
+ Windows: TMP and TEMP environment variables specify a temporary
directory.
+ Windows: Make 'git help -a' work.
+ Windows: Work around an oddity when a pipe with no reader is
written to.
+ Windows: Make the pager work.
+ When installing, be prepared that template_dir may be relative.
+ Windows: Use a relative default template_dir and ETC_GITCONFIG
+ Windows: Compute the fallback for exec_path from the program
invocation.
+ Turn builtin_exec_path into a function.
+ Windows: Use a customized struct stat that also has the st_blocks
member.
+ Windows: Add a custom implementation for utime().
+ Windows: Add a new lstat and fstat implementation based on Win32
API.
+ Windows: Implement a custom spawnve().
+ Windows: Implement wrappers for gethostbyname(), socket(), and
connect().
+ Windows: Work around incompatible sort and find.
+ Windows: Implement asynchronous functions as threads.
+ Windows: Disambiguate DOS style paths from SSH URLs.
+ Windows: A rudimentary poll() emulation.
+ Windows: Implement start_command().
+ Windows: A pipe() replacement whose ends are not inherited to
children.
+ Windows: Wrap execve so that shell scripts can be invoked.
+ Windows: Implement setitimer() and sigaction().
+ Windows: Fix PRIuMAX definition.
+ Windows: Implement gettimeofday().
+ Make my_mktime() public and rename it to tm_to_time_t()
+ Windows: Work around misbehaved rename().
+ Windows: always chmod(, 0666) before unlink().
+ Windows: A minimal implemention of getpwuid().
+ Windows: Implement a wrapper of the open() function.
+ Windows: Strip ".exe" from the program name.
+ Windows: Handle absolute paths in
safe_create_leading_directories().
+ Windows: Treat Windows style path names.
+ setup.c: Prepare for Windows directory separators.
+ Windows: Use the Windows style PATH separator ';'.
+ Add target architecture MinGW.
+ Compile some programs only conditionally.
+ Add compat/regex.[ch] and compat/fnmatch.[ch].
----------------------------------------------------------------
[On Hold]
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
- Migrate git-blame to parse-option partially.
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
+ parse-opt: fake short strings for callers to believe in.
+ parse-opt: do not print errors on unknown options, return -2
intead.
+ parse-opt: create parse_options_step.
+ parse-opt: Export a non NORETURN usage dumper.
+ parse-opt: have parse_options_{start,end}.
I recall Pierre said something about cleaning up the last one when he
finds time, but other than that vague recollection, I lost track of this
series. I am tempted to fork a few topics off of the penúltimo one to
convert a few more commands as examples and merge the result to 'next'.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
The blame that finds where each line in the original lines moved to. This
may help a GSoC project that wants to gather statistical overview of the
history. The final presentation may need tweaking (see the log message of
the commit ""git-blame --reverse" on the series).
The tip two commits are for peeling to see what's behind the blamed
commit, which we should be able to separate out into an independent topic
from the rest.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
The -X<option> part may change, Dscho mentions that a single-letter -X
that take stuck option is against syntax rules, and I think he's right.
This is more "because we can", not "because we need to".
^ permalink raw reply [relevance 2%]
* Re: performance problem: "git commit filename"
@ 2008-01-13 11:09 2% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2008-01-13 11:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List, Kristian H?gsberg
Junio C Hamano <gitster@pobox.com> writes:
> The fact that we write out a temporary index and then rebuild
> the real index means CE_UPTODATE flag we populate in the
> temporary index is lost and we still need to lstat(2) while
> building the real index, which is a bit unfortunate. I suspect
> that we can use the one-way merge to reset the index when
> building the real index after we are done building the temporary
> index, instead of discarding the in-core temporary index and
> re-reading the real index.
This comment is completely bogus. With your earlier one-way
merge fix, as the way CE_UPTODATE patch was written we preserve
in-core CE_UPTODATE bit across write_index(), the code already
should be taking advantage of an earlier lstat(2).
^ permalink raw reply [relevance 2%]
* Re: When a merge turns into a conflict
@ 2007-12-06 5:51 2% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2007-12-06 5:51 UTC (permalink / raw)
To: Anand Kumria; +Cc: git
Anand Kumria <wildfire@progsoc.org> writes:
> However when my colleague came to merge my patches in; git complained
> that the file had conflict because:
>
> a. it found the ========= AsciiDoc header line
Perhaps .git/hooks/pre-commit hook is enabled for the person who needed
to merge, fix conflicts and make a commit.
We ship the hook _disabled_ by default, but that hook inspects the
change (relative to the HEAD, which means "difference this merge brings
in relative to the state before I started the merge") and complains if
it finds lines that:
* have trailing whitespaces,
* have a SP immediately before HT in the indentation, or
* matches 7 or more <, >, or = at the beginning (i.e. <<<<<<<, =======,
or >>>>>>>, typically are conflict markers).
And the last heuristics does trigger on an AsciiDoc text.
The easiest (and standard) workaround in such a case is, after
inspecting the change yourself to make sure you are bitten by false
positive, to commit with --no-verify option:
git commit --no-verify
This bypasses the pre-commit hook.
^ permalink raw reply [relevance 2%]
* [PATCH] Documentation: quote commit messages consistently.
@ 2007-11-02 17:12 13% Sergei Organov
0 siblings, 0 replies; 58+ results
From: Sergei Organov @ 2007-11-02 17:12 UTC (permalink / raw)
To: git
Documentation quotes commit messages 14 times with double-quotes, and 7
times with single-quotes. The patch turns everything to double-quotes.
A nice side effect is that documentation becomes more Windoze-friendly
as AFAIK single quotes won't work there.
Signed-off-by: Sergei Organov <osv@javad.com>
---
Documentation/core-tutorial.txt | 8 ++++----
Documentation/everyday.txt | 4 ++--
Documentation/git-reset.txt | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt
index 5df97a1..99817c5 100644
--- a/Documentation/core-tutorial.txt
+++ b/Documentation/core-tutorial.txt
@@ -828,7 +828,7 @@ that branch, and do some work there.
------------------------------------------------
$ git checkout mybranch
$ echo "Work, work, work" >>hello
-$ git commit -m 'Some work.' -i hello
+$ git commit -m "Some work." -i hello
------------------------------------------------
Here, we just added another line to `hello`, and we used a shorthand for
@@ -853,7 +853,7 @@ hasn't happened in the `master` branch at all. Then do
------------
$ echo "Play, play, play" >>hello
$ echo "Lots of fun" >>example
-$ git commit -m 'Some fun.' -i hello example
+$ git commit -m "Some fun." -i hello example
------------
since the master branch is obviously in a much better mood.
@@ -1607,8 +1607,8 @@ in both of them. You could merge in 'diff-fix' first and then
'commit-fix' next, like this:
------------
-$ git merge -m 'Merge fix in diff-fix' diff-fix
-$ git merge -m 'Merge fix in commit-fix' commit-fix
+$ git merge -m "Merge fix in diff-fix" diff-fix
+$ git merge -m "Merge fix in commit-fix" commit-fix
------------
Which would result in:
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index 08c61b1..ce7c170 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -109,7 +109,7 @@ $ tar zxf frotz.tar.gz
$ cd frotz
$ git-init
$ git add . <1>
-$ git commit -m 'import of frotz source tree.'
+$ git commit -m "import of frotz source tree."
$ git tag v2.43 <2>
------------
+
@@ -300,7 +300,7 @@ $ git merge topic/one topic/two && git merge hold/linus <8>
$ git checkout maint
$ git cherry-pick master~4 <9>
$ compile/test
-$ git tag -s -m 'GIT 0.99.9x' v0.99.9x <10>
+$ git tag -s -m "GIT 0.99.9x" v0.99.9x <10>
$ git fetch ko && git show-branch master maint 'tags/ko-*' <11>
$ git push ko <12>
$ git push ko v0.99.9x <13>
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 15e3aca..87afa6f 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -157,7 +157,7 @@ need to get to the other branch for a quick bugfix.
------------
$ git checkout feature ;# you were working in "feature" branch and
$ work work work ;# got interrupted
-$ git commit -a -m 'snapshot WIP' <1>
+$ git commit -a -m "snapshot WIP" <1>
$ git checkout master
$ fix fix fix
$ git commit ;# commit with real log
--
1.5.3.4
^ permalink raw reply related [relevance 13%]
* Re: [PATCH] core-tutorial: Use new syntax for git-merge.
2007-10-30 19:54 14% [PATCH] core-tutorial: Use new syntax for git-merge Sergei Organov
@ 2007-10-30 20:05 0% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2007-10-30 20:05 UTC (permalink / raw)
To: Sergei Organov; +Cc: git
Sergei Organov <osv@javad.com> writes:
> The patch below turns core-tutorial to use new syntax for
> git-merge. Please take close look at the last diff chunk, -- I'm not sure I
> got it right as it didn't have HEAD in the original version, -- was it already
> wrong before the patch?
You do not want the extra 'master' there.
> @@ -1607,8 +1607,8 @@ in both of them. You could merge in 'diff-fix' first and then
> 'commit-fix' next, like this:
>
> ------------
> -$ git merge 'Merge fix in diff-fix' master diff-fix
> -$ git merge 'Merge fix in commit-fix' master commit-fix
> +$ git merge -m 'Merge fix in diff-fix' master diff-fix
> +$ git merge -m 'Merge fix in commit-fix' master commit-fix
> ------------
The example is working on 'master' branch at this point and HEAD
and 'master' are equivalent there.
^ permalink raw reply [relevance 0%]
* [PATCH] core-tutorial: Use new syntax for git-merge.
@ 2007-10-30 19:54 14% Sergei Organov
2007-10-30 20:05 0% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Sergei Organov @ 2007-10-30 19:54 UTC (permalink / raw)
To: git
The patch below turns core-tutorial to use new syntax for
git-merge. Please take close look at the last diff chunk, -- I'm not sure I
got it right as it didn't have HEAD in the original version, -- was it already
wrong before the patch?
---
Documentation/core-tutorial.txt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt
index d8e78ac..02255d8 100644
--- a/Documentation/core-tutorial.txt
+++ b/Documentation/core-tutorial.txt
@@ -878,7 +878,7 @@ script called `git merge`, which wants to know which branches you want
to resolve and what the merge is all about:
------------
-$ git merge "Merge work in mybranch" HEAD mybranch
+$ git merge -m "Merge work in mybranch" mybranch
------------
where the first argument is going to be used as the commit message if
@@ -965,7 +965,7 @@ to the `master` branch. Let's go back to `mybranch`, and run
------------
$ git checkout mybranch
-$ git merge "Merge upstream changes." HEAD master
+$ git merge -m "Merge upstream changes." master
------------
This outputs something like this (the actual commit object names
@@ -1607,8 +1607,8 @@ in both of them. You could merge in 'diff-fix' first and then
'commit-fix' next, like this:
------------
-$ git merge 'Merge fix in diff-fix' master diff-fix
-$ git merge 'Merge fix in commit-fix' master commit-fix
+$ git merge -m 'Merge fix in diff-fix' master diff-fix
+$ git merge -m 'Merge fix in commit-fix' master commit-fix
------------
Which would result in:
--
1.5.3.4
^ permalink raw reply related [relevance 14%]
* What's cooking in git.git (topics)
2007-09-26 20:05 3% ` Junio C Hamano
2007-09-26 21:44 0% ` Johannes Schindelin
2007-09-27 2:36 0% ` Jeff King
@ 2007-10-02 5:53 2% ` Junio C Hamano
2 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2007-10-02 5:53 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 topics list the commits in reverse chronological
order.
----------------------------------------------------------------
* ph/strbuf (Thu Sep 27 13:33:19 2007 +0200) 44 commits
+ Make read_patch_file work on a strbuf.
+ strbuf_read_file enhancement, and use it.
+ strbuf change: be sure ->buf is never ever NULL.
+ double free in builtin-update-index.c
+ Clean up stripspace a bit, use strbuf even more.
+ Add strbuf_read_file().
...
Will be in 'master' soon. We've seen nice linecount reduction
and the end result is rather pleasant to read.
* jc/am-quiet (Mon Oct 1 00:27:51 2007 -0700) 2 commits
+ git-am: fix typo in the previous one.
+ git-am: make the output quieter.
Response against recent "rebase being too chatty" complaints.
This should be a 'master' material.
* ap/dateformat (Fri Sep 28 15:17:45 2007 +0100) 3 commits
+ Make for-each-ref's grab_date() support per-atom formatting
+ Make for-each-ref allow atom names like "<name>:<something>"
+ parse_date_format(): convert a format name to an enum date_mode
With some test suite additions, this could go to 'master' soon.
Yes, that's a HINT, people ;-).
* je/hooks (Wed Sep 26 15:31:01 2007 -0600) 1 commit
+ post-checkout hook, tests, and docs
Will be in 'master' soon.
* db/fetch-pack (Mon Oct 1 00:59:39 2007 +0100) 49 commits
+ fetch/push: readd rsync support
+ Introduce remove_dir_recursively()
+ bundle transport: fix an alloc_ref() call
+ Allow abbreviations in the first refspec to be merged
+ Prevent send-pack from segfaulting when a branch doesn't match
+ Cleanup unnecessary break in remote.c
...
Has been cooking for quite long time.
There was a regression that made me quite unhappy about the
rewrite, but Daniel fixed it, so I should be happy. There is
another usability regression: http transport is now totally
silent. Even when you fetch daily, if the other end frequently
repacks everything into one big ball of wax like repo.or.cz
does, you will end up transferring quite a large pack every
time, and the total lack of progress report is unacceptably
unnerving. At least we should reinstate "Fetching blah from URL
using http", and preferrably "walk $object_name" lines. The
latter could be replaced with just series of CR + "walked N
commits..." if we do not like many output from the current "walk
$object_name" lines scrolling the other information away.
I am not sure the quality of "rsync" transport near the tip,
either, but at least the change should not affect other
transports. Nobody should using about rsync transport these
days anyway. Perhaps we should put a deprecation notice in the
release notes to 1.5.4, and remove it three months later.
* jc/autogc (Mon Sep 17 00:55:13 2007 -0700) 10 commits
+ git-gc --auto: run "repack -A -d -l" as necessary.
+ git-gc --auto: restructure the way "repack" command line is built.
+ git-gc --auto: protect ourselves from accumulated cruft
+ git-gc --auto: add documentation.
+ git-gc --auto: move threshold check to need_to_gc() function.
+ repack -A -d: use --keep-unreachable when repacking
+ pack-objects --keep-unreachable
+ Export matches_pack_name() and fix its return value
+ Invoke "git gc --auto" from commit, merge, am and rebase.
+ Implement git gc --auto
I think this one is reasonably sane, but I was the one who wrote
it so people should take that with a grain of salt. What it is
and isn't:
- "gc --auto" is a way to prevent you from keeping your
repository _grossly_ inefficient. Ideally, if you ever
rapacked your repository once, and do the regular repository
maintenance ("'git gc' before you leave for lunch every other
day"), it should never trigger.
- "gc --auto" is not something you can background. We do not
want to lock the repository and worry about associated stale
lock, expiry etc. The complexity is not worth it, compared
to the stated purpose above (I suspect it might already be
safe to run multiple instances at the same time, but the
effort to analyze if it is is not even worth, compared to the
stated purpose above. Just let it run synchronously if it
triggers, but it should not trigger for you).
* js/rebase-i (Tue Sep 25 16:43:15 2007 +0100) 1 commits
+ rebase -i: work on a detached HEAD
Will be in 'master', together with "gc --auto", soon.
* mv/unknown (Tue Sep 25 16:38:46 2007 +0200) 1 commit
+ Don't use "<unknown>" for placeholders and suppress printing of
empty user formats.
Will be in 'master' soon.
* lh/merge (Mon Sep 24 00:51:45 2007 +0200) 6 commits
+ git-merge: add --ff and --no-ff options
+ git-merge: add support for --commit and --no-squash
+ git-merge: add support for branch.<name>.mergeoptions
+ git-merge: refactor option parsing
+ git-merge: fix faulty SQUASH_MSG
+ Add test-script for git-merge porcelain
Will be in 'master' soon.
* jc/stash-create (Mon Jul 9 00:51:23 2007 -0700) 2 commits
+ rebase: allow starting from a dirty tree.
+ stash: implement "stash create"
Instead of refusing to rebase, telling you that your work tree
is dirty, this stashes your local changes, runs rebase and then
unstashes automatically. That _sounds_ nicer and easier to use,
but I am not sure if it is a wise/sane thing to do. We may want
to revert the "autostash" from rebase. Opinions?
* kh/commit (Mon Sep 17 20:06:47 2007 -0400)
+ Export rerere() and launch_editor().
+ Introduce entry point add_interactive and add_files_to_cache
+ Clean up stripspace a bit, use strbuf even more.
+ Add strbuf_read_file().
+ rerere: Fix use of an empty strbuf.buf
+ Small cache_tree_write refactor.
...
Stalled.
* jc/pathspec (Thu Sep 13 13:38:19 2007 -0700) 3 commits
- pathspec_can_match(): move it from builtin-ls-tree.c to tree.c
- ls-tree.c: refactor show_recursive() and rename it.
- tree-diff.c: split out a function to match a single pattern.
Stalled. This is about my pet-peeve that log (diff-tree) family
has much limited pathspec semantics. It should learn to glob
like ls-files and grep do.
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (topics)
2007-09-26 20:05 3% ` Junio C Hamano
2007-09-26 21:44 0% ` Johannes Schindelin
@ 2007-09-27 2:36 0% ` Jeff King
2007-10-02 5:53 2% ` Junio C Hamano
2 siblings, 0 replies; 58+ results
From: Jeff King @ 2007-09-27 2:36 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Wed, Sep 26, 2007 at 01:05:59PM -0700, Junio C Hamano wrote:
> * jk/diff-rename (Tue Sep 25 15:29:42 2007 -0400) 1 commit
> + diffcore-rename: cache file deltas
>
> Parked in 'next' for now but is 'master' material.
My tests after this patch show that spanhash_find is responsible for
a large portion of the processing time in large renames, so I am going
to look into speeding that up.
> * lh/merge (Mon Sep 24 00:51:45 2007 +0200) 6 commits
> + git-merge: add --ff and --no-ff options
> + git-merge: add support for --commit and --no-squash
> + git-merge: add support for branch.<name>.mergeoptions
> + git-merge: refactor option parsing
> + git-merge: fix faulty SQUASH_MSG
> + Add test-script for git-merge porcelain
>
> Comments? I personally never felt need for --no-ff but the
> series is reasonably clean so I do not see strong objection
> against this series either.
I like it. I know that --no-ff is frowned upon, but I think previous
discussions have mentioned workflows where it might be used
intelligently. Since the patch is unlikely to break anything for
traditional workflows, I think it is a nice way to let people experiment
with alternative workflows that use --no-ff. Maybe something interesting
will come of it.
-Peff
^ permalink raw reply [relevance 0%]
* Re: What's cooking in git.git (topics)
2007-09-26 20:05 3% ` Junio C Hamano
@ 2007-09-26 21:44 0% ` Johannes Schindelin
2007-09-27 2:36 0% ` Jeff King
2007-10-02 5:53 2% ` Junio C Hamano
2 siblings, 0 replies; 58+ results
From: Johannes Schindelin @ 2007-09-26 21:44 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Hi,
On Wed, 26 Sep 2007, Junio C Hamano wrote:
> * mv/unknown (Tue Sep 25 16:38:46 2007 +0200) 1 commit
> + Don't use "<unknown>" for placeholders and suppress printing of
> empty user formats.
>
> Parked in 'next'; I was already burned by it not passing one of the test
> cases, and I am not absolutely certain what else this subtly breaks.
> Hopefully minor.
I guess a few scripts could maybe rely on this behaviour. We should
advertise it as such.
> * lh/merge (Mon Sep 24 00:51:45 2007 +0200) 6 commits
> + git-merge: add --ff and --no-ff options
> + git-merge: add support for --commit and --no-squash
> + git-merge: add support for branch.<name>.mergeoptions
> + git-merge: refactor option parsing
> + git-merge: fix faulty SQUASH_MSG
> + Add test-script for git-merge porcelain
>
> Comments? I personally never felt need for --no-ff but the series is
> reasonably clean so I do not see strong objection against this series
> either.
Together with a resubmitted git-merge-rebase.sh (hint, hint), the
mergeOptions would be quite useful for a workflow where you want to rebase
on top of an upstream quite often.
> * js/rebase-i (Tue Sep 25 16:43:15 2007 +0100) 1 commit
> + rebase -i: work on a detached HEAD
>
> Waiting for autogc change as this textually interacts with it, and the
> additional convenience can wait.
Sure. I never used it anyway, but you specifically requested it ;-) BTW
thanks for merging the rest; especially the progress meter was a sore
point for me since long.
> * jc/autogc (Mon Sep 17 00:55:13 2007 -0700) 10 commits
> + git-gc --auto: run "repack -A -d -l" as necessary.
> + git-gc --auto: restructure the way "repack" command line is built.
> + git-gc --auto: protect ourselves from accumulated cruft
> + git-gc --auto: add documentation.
> + git-gc --auto: move threshold check to need_to_gc() function.
> + repack -A -d: use --keep-unreachable when repacking
> + pack-objects --keep-unreachable
> + Export matches_pack_name() and fix its return value
> + Invoke "git gc --auto" from commit, merge, am and rebase.
> + Implement git gc --auto
>
> I think the only remaining thing left with this thing is to prevent more
> than one instances of it from running at the same time. Any takers?
You mean, just creating a throw-away lock file?
> * ph/strbuf (Tue Sep 25 10:22:44 2007 +0200) 37 commits
> + Small cache_tree_write refactor.
> + Make builtin-rerere use of strbuf nicer and more efficient.
> + Add strbuf_cmp.
> + strbuf_setlen(): do not barf on setting length of an empty buffer
> to 0
> + sq_quote_argv and add_to_string rework with strbuf's.
> + Full rework of quote_c_style and write_name_quoted.
> + ...
>
> I had to make a small fix-up to strbuf_setlen() last night to this
> series; this should be ready for 'master'.
>
> And it is better to push this out early, as the series touches
> everywhere and conflicts with peoples' patches.
Hehe. Indeed, I had to fix the notes series after rebasing it...
> * db/fetch-pack (Tue Sep 25 00:13:25 2007 -0400) 45 commits
> + Prevent send-pack from segfaulting when a branch doesn't match
> + Cleanup unnecessary break in remote.c
> + Cleanup style nit of 'x == NULL' in remote.c
> + Fix memory leaks when disconnecting transport instances
> + Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
> + ...
>
> Two issues known to me are:
>
> - "rsync" transport is not supported yet;
I promised to do this, and so I will today.
> * jc/stash-create (Mon Jul 9 00:51:23 2007 -0700) 2 commits
> + rebase: allow starting from a dirty tree.
> + stash: implement "stash create"
>
> I think "stash create" is going in a good direction, but I do not think
> rebase should unstash unconditionally on the resulting work tree. A
> good compromise might be not to unstash if the user asked to switch
> branches first and to unstash if he didn't.
Sounds like a sensible change to me; maybe a little warning after the
rebase?
I have no idea if I come around to do the same for rebase--interactive any
time soon, though.
Ciao,
Dscho
^ permalink raw reply [relevance 0%]
* What's cooking in git.git (topics)
[not found] ` <7v1wd1d0le.fsf@gitster.siamese.dyndns.org>
@ 2007-09-26 20:05 3% ` Junio C Hamano
2007-09-26 21:44 0% ` Johannes Schindelin
` (2 more replies)
0 siblings, 3 replies; 58+ results
From: Junio C Hamano @ 2007-09-26 20:05 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 topics list the commits in reverse chronological
order.
* jk/diff-rename (Tue Sep 25 15:29:42 2007 -0400) 1 commit
+ diffcore-rename: cache file deltas
Parked in 'next' for now but is 'master' material.
* mv/unknown (Tue Sep 25 16:38:46 2007 +0200) 1 commit
+ Don't use "<unknown>" for placeholders and suppress printing of
empty user formats.
Parked in 'next'; I was already burned by it not passing one of
the test cases, and I am not absolutely certain what else this
subtly breaks. Hopefully minor.
* jb/remote-rm (Sun Sep 23 22:29:12 2007 -0700) 3 commits
+ git-remote rm: add tests and minor fix-ups
+ remote: document the 'rm' subcommand
+ remote: add 'rm' subcommand
Should be Ok to push out to 'master'.
* ml/submodule (Sun Sep 23 22:19:42 2007 -0400) 1 commit
+ git-submodule - allow a relative path as the subproject url
Should be Ok to push out to 'master'.
* lh/merge (Mon Sep 24 00:51:45 2007 +0200) 6 commits
+ git-merge: add --ff and --no-ff options
+ git-merge: add support for --commit and --no-squash
+ git-merge: add support for branch.<name>.mergeoptions
+ git-merge: refactor option parsing
+ git-merge: fix faulty SQUASH_MSG
+ Add test-script for git-merge porcelain
Comments? I personally never felt need for --no-ff but the
series is reasonably clean so I do not see strong objection
against this series either.
* sv/svn (Fri Sep 21 15:27:01 2007 +1200) 3 commits
+ git-svn: handle changed svn command-line syntax
+ git-svn: fix test for trunk svn (transaction out of date)
+ git-svn: fix test for trunk svn (commit message not needed)
Will merge to 'master' this weekend.
* js/rebase-i (Tue Sep 25 16:43:15 2007 +0100) 1 commit
+ rebase -i: work on a detached HEAD
Waiting for autogc change as this textually interacts with it,
and the additional convenience can wait.
* jc/autogc (Mon Sep 17 00:55:13 2007 -0700) 10 commits
+ git-gc --auto: run "repack -A -d -l" as necessary.
+ git-gc --auto: restructure the way "repack" command line is built.
+ git-gc --auto: protect ourselves from accumulated cruft
+ git-gc --auto: add documentation.
+ git-gc --auto: move threshold check to need_to_gc() function.
+ repack -A -d: use --keep-unreachable when repacking
+ pack-objects --keep-unreachable
+ Export matches_pack_name() and fix its return value
+ Invoke "git gc --auto" from commit, merge, am and rebase.
+ Implement git gc --auto
I think the only remaining thing left with this thing is to
prevent more than one instances of it from running at the same
time. Any takers?
* ph/strbuf (Tue Sep 25 10:22:44 2007 +0200) 37 commits
+ Small cache_tree_write refactor.
+ Make builtin-rerere use of strbuf nicer and more efficient.
+ Add strbuf_cmp.
+ strbuf_setlen(): do not barf on setting length of an empty buffer
to 0
+ sq_quote_argv and add_to_string rework with strbuf's.
+ Full rework of quote_c_style and write_name_quoted.
+ ...
I had to make a small fix-up to strbuf_setlen() last night to
this series; this should be ready for 'master'.
And it is better to push this out early, as the series touches
everywhere and conflicts with peoples' patches.
* db/fetch-pack (Tue Sep 25 00:13:25 2007 -0400) 45 commits
+ Prevent send-pack from segfaulting when a branch doesn't match
+ Cleanup unnecessary break in remote.c
+ Cleanup style nit of 'x == NULL' in remote.c
+ Fix memory leaks when disconnecting transport instances
+ Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
+ ...
Two issues known to me are:
- "rsync" transport is not supported yet;
- regresses "git pull <name>" using .git/remotes/<name>; does
not merge the first refspec when branch.<name>.merge is not
set.
There may be others but some people apparently use this in
production (including me) and I do not expect major breakages in
the really essential part.
* ss/svnimport (Mon Sep 24 12:57:40 2007 +0200) 1 commit
+ Fix pool handling in git-svnimport to avoid memory leaks.
This is meant to eventually go to 'maint' as well but with
diminishing user base of svnimport it is getting harder to get
good "tested successfully, seen improvements" reports.
* jc/stash-create (Mon Jul 9 00:51:23 2007 -0700) 2 commits
+ rebase: allow starting from a dirty tree.
+ stash: implement "stash create"
I think "stash create" is going in a good direction, but I do
not think rebase should unstash unconditionally on the resulting
work tree. A good compromise might be not to unstash if the
user asked to switch branches first and to unstash if he didn't.
* kh/commit (Mon Sep 17 20:06:48 2007 -0400) 7 commits
- Implement git commit as a builtin command.
- Export rerere() and launch_editor().
- Add strbuf_read_file().
- Clean up stripspace a bit, use strbuf even more.
- Introduce entry point for launching add--interactive.
- Enable wt-status to run against non-standard index file.
- Enable wt-status output to a given FILE pointer.
There were a few updates/replacements to the list I missed;
* gr/smtp (Tue Sep 25 17:27:54 2007 -0700) 2 commits
- [TO BE SQUASHED] Fix-up after review
- Add ability to specify SMTP server port when using git-send-email.
Will be in 'next'.
^ permalink raw reply [relevance 3%]
* [PATCH 0/6] per branch options for git-merge
@ 2007-09-23 22:51 2% Lars Hjemli
0 siblings, 1 reply; 58+ results
From: Lars Hjemli @ 2007-09-23 22:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
This patch-series implements support for per branch configuration of
git-merge, using entries (branch.<name>.mergeoptions) in .git/config.
Since this makes it possible to specify --no-commit and --squash as
default options for git-merge, the new options --commit and --no-squash
are added to enable users to override such defaults.
There is also a new option, --no-ff, which can be used to force git-merge
to create a merge commit even when the merge was a fast-forward (and a
matching --ff option to allow overrides).
Shortlog:
Add test-script for git-merge porcelain
git-merge: fix faulty SQUASH_MSG
git-merge: refactor option parsing
git-merge: add support for branch.<name>.mergeoptions
git-merge: add support for --commit and --no-squash
git-merge: add --ff and --no-ff options
Diffstat:
Documentation/config.txt | 6 +
Documentation/git-merge.txt | 4 +
Documentation/merge-options.txt | 17 ++
git-merge.sh | 65 +++++-
t/t7600-merge.sh | 440 +++++++++++++++++++++++++++++++++++++++
5 files changed, 521 insertions(+), 11 deletions(-)
^ permalink raw reply [relevance 2%]
* [PATCH 2/6] git-merge: fix faulty SQUASH_MSG
@ 2007-09-23 22:51 2% ` Lars Hjemli
0 siblings, 0 replies; 58+ results
From: Lars Hjemli @ 2007-09-23 22:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Only the first 'remote' head is currently specified as an argument to 'git
log' when generating a SQUSH_MSG, which makes the generated message fail
to mention every commit involved in the merge. This fixes the problem.
Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
git-merge.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh
index 3a01db0..3857634 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -59,7 +59,7 @@ finish_up_to_date () {
squash_message () {
echo Squashed commit of the following:
echo
- git log --no-merges ^"$head" $remote
+ git log --no-merges ^"$head" $remoteheads
}
finish () {
--
1.5.3.2.82.g75c8d
^ permalink raw reply related [relevance 2%]
* [ANNOUNCE] GIT 1.5.2
@ 2007-05-20 9:08 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2007-05-20 9:08 UTC (permalink / raw)
To: git; +Cc: linux-kernel
The latest feature release GIT 1.5.2 is available at the usual
places:
http://www.kernel.org/pub/software/scm/git/
git-1.5.2.tar.{gz,bz2} (tarball)
git-htmldocs-1.5.2.tar.{gz,bz2} (preformatted docs)
git-manpages-1.5.2.tar.{gz,bz2} (preformatted docs)
RPMS/$arch/git-*-1.5.2-1.$arch.rpm (RPM)
GIT v1.5.2 Release Notes
========================
Updates since v1.5.1
--------------------
* Plumbing level superproject support.
You can include a subdirectory that has an independent git
repository in your index and tree objects of your project
("superproject"). This plumbing (i.e. "core") level
superproject support explicitly excludes recursive behaviour.
The "subproject" entries in the index and trees of a superproject
are incompatible with older versions of git. Experimenting with
the plumbing level support is encouraged, but be warned that
unless everybody in your project updates to this release or
later, using this feature would make your project
inaccessible by people with older versions of git.
* Plumbing level gitattributes support.
The gitattributes mechanism allows you to add 'attributes' to
paths in your project, and affect the way certain git
operations work. Currently you can influence if a path is
considered a binary or text (the former would be treated by
'git diff' not to produce textual output; the latter can go
through the line endings conversion process in repositories
with core.autocrlf set), expand and unexpand '$Id$' keyword
with blob object name, specify a custom 3-way merge driver,
and specify a custom diff driver. You can also apply
arbitrary filter to contents on check-in/check-out codepath
but this feature is an extremely sharp-edged razor and needs
to be handled with caution (do not use it unless you
understand the earlier mailing list discussion on keyword
expansion). These conversions apply when checking files in
or out, and exporting via git-archive.
* The packfile format now optionally suports 64-bit index.
This release supports the "version 2" format of the .idx
file. This is automatically enabled when a huge packfile
needs more than 32-bit to express offsets of objects in the
pack.
* Comes with an updated git-gui 0.7.1
* Updated gitweb:
- can show combined diff for merges;
- uses font size of user's preference, not hardcoded in pixels;
- can now 'grep';
* New commands and options.
- "git bisect start" can optionally take a single bad commit and
zero or more good commits on the command line.
- "git shortlog" can optionally be told to wrap its output.
- "subtree" merge strategy allows another project to be merged in as
your subdirectory.
- "git format-patch" learned a new --subject-prefix=<string>
option, to override the built-in "[PATCH]".
- "git add -u" is a quick way to do the first stage of "git
commit -a" (i.e. update the index to match the working
tree); it obviously does not make a commit.
- "git clean" honors a new configuration, "clean.requireforce". When
set to true, this makes "git clean" a no-op, preventing you
from losing files by typing "git clean" when you meant to
say "make clean". You can still say "git clean -f" to
override this.
- "git log" family of commands learned --date={local,relative,default}
option. --date=relative is synonym to the --relative-date.
--date=local gives the timestamp in local timezone.
* Updated behavior of existing commands.
- When $GIT_COMMITTER_EMAIL or $GIT_AUTHOR_EMAIL is not set
but $EMAIL is set, the latter is used as a substitute.
- "git diff --stat" shows size of preimage and postimage blobs
for binary contents. Earlier it only said "Bin".
- "git lost-found" shows stuff that are unreachable except
from reflogs.
- "git checkout branch^0" now detaches HEAD at the tip commit
on the named branch, instead of just switching to the
branch (use "git checkout branch" to switch to the branch,
as before).
- "git bisect next" can be used after giving only a bad commit
without giving a good one (this starts bisection half-way to
the root commit). We used to refuse to operate without a
good and a bad commit.
- "git push", when pushing into more than one repository, does
not stop at the first error.
- "git archive" does not insist you to give --format parameter
anymore; it defaults to "tar".
- "git cvsserver" can use backends other than sqlite.
- "gitview" (in contrib/ section) learned to better support
"git-annotate".
- "git diff $commit1:$path2 $commit2:$path2" can now report
mode changes between the two blobs.
- Local "git fetch" from a repository whose object store is
one of the alternates (e.g. fetching from the origin in a
repository created with "git clone -l -s") avoids
downloading objects unnecessarily.
- "git blame" uses .mailmap to canonicalize the author name
just like "git shortlog" does.
- "git pack-objects" pays attention to pack.depth
configuration variable.
- "git cherry-pick" and "git revert" does not use .msg file in
the working tree to prepare commit message; instead it uses
$GIT_DIR/MERGE_MSG as other commands do.
* Builds
- git-p4import has never been installed; now there is an
installation option to do so.
- gitk and git-gui can be configured out.
- Generated documentation pages automatically get version
information from GIT_VERSION.
- Parallel build with "make -j" descending into subdirectory
was fixed.
* Performance Tweaks
- Optimized "git-rev-list --bisect" (hence "git-bisect").
- Optimized "git-add $path" in a large directory, most of
whose contents are ignored.
- Optimized "git-diff-tree" for reduced memory footprint.
- The recursive merge strategy updated a worktree file that
was changed identically in two branches, when one of them
renamed it. We do not do that when there is no rename, so
match that behaviour. This avoids excessive rebuilds.
- The default pack depth has been increased to 50, as the
recent addition of delta_base_cache makes deeper delta chains
much less expensive to access. Depending on the project, it was
reported that this reduces the resulting pack file by 10%
or so.
Fixes since v1.5.1
------------------
All of the fixes in v1.5.1 maintenance series are included in
this release, unless otherwise noted.
* Bugfixes
- Switching branches with "git checkout" refused to work when
a path changes from a file to a directory between the
current branch and the new branch, in order not to lose
possible local changes in the directory that is being turned
into a file with the switch. We now allow such a branch
switch after making sure that there is no locally modified
file nor un-ignored file in the directory. This has not
been backported to 1.5.1.x series, as it is rather an
intrusive change.
- Merging branches that have a file in one and a directory in
another at the same path used to get quite confused. We
handle such a case a bit more carefully, even though that is
still left as a conflict for the user to sort out. This
will not be backported to 1.5.1.x series, as it is rather an
intrusive change.
- git-fetch had trouble with a remote with insanely large number
of refs.
- "git clean -d -X" now does not remove non-excluded directories.
- rebasing (without -m) a series that changes a symlink to a directory
in the middle of a path confused git-apply greatly and refused to
operate.
----------------------------------------------------------------
Changes since v1.5.1 are as follows:
Adam Roben (5):
Remove usernames from all commit messages, not just when using svmprops
git-svn: Don't rely on $_ after making a function call
git-svn: Ignore usernames in URLs in find_by_url
git-svn: Added 'find-rev' command
git-svn: Add 'find-rev' command
Alex Riesen (22):
Fix passing of TCLTK_PATH to git-gui
Use rev-list --reverse in git-rebase.sh
Document -g (--walk-reflogs) option of git-log
Fix t4201: accidental arithmetic expansion
Fix permissions on test scripts
Fix overwriting of files when applying contextually independent diffs
Tests for core subproject support
Simplify calling of CR/LF conversion routines
Fix a typo in crlf conversion code
Fix crash in t0020 (crlf conversion)
Fix handle leak in write_tree
Avoid excessive rewrites in merge-recursive
Add a test for merging changed and rename-changed branches
Ignore merged status of the file-level merge
Use strlcpy instead of strncpy in mailmap.c
Fix read_mailmap to handle a caller uninterested in repo abbreviation
Remove pointless calls to access(2) when checking for .mailmap
Include mailmap.h in mailmap.c to catch mailmap interface changes
Small correction in reading of commit headers
Handle return code of parse_commit in revision machinery
Use GIT_OBJECT_DIR for temporary files of pack-objects
Allow fetching references from any namespace
Alexandre Julliard (2):
git.el: Add a commit description to the reflog.
http-fetch: Disable use of curl multi support for libcurl < 7.16.
Amos Waterland (1):
wcwidth redeclaration
Andrew Ruder (17):
Add policy on user-interface changes
Update git-am documentation
Update git-applymbox documentation
Update git-apply documentation
Update git-annotate/git-blame documentation
Update git-archive documentation
Update git-cherry-pick documentation
Fix unmatched emphasis tag in git-tutorial
Update git-config documentation
Removing -n option from git-diff-files documentation
Document additional options for git-fetch
Update git-fmt-merge documentation
Update git-grep documentation
Update -L documentation for git-blame/git-annotate
Update git-http-push documentation
Update git-local-fetch documentation
Update git-http-fetch documentation
Andy Parkins (6):
Show binary file size change in diff --stat
post-receive-email example hook: fastforward should have been fast_forward
post-receive-email example hook: detect rewind-only updates and output sensible message
post-receive-email example hook: sed command for getting description was wrong
Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs
Fix crlf attribute handling to match documentation
Andy Whitcroft (2):
fix up strtoul_ui error handling
git name-rev writes beyond the end of malloc() with large generations
Aneesh Kumar K.V (1):
gitview: annotation support
Arjen Laarhoven (5):
usermanual.txt: some capitalization nits
t3200-branch.sh: small language nit
t5300-pack-object.sh: portability issue using /usr/bin/stat
Makefile: iconv() on Darwin has the old interface
Document 'opendiff' value in config.txt and git-mergetool.txt
Brian Gernhardt (7):
Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
Fix t4200-rerere for white-space from "wc -l"
Document --left-right option to rev-list.
Distinguish branches by more than case in tests.
Remove case-sensitive file in t3030-merge-recursive.
Reverse the order of -b and --track in the man page.
Ignore all man sections as they are generated files.
Bryan Larsen (2):
Allow PERL_PATH="/usr/bin/env perl"
posix compatibility for t4200
Carl Worth (1):
Mention version 1.5.1 in tutorial and user-manual
Carlos Rica (1):
Use const qualifier for 'sha1' parameter in delete_ref function
Christian Couder (4):
Bisect: teach "bisect start" to optionally use one bad and many good revs.
Documentation: bisect: "start" accepts one bad and many good commits
Bisect: simplify "bisect start" logging.
Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".
Dana L. How (2):
Fix lseek(2) calls with args 2 and 3 swapped
Create pack-write.c for common pack writing code
Daniel Barkalow (1):
Make xstrndup common
Eric Wong (14):
git-svn: bail out on incorrect command-line options
git-svn: bail out on incorrect command-line options
git-svn: dcommit/rebase confused by patches with git-svn-id: lines
git-svn: fix log command to avoid infinite loop on long commit messages
git-svn: respect lower bound of -r/--revision when following parent
git-svn: quiet some warnings when run only with --version/--help
git-svn: don't allow globs to match regular files
perl: install private Error.pm if the site version is older than our own
git-svn: don't drop the username from URLs when dcommit is run
git-svn: clean up caching of SVN::Ra functions
git-svn: fix segfaults due to initial SVN pool being cleared
git-svn: don't attempt to minimize URLs by default
git-svn: avoid crashing svnserve when creating new directories
git-svn: don't minimize-url when doing an init that tracks multiple paths
Eygene Ryabinkin (13):
Teach gitk to use the user-defined UI font everywhere.
Improve look-and-feel of the gitk tool.
Add the WITH_P4IMPORT knob to the Makefile.
Added git-p4 package to the list of git RPMs.
Added correct Python path to the RPM specfile.
NO_TCLTK
Add --with-tcltk and --without-tcltk to configure.
Rewrite Tcl/Tk interpreter path for the GUI tools.
Eliminate checks of user-specified Tcl/Tk interpreter.
Allow wish interpreter to be defined with TCLTK_PATH
Teach git-gui to use the user-defined UI font everywhere.
Improve look-and-feel of the git-gui tool.
Do not break git-gui messages into multiple lines.
Fernando J. Pereda (1):
Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
Frank Lichtenheld (35):
cvsserver: Introduce new state variable 'method'
cvsserver: Handle three part keys in git config correctly
cvsserver: Allow to override the configuration per access method
cvsserver: Make the database backend configurable
cvsserver: Abort if connect to database fails
Documentation: Replace @@GIT_VERSION@@ in documentation
Documentation: Add version information to man pages
cvsserver: Use DBI->table_info instead of DBI->tables
cvsimport: sync usage lines with existing options
cvsimport: Improve documentation of CVSROOT and CVS module determination
cvsimport: Improve usage error reporting
cvsimport: Reorder options in documentation for better understanding
cvsimport: Improve formating consistency
cvsserver: small corrections to asciidoc documentation
cvsserver: Corrections to the database backend configuration
cvsserver: Add asciidoc documentation for new database backend configuration
gitweb: Allow forks with project list file
gitweb: Allow configuring the default projects order and add order 'none'
cvsserver: Fix handling of diappeared files on update
cvsserver: Allow to "add" a removed file
cvsserver: Reword documentation on necessity of write access
cvsserver: Document the GIT branches -> CVS modules mapping more prominently
config.txt: Document gitcvs.allbinary
config.txt: Document core.autocrlf
config.txt: Change pserver to server in description of gitcvs.*
config.txt: Fix grammatical error in description of http.noEPSV
config.txt: Add gitcvs.db* variables
git-shortlog: Fix two formatting errors in asciidoc documentation
cvsserver: Handle re-added files correctly
cvsserver: Add test cases for git-cvsserver
cvsserver: Limit config parser to needed options
cvsserver: Don't send mixed messages to clients
builtin-log.c: Fix typo in comment
Documentation: format-patch has no --mbox option
git-am: Clean up the asciidoc documentation
Geert Bosch (1):
Fix renaming branch without config file
Gerrit Pape (5):
rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
variable $projectdesc needs to be set before checking against unchanged default.
Have sample update hook not refuse deleting a branch through push.
Documentation/git-reset.txt: suggest git commit --amend in example.
gitweb: choose appropriate view for file type if a= parameter missing
Ismail Dönmez (1):
gitweb: use decode_utf8 directly
J. Bruce Fields (28):
Documentation: minor edits of git-lost-found manpage
Documentation: clarify git-checkout -f, minor editing
Documentation: clarify track/no-track option.
user-manual: fix discussion of default clone
user-manual: detached HEAD
user-manual: start revising "internals" chapter
user-manual: use detached head when rewriting history
user-manual: more discussion of detached heads, fix typos
user-manual: add section ID's
user-manual: clean up fast-forward and dangling-objects sections
user-manual: fix .gitconfig editing examples
user-manual: miscellaneous editing
user-manual: stop deprecating the manual
user-manual: fix clone and fetch typos
user-manual: revise birdseye-view chapter
glossary: expand and clarify some definitions, prune cross-references
user-manual: move quick-start to an appendix
Documentation: remove howto's now incorporated into manual
user-manual: move howto/make-dist.txt into user manual
user-manual: move howto/using-topic-branches into manual
user-manual: add a "counting commits" example
user-manual: introduce git
user-manual: listing commits reachable from some refs not others
user-manual: reorganize public git repo discussion
tutorials: add user-manual links
tutorial: revise index introduction
user-manual: discourage shared repository
user-manual: finding commits referencing given file content
Jakub Narebski (20):
gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)
gitweb: Quote hash keys, and do not use barewords keys
gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
diff format documentation: describe raw combined diff format
gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
gitweb: Add combined diff support to git_difftree_body
gitweb: Add combined diff support to git_patchset_body
gitweb: Make it possible to use pre-parsed info in git_difftree_body
gitweb: Show combined diff for merge commits in 'commitdiff' view
gitweb: Show combined diff for merge commits in 'commit' view
gitweb: Test if $from_id and $to_id are defined before comparison
gitweb: Check if requested object exists
gitweb: Fix "Use of unitialized value" warnings in empty repository
Documentation: Split description of pretty formats of commit log
gitweb: Add a few comments about %feature hash
gitweb: Do not use absolute font sizes
gitweb: Separate search regexp from search text
gitweb: Empty patch for merge means trivial merge, not no differences
gitweb: Fix error in git_patchset_body for deletion in merge commit
gitweb: Fix "Use of uninitialized value" warning in git_feed
James Bowes (2):
Document git-check-attr
Documentation: fix typo in git-remote.txt
Jan Hudec (2):
Updated documentation of hooks in git-receive-pack.
Minor fixup to documentation of hooks in git-receive-pack.
Jari Aalto (4):
Clarify SubmittingPatches Checklist
git.7: Mention preformatted html doc location
send-email documentation: clarify --smtp-server
SPECIFYING RANGES typo fix: it it => it is
Jeff King (4):
Documentation: don't reference non-existent 'git-cvsapplycommit'
git-add: allow path limiting with -u
Documentation/git-add: clarify -u with path limiting
format-patch: add MIME-Version header when we add content-type.
Jim Meyering (3):
(encode_85, decode_85): Mark source buffer pointer as "const".
sscanf/strtoul: parse integers robustly
sscanf/strtoul: parse integers robustly
Johan Herland (3):
Fix signedness on return value from xread()
Ensure return value from xread() is always stored into an ssize_t
user-manual: Add section on ignoring files
Johannes Schindelin (7):
Use print_wrapped_text() in shortlog
dir.c(common_prefix): Fix two bugs
t4201: Do not display weird characters on the terminal
import-tars: be nice to wrong directory modes
Teach import-tars about GNU tar's @LongLink extension.
import-tars: Use the "Link indicator" to identify directories
Add a birdview-on-the-source-code section to the user manual
Johannes Sixt (1):
git-gui: Call changes "Staged" and "Unstaged" in file list titles.
Jonas Fonseca (1):
git-tag(1): -v option is a subcommand; fix code block
Josh Triplett (5):
Add clean.requireForce option, and add -f option to git-clean to override it
Fix typo in git-am: s/Was is/Was it/
Create a sysconfdir variable, and use it for ETC_GITCONFIG
Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL
Julian Phillips (3):
Documentation: show-ref: document --exclude-existing
refs.c: add a function to sort a ref list, rather then sorting on add
http.c: Fix problem with repeated calls of http_init
Junio C Hamano (151):
git-fetch: add --quiet
t6002: minor spelling fix.
git-rev-list: add --bisect-vars option.
git-rev-list --bisect: optimization
t6004: add a bit more path optimization test.
rev-list --bisect: Fix "halfway" optimization.
make the previous optimization work also on path-limited rev-list --bisect
Documentation: unbreak user-manual.
Optional Tck/Tk: ignore generated files.
checkout: allow detaching to HEAD even when switching to the tip of a branch
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
git-read-tree --index-output=<file>
add_cache_entry(): removal of file foo does not conflict with foo/bar
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
unpack-trees: get rid of *indpos parameter.
Fix read-tree --prefix=dir/.
Fix twoway_merge that passed d/f conflict marker to merged_entry().
Fix switching to a branch with D/F when current branch has file D.
rerere: make sorting really stable.
RPM spec: include git-p4 in the list of all packages.
Fix dependency of common-cmds.h
Fix bogus error message from merge-recursive error path
Propagate cache error internal to refresh_cache() via parameter.
Rename internal function "add_file_to_cache" in builtin-update-index.c
Rename static variable write_index to update_index in builtin-apply.c
Rename add_file_to_index() to add_file_to_cache()
git-bisect: modernization
t6030: add a bit more tests to git-bisect
git-bisect: allow bisecting with only one bad commit.
Documentation: tighten dependency for git.{html,txt}
git-push reports the URL after failing.
git-push to multiple locations does not stop at the first failure
A new merge stragety 'subtree'.
Prepare for 1.5.1.1
Start 1.5.2 cycle by prepareing RelNotes for it.
Add Documentation/cmd-list.made to .gitignore
shortlog -w: make wrap-line behaviour optional.
t1000: fix case table.
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
merge-recursive: do not barf on "to be removed" entries.
merge-recursive: handle D/F conflict case more carefully.
t3030: merge-recursive backend test.
git-fetch--tool pick-rref
git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate
fsck: do not complain on detached HEAD.
GIT 1.5.1.1
Add %m to '--pretty=format:'
Refactor patch-id filtering out of git-cherry and git-format-patch.
git-log --cherry-pick A...B
Documentation: --cherry-pick
Fix git {log,show,...} --pretty=email
Do not default to --no-index when given two directories.
Add basic infrastructure to assign attributes to paths
Define 'crlf' attribute.
Teach 'diff' about 'diff' attribute.
Fix 'crlf' attribute semantics.
Fix 'diff' attribute semantics.
Makefile: add patch-ids.h back in.
attribute macro support
Define a built-in attribute macro "binary".
Change attribute negation marker from '!' to '-'.
send-email: do not leave an empty CC: line if no cc is present.
Make sure quickfetch is not fooled with a previous, incomplete fetch.
Allow more than true/false to attributes.
merge-recursive: separate out xdl_merge() interface.
git-gui: Honor TCLTK_PATH if supplied
Allow specifying specialized merge-backend per path.
Add a demonstration/test of customized merge.
Start preparing for 1.5.1.2
Update draft release notes for 1.5.2 with accumulated changes.
Custom low-level merge driver support.
Allow the default low-level merge driver to be configured.
Custom low-level merge driver: change the configuration scheme.
Allow low-level driver to specify different behaviour during internal merge.
Fix funny types used in attribute value representation
Counto-fix in merge-recursive
Simplify code to find recursive merge driver.
Documentation: support manual section (5) - file formats.
Update 'crlf' attribute semantics.
Document gitattributes(5)
git-add -u: match the index with working tree.
git-clone: fix dumb protocol transport to clone from pack-pruned ref
Fix bogus linked-list management for user defined merge drivers.
convert.c: restructure the attribute checking part.
lockfile: record the primary process.
GIT 1.5.1.2
Update documentation links to point at v1.5.1.2
Documentation/Makefile: fix section (5) installation
Update draft release notes for v1.5.2
pack-objects: quickfix for permission modes.
Fix 'quickfix' on pack-objects.
Update tests not to assume that generated packfiles are writable.
pack-objects: make generated packfile read-only
Support 'diff=pgm' attribute
Move index-related variables into a structure.
Make read-cache.c "the_index" free.
Document "diff=driver" attribute
t5302: avoid using tail -c
t6030: grab commit object name as we go
Build RPM with ETC_GITCONFIG=/etc/gitconfig
Diff between two blobs should take mode changes into account now.
t/test-lib.sh: Protect ourselves from common misconfiguration
gitattributes documentation: clarify overriding
applymbox & quiltimport: typofix.
Add 'ident' conversion.
Add 'filter' attribute and external filter driver definition.
Add --date={local,relative,default}
Start preparing for 1.5.1.3
Do not barf on too long action description
Update .mailmap with "Michael"
Fix import-tars fix.
blame -s: suppress author name and time.
Split out mailmap handling out of shortlog
Apply mailmap in git-blame output.
Make macros to prevent double-inclusion in headers consistent.
Make sure test-genrandom and test-chmtime are builtas part of the main build.
Fix symlink handling in git-svn, related to PerlIO
GIT v1.5.1.3
GIT v1.5.2-rc1
blame: use .mailmap unconditionally
diff.c: fix "size cache" handling.
blame: Notice a wholesale incorporation of an existing file.
blame: -C -C -C
Add test for blame corner cases.
GIT v1.5.2-rc2
diff: release blobs after generating textual diff.
diff.c: do not use a separate "size cache".
diff -M: release the preimage candidate blobs after rename detection.
diff -S: release the image after looking for needle in it
GIT v1.5.1.4
Update documentation links to point at 1.5.1.4
t9400: skip cvsserver test if Perl SQLite interface is unavailable
git-clone: don't get fooled by $PWD
.mailmap: add some aliases
GIT v1.5.2-rc3
Minor copyediting on Release Notes for 1.5.2
Add has_symlink_leading_path() function.
apply: do not get confused by symlinks in the middle
read-tree -m -u: avoid getting confused by intermediate symlinks.
checkout: allow detaching to HEAD even when switching to the tip of a branch
git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
Link to HTML version of external doc if available
Fix git-clone buglet for remote case.
Prepare for 1.5.1.5 Release Notes
gitweb: fix another use of undefined value
GIT v1.5.1.5
Add link to 1.5.1.5 release notes.
Documentation/git.txt: Update links to older documentation pages.
GIT 1.5.1.6
git-cvsserver: exit with 1 upon "I HATE YOU"
GIT 1.5.2
Junio Hamano (1):
t9400: Use the repository config and nothing else.
Karl Hasselström (2):
Fix markup in git-svn man page
Add --no-rebase option to git-svn dcommit
Lars Hjemli (3):
rename_ref(): only print a warning when config-file update fails
Make builtin-branch.c handle the git config file
git-archive: don't die when repository uses subprojects
Linus Torvalds (26):
Optimize directory listing with pathspec limiter.
diff-lib: use ce_mode_from_stat() rather than messing with modes manually
Avoid overflowing name buffer in deep directory structures
Add 'resolve_gitlink_ref()' helper function
Add "S_IFDIRLNK" file mode infrastructure for git links
Teach "fsck" not to follow subproject links
Teach core object handling functions about gitlinks
Fix thinko in subproject entry sorting
Teach directory traversal about subprojects
Teach git-update-index about gitlinks
Don't show gitlink directories when we want "other" files
Teach git list-objects logic not to follow gitlinks
Teach "git-read-tree -u" to check out submodules as a directory
Fix gitlink index entry filesystem matching
Teach git list-objects logic to not follow gitlinks
Teach "git-read-tree -u" to check out submodules as a directory
git-quiltimport complaining yet still working
Fix some "git ls-files -o" fallout from gitlinks
Expose subprojects as special files to "git diff" machinery
Add a generic "object decorator" interface, and make object refs use it
Add support for "commit name decorations" to log family of commands
Use proper object allocators for unknown object nodes too
Clean up object creation to use more common code
Fix working directory errno handling when unlinking a directory
Fix a copy-n-paste bug in the object decorator code.
Fix --boundary output
Luiz Fernando N. Capitulino (7):
ident.c: Use const qualifier for 'struct passwd' parameters
ident.c: Use size_t (instead of int) to store sizes
remove_subtree(): Use strerror() when possible
entry.c: Use const qualifier for 'struct checkout' parameters
read_cache_from(): small simplification
core-tutorial: minor fixes
init_buffer(): Kill buf pointer
Marco Costalba (1):
Fix an unmatched comment end in arm/sha1_arm.S
Martin Koegler (7):
gitweb: Show "no difference" message for empty diff
Add S_IFINVALID mode
add get_sha1_with_mode
add add_object_array_with_mode
store mode in rev_list, if <tree>:<filename> syntax is used
use mode of the tree in git-diff, if <tree>:<file> syntax is used
Fix compilation of test-delta
Matthias Kestenholz (2):
Documentation: Added [verse] to SYNOPSIS where necessary
Documentation: Reformatted SYNOPSIS for several commands
Matthias Lederhofer (1):
handle_options in git wrapper miscounts the options it handled.
Matthieu Castet (1):
Remove stale non-static-inline prototype for tree_entry_extract()
Matthieu Moy (2):
Document git add -u introduced earlier.
Added a reference to git-add in the documentation for git-update-index
Michael Hendricks (3):
Document 'git-log --decorate'
git-send-email: allow leading white space on mutt aliases
Document core.excludesfile for git-add
Michael S. Tsirkin (1):
Display the subject of the commit just made.
Michael Spang (4):
git-blame: Fix overrun in fake_working_tree_commit()
dir.c: Omit non-excluded directories with dir->show_ignored
t7300: Basic tests for git-clean
Fix minor documentation errors
Michele Ballabio (1):
git shortlog documentation: add long options and fix a typo
Nicolas Pitre (33):
clean up and optimize nth_packed_object_sha1() usage
get rid of num_packed_objects()
make overflow test on delta base offset work regardless of variable size
add overflow tests on pack offset variables
compute a CRC32 for each object as stored in a pack
compute object CRC32 with index-pack
pack-objects: learn about pack index version 2
index-pack: learn about pack index version 2
sha1_file.c: learn about index version 2
show-index.c: learn about index v2
pack-redundant.c: learn about index v2
allow forcing index v2 and 64-bit offset treshold
validate reused pack data with CRC when possible
simple random data generator for tests
use test-genrandom in tests instead of /dev/urandom
tests for various pack index features
clean up add_object_entry()
pack-objects: optimize preferred base handling a bit
pack-objects: equal objects in size should delta against newer objects
pack-objects: rework check_delta_limit usage
pack-objects: clean up list sorting
pack-objects: get rid of reuse_cached_pack
pack-objects: get rid of create_final_object_list()
pack-objects: make in_pack_header_size a variable of its own
add get_size_from_delta()
pack-objects: better check_object() performances
pack-objects: remove obsolete comments
document --index-version for index-pack and pack-objects
common progress display support
make progress "title" part of the common progress interface
provide a facility for "delayed" progress reporting
delay progress display when checking out files
add file checkout progress
OGAWA Hirofumi (1):
git-fetch: Fix "argument list too long"
Paul Mackerras (1):
gitk: Allow user to choose whether to see the diff, old file, or new file
Petr Baudis (7):
Git.pm: config_boolean() -> config_bool()
gitweb: Do not use absolute font sizes
gitweb: Normalize searchbar font size
gitweb: Add support for grep searches
gitweb: Allow arbitrary strings to be dug with pickaxe
Documentation: git-rev-list's "patterns"
gitweb: Remove redundant $searchtype setup
Quy Tonthat (4):
Add howto files to rpm packages.
Added new git-gui library files to rpm spec
RPM spec: include files in technical/ to package.
Documentation/branch: fix small typo in -D example
René Scharfe (3):
Revert "builtin-archive: use RUN_SETUP"
git-archive: make tar the default format
git-archive: convert archive entries like checkouts do
Richard P. Curnow (2):
Fix documentation of tag in git-fast-import.txt
Fix documentation of tag in git-fast-import.txt
Robin H. Johnson (12):
Add custom subject prefix support to format-patch (take 3)
Add testcase for format-patch --subject-prefix (take 3)
Document --dry-run parameter to send-email.
Prefix Dry- to the message status to denote dry-runs.
Debugging cleanup improvements
Change the scope of the $cc variable as it is not needed outside of send_message.
Perform correct quoting of recipient names.
Validate @recipients before using it for sendmail and Net::SMTP.
Ensure clean addresses are always used with Net::SMTP
Allow users to optionally specify their envelope sender.
Document --dry-run and envelope-sender for git-send-email.
Sanitize @to recipients.
Sam Vilain (1):
git-tar-tree: complete deprecation conversion message
Sami Farin (1):
fast-import: size_t vs ssize_t
Shawn O. Pearce (50):
Always bind the return key to the default button
git-gui: Brown paper bag fix division by 0 in blame
Fix lost-found to show commits only referenced by reflogs
Honor -p<n> when applying git diffs
Don't yap about merge-subtree during make
git-gui: Display the directory basename in the title
Revert "Allow wish interpreter to be defined with TCLTK_PATH"
Contribute a fairly paranoid update hook
Kill the useless progress meter in merge-recursive
Don't repack existing objects in fast-import
Cleanup variables in cat-file
git-gui: Correctly handle UTF-8 encoded commit messages
Actually handle some-low memory conditions
Don't allow empty pathnames in fast-import
Catch empty pathnames in trees during fsck
git-gui: Allow spaces in path to 'wish'
git-gui: Include the subject in the status bar after commit
git-gui: Warn users before making an octopus merge
git-gui: Correct line wrapping for too many branch message
git-gui: Cleanup common font handling for font_ui
git-gui: Use option database defaults to set the font
git-gui: Refactor to use our git proc more often
git-gui: Track our own embedded values and rebuild when they change
Reuse fixup_pack_header_footer in index-pack
Don't use seq in tests, not everyone has it
Improve request-pull to handle non-rebased branches
Properly handle '0' filenames in import-tars
git-gui: Refactor into multiple files to save my sanity
git-gui: Move console procs into their own namespace
git-gui: Allow vi keys to scroll the diff/blame regions
git-gui: Move merge support into a namespace
git-gui: Show all possible branches for merge
git-gui: Include commit id/subject in merge choices
git-gui: Use vi-like keys in merge dialog
Remove duplicate exports from Makefile
git-gui: Allow shift-{k,j} to select a range of branches to merge
git-gui: Define a simple class/method system
git-gui: Convert browser, console to "class" format
git-gui: Don't attempt to inline array reads in methods
git-gui: Convert blame to the "class" way of doing things
git-gui: Use prefix if blame is run in a subdirectory
git-gui: Smarter command line parsing for browser, blame
git-gui: Generate blame on uncommitted working tree file
git-gui: Cleanup minor nits in blame code
git-gui: Format author/committer times in ISO format
Use .git/MERGE_MSG in cherry-pick/revert
git-gui: Paperbag fix blame in subdirectory
git gui 0.7.0
Correct error message in revert/cherry-pick
git-gui: Gracefully handle bad TCL_PATH at compile time
Steffen Prohaska (4):
tiny fix in documentation of git-clone
git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
Optimized cvsexportcommit: calling 'cvs status' once instead of once per touched file.
Fixed link in user-manual
Steven Grimm (3):
Add --quiet option to suppress output of "rm" commands for removed files.
git-rm: Trivial fix for a comment typo.
Add --ignore-unmatch option to exit with zero status when no files are removed.
Theodore Ts'o (2):
Add pack.depth option to git-pack-objects.
Increase pack.depth default to 50
Tomash Brechko (1):
cvsexportcommit -p : fix the usage of git-apply -C.
Uwe Kleine-König (1):
fix importing of subversion tars
Ville Skyttä (1):
DESTDIR support for git/contrib/emacs
Xavier Maillard (2):
git-blame.el: separate git-blame-mode to ease maintenance
git-blame.el: pick a set of random colors for each git-blame turn
YOSHIFUJI Hideaki (1):
Avoid composing too long "References" header.
^ permalink raw reply [relevance 3%]
* What's in git.git (stable)
@ 2007-04-22 6:22 3% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2007-04-22 6:22 UTC (permalink / raw)
To: git
The latest maintenance release v1.5.1.2 is out.
Tonight's 'master' contains 64-bit index, core subproject
support, and gitattributes (but not the controversial "filter"
part). As I promised I'd do something about attributes some
time ago (I think it was during v1.5.1 stabilization period), I
am reasonably happy with the state of 'master' right now. The
other two major topics are also nice, unexpected bonus toward
v1.5.2 from my point of view.
Please expect stabilization cycle for v1.5.2 to start soon.
----------------------------------------------------------------
* The 'maint' branch has these fixes since the last
announcement; these are all contained in v1.5.1.2, the latest
maintenance release.
Andrew Ruder (4):
Update git-archive documentation
Update git-cherry-pick documentation
Fix unmatched emphasis tag in git-tutorial
Update git-config documentation
Andy Whitcroft (1):
fix up strtoul_ui error handling
Eric Wong (1):
perl: install private Error.pm if the site version is older than our own
Junio C Hamano (2):
git-clone: fix dumb protocol transport to clone from pack-pruned ref
GIT 1.5.1.2
Sam Vilain (1):
git-tar-tree: complete deprecation conversion message
* The 'master' branch has these since the last announcement
in addition to the above.
Alex Riesen (2):
Tests for core subproject support
Simplify calling of CR/LF conversion routines
Alexandre Julliard (1):
git.el: Add a commit description to the reflog.
Aneesh Kumar K.V (1):
gitview: annotation support
Brian Gernhardt (1):
Remove case-sensitive file in t3030-merge-recursive.
James Bowes (1):
Document git-check-attr
Julian Phillips (1):
refs.c: add a function to sort a ref list, rather then sorting on add
Junio C Hamano (30):
git-fetch--tool pick-rref
git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate
Add basic infrastructure to assign attributes to paths
Define 'crlf' attribute.
Teach 'diff' about 'diff' attribute.
Fix 'crlf' attribute semantics.
Fix 'diff' attribute semantics.
Makefile: add patch-ids.h back in.
attribute macro support
Define a built-in attribute macro "binary".
Change attribute negation marker from '!' to '-'.
Make sure quickfetch is not fooled with a previous, incomplete fetch.
Allow more than true/false to attributes.
merge-recursive: separate out xdl_merge() interface.
Allow specifying specialized merge-backend per path.
Add a demonstration/test of customized merge.
Custom low-level merge driver support.
Allow the default low-level merge driver to be configured.
Custom low-level merge driver: change the configuration scheme.
Allow low-level driver to specify different behaviour during internal merge.
Fix funny types used in attribute value representation
Counto-fix in merge-recursive
Simplify code to find recursive merge driver.
Documentation: support manual section (5) - file formats.
Update 'crlf' attribute semantics.
Document gitattributes(5)
git-add -u: match the index with working tree.
Fix bogus linked-list management for user defined merge drivers.
convert.c: restructure the attribute checking part.
lockfile: record the primary process.
Linus Torvalds (21):
diff-lib: use ce_mode_from_stat() rather than messing with modes manually
Avoid overflowing name buffer in deep directory structures
Add 'resolve_gitlink_ref()' helper function
Add "S_IFDIRLNK" file mode infrastructure for git links
Teach "fsck" not to follow subproject links
Teach core object handling functions about gitlinks
Fix thinko in subproject entry sorting
Teach directory traversal about subprojects
Teach git-update-index about gitlinks
Don't show gitlink directories when we want "other" files
Teach git list-objects logic not to follow gitlinks
Teach "git-read-tree -u" to check out submodules as a directory
Fix gitlink index entry filesystem matching
Teach git list-objects logic to not follow gitlinks
Teach "git-read-tree -u" to check out submodules as a directory
Fix some "git ls-files -o" fallout from gitlinks
Expose subprojects as special files to "git diff" machinery
Use proper object allocators for unknown object nodes too
Clean up object creation to use more common code
Fix working directory errno handling when unlinking a directory
Fix a copy-n-paste bug in the object decorator code.
Nicolas Pitre (27):
get rid of num_packed_objects()
make overflow test on delta base offset work regardless of variable size
add overflow tests on pack offset variables
compute a CRC32 for each object as stored in a pack
compute object CRC32 with index-pack
pack-objects: learn about pack index version 2
index-pack: learn about pack index version 2
sha1_file.c: learn about index version 2
show-index.c: learn about index v2
pack-redundant.c: learn about index v2
allow forcing index v2 and 64-bit offset treshold
validate reused pack data with CRC when possible
simple random data generator for tests
use test-genrandom in tests instead of /dev/urandom
tests for various pack index features
clean up add_object_entry()
pack-objects: optimize preferred base handling a bit
pack-objects: equal objects in size should delta against newer objects
pack-objects: rework check_delta_limit usage
pack-objects: clean up list sorting
pack-objects: get rid of reuse_cached_pack
pack-objects: get rid of create_final_object_list()
pack-objects: make in_pack_header_size a variable of its own
add get_size_from_delta()
pack-objects: better check_object() performances
pack-objects: remove obsolete comments
document --index-version for index-pack and pack-objects
Shawn O. Pearce (2):
Contribute a fairly paranoid update hook
Kill the useless progress meter in merge-recursive
^ permalink raw reply [relevance 3%]
* [PATCH] core-tutorial: git-merge uses -m for commit messages
@ 2007-02-05 11:34 14% Matthias Lederhofer
0 siblings, 0 replies; 58+ results
From: Matthias Lederhofer @ 2007-02-05 11:34 UTC (permalink / raw)
To: git
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
---
Documentation/core-tutorial.txt | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt
index 9c28bea..6f30e0a 100644
--- a/Documentation/core-tutorial.txt
+++ b/Documentation/core-tutorial.txt
@@ -894,11 +894,11 @@ script called `git merge`, which wants to know which branches you want
to resolve and what the merge is all about:
------------
-$ git merge "Merge work in mybranch" HEAD mybranch
+$ git merge -m "Merge work in mybranch" HEAD mybranch
------------
-where the first argument is going to be used as the commit message if
-the merge can be resolved automatically.
+The `-m` options specifies the commit message to be used for the merge commit
+(in case it is created).
Now, in this case we've intentionally created a situation where the
merge will need to be fixed up by hand, though, so git will do as much
@@ -981,7 +981,7 @@ resolve to get the "upstream changes" back to your branch.
------------
$ git checkout mybranch
-$ git merge "Merge upstream changes." HEAD master
+$ git merge -m "Merge upstream changes." HEAD master
------------
This outputs something like this (the actual commit object names
@@ -1623,8 +1623,8 @@ in both of them. You could merge in 'diff-fix' first and then
'commit-fix' next, like this:
------------
-$ git merge 'Merge fix in diff-fix' master diff-fix
-$ git merge 'Merge fix in commit-fix' master commit-fix
+$ git merge -m 'Merge fix in diff-fix' master diff-fix
+$ git merge -m 'Merge fix in commit-fix' master commit-fix
------------
Which would result in:
--
1.5.0.rc3.544.g79b8
^ permalink raw reply related [relevance 14%]
* What's in git.git (stable)
@ 2006-12-13 21:35 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2006-12-13 21:35 UTC (permalink / raw)
To: git; +Cc: linux-kernel
We have a handful fixes on 'maint'; I will be cutting v1.4.4.3 by
the end of the week.
On the 'master' front, this round has many topics (most of which
have been cooking in the 'next' branch) merged since the last
announcement.
- Johannes Schindelin's built-in shortlog is in.
- Johannes Schindelin's built-in 'RCS merge replacement' is
in. Hopefully this would make merge-recursive more portable
and faster.
- Shawn Pearce and Johannes Schindelin spotted and fixed a few
corner cases in merge-recursive.
- Updates to gitk from Paul Mackerras to fix longstanding menu
issues on Mac OS X.
- Eric Wong fixed use of rerere in many places.
- Eric also has quite a few fixes to git-svn.
- Nico updated 'git-add' to really mean 'add contents', not
'add to the set of tracked paths'. Also updated was the
documentation for 'git commit' to make it easier to teach new
people after a long discussion.
- Lars Hjemli taught 'git-branch' to rename branches.
- Andy Parkins taught 'git-branch' to be colorful.
- Robin Rosenberg improved cvsexportcommit for unusual
pathnames.
- 'git push $URL :refs/tags/that' (notice the colon) can be
used to delete 'that' tag from the remote repository; this
needs the latest git on both ends.
- branch."master".{remote,merge} configuration items are set up
by 'git-clone', thanks to Andy Parkins.
- 'git-commit' gives 'diff --summary' output to remind mode
changes and added/deleted files.
- 'git-diff --numstat' matches 'git-apply --numstat' when
talking about binary changes.
- 'git-merge' is now a first class UI, not just a mere driver
for strategies.
I am hoping that we can start a stabilization cycle for v1.5.0
based on what we have in 'master'. The theme is "usability and
teachability".
Things that need to be done to complete what have been merged to
'master' are:
- 'git-rm' needs to be fixed up as Linus outlined; remove
working tree file and index entry but have a sanity check to
make sure the working tree file match the index and HEAD.
- 'git-branch' may need to be taught about renaming the
matching per-branch configuration at the same time.
- 'git-merge-file' needs to be documented and linked from
git.txt.
- 'git-clone' probably should be updated to use wild-card in
remote.origin.fetch, instead of listing all the branches it
found when the clone was made.
- tutorials and other Porcelain documentation pages need to be
updated to match the updated 'git-add' and 'git-rm' (to be
updated), and their description should be made much less
about implementation; they should talk in terms of end-user
workflows. I will send a draft for 'git diff' out later, but
somebody needs a full sweep on Porcelain-ish documentation.
- 'git diff --index' patch should be reverted (already done in
'next'), although we may have to come up with a better
wording for --cached.
----------------------------------------------------------------
* The 'maint' branch has these fixes since v1.4.4.2.
Alex Riesen (1):
Clarify fetch error for missing objects.
Brian Gernhardt (1):
Move Fink and Ports check to after config file
Chris Wright (1):
no need to install manpages as executable
Eric Wong (2):
git-svn: exit with status 1 for test failures
git-svn: correctly display fatal() error messages
Jim Meyering (1):
Don't use memcpy when source and dest. buffers may overlap
Martin Langhoff (1):
cvsserver: Avoid miscounting bytes in Perl v5.8.x
Shawn O. Pearce (1):
Make sure the empty tree exists when needed in merge-recursive.
* The 'master' branch has these since the last announcement.
Alex Riesen (3):
git-blame: fix rev parameter handling.
Make perl/ build procedure ActiveState friendly.
Clarify fetch error for missing objects.
Andreas Ericsson (2):
ls-files: Give hints when errors happen.
git-diff: Introduce --index and deprecate --cached.
Andy Parkins (6):
Use .git/config for storing "origin" shortcut repository
Document git-repo-config --bool/--int options.
De-emphasise the symbolic link documentation.
Explicitly add the default "git pull" behaviour to .git/config on clone
Colourise git-branch output
Allow subcommand.color and color.subcommand color configuration
Brian Gernhardt (1):
Move Fink and Ports check to after config file
Chris Wright (1):
no need to install manpages as executable
David Miller (1):
Pass -M to diff in request-pull
Eric Wong (21):
git-svn: use ~/.subversion config files when using SVN:: libraries
git-svn: enable delta transfers during fetches when using SVN:: libs
git-svn: update tests for recent changes
git-svn: error out when the SVN connection fails during a fetch
git-svn: fix output reporting from the delta fetcher
git-svn: color support for the log command
git-svn: documentation updates
git-svn: fix multi-init
git-svn: avoid fetching files twice in the same revision
git-svn: avoid network timeouts for long-running fetches
git-svn: extra error check to ensure we open a file correctly
git-svn: use do_switch for --follow-parent if the SVN library supports it
rerere: add clear, diff, and status commands
rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
git-svn: enable logging of information not supported by git
git-svn: allow dcommit to take an alternate head
git-svn: correctly display fatal() error messages
git-svn: correctly handle packed-refs in refs/remotes/
git-svn: exit with status 1 for test failures
git-svn: correctly display fatal() error messages
git-svn: correctly handle "(no author)" when using an authors file
Han-Wen Nienhuys (1):
ident.c: Trim hint printed when gecos is empty.
J. Bruce Fields (4):
cvs-migration: improved section titles, better push/commit explanation
Documentation: reorganize cvs-migration.txt
Documentation: update git-clone man page with new behavior
Documentation: simpler shared repository creation
Jakub Narebski (4):
gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
git-clone: Rename --use-immingled-remote option to --no-separate-remote
Document git-diff whitespace flags -b and -w
gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
Jeff King (1):
shortlog: fix segfault on empty authorname
Jim Meyering (2):
Set permissions of each new file before "cvs add"ing it.
Don't use memcpy when source and dest. buffers may overlap
Johannes Schindelin (18):
Build in shortlog
shortlog: do not crash on parsing "[PATCH"
shortlog: read mailmap from ./.mailmap again
shortlog: handle email addresses case-insensitively
shortlog: fix "-n"
shortlog: use pager
sha1_object_info(): be consistent with read_sha1_file()
xdiff: add xdl_merge()
xdl_merge(): fix an off-by-one bug
xdl_merge(): fix thinko
git-mv: search more precisely for source directory in index
diff -b: ignore whitespace at end of line
xdl_merge(): fix and simplify conflict handling
cvs-migration document: make the need for "push" more obvious
Add builtin merge-file, a minimal replacement for RCS merge
merge-file: support -p and -q; fix compile warnings
Get rid of the dependency on RCS' merge program
merge-recursive: add/add really is modify/modify with an empty base
Josef Weidendorfer (1):
Add branch.*.merge warning and documentation update
Junio C Hamano (45):
Store peeled refs in packed-refs file.
remove merge-recursive-old
git-merge: make it usable as the first class UI
merge: allow merging into a yet-to-be-born branch.
Store peeled refs in packed-refs (take 2).
git-fetch: reuse ls-remote result.
git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
git-fetch: allow glob pattern in refspec
Allow git push to delete remote ref.
git-shortlog: fix common repository prefix abbreviation.
git-shortlog: make common repository prefix configurable with .mailmap
git-commit: show --summary after successful commit.
git-fetch: allow forcing glob pattern in refspec
fetch-pack: do not barf when duplicate re patterns are given
git-merge: tighten error checking.
git-merge: do not leak rev-parse output used for checking internally.
cvsimport: style fixup.
git blame -C: fix output format tweaks when crossing file boundary.
tutorial: talk about user.name early and don't start with commit -a
git-merge: fix confusion between tag and branch
xmerge: make return value from xdl_merge() more usable.
merge-recursive: use xdl_merge().
receive-pack: do not insist on fast-forward outside refs/heads/
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
read-tree: further loosen "working file will be lost" check.
Loosen "working file will be lost" check in Porcelain-ish
read-tree: document --exclude-per-directory
git-reset to remove "$GIT_DIR/MERGE_MSG"
git-merge: squelch needless error message.
git-merge: fix "fix confusion between tag and branch" for real
Fix perl/ build.
git-rerere: add 'gc' command.
Documentation/git-commit: rewrite to make it more end-user friendly.
git-commit: allow --only to lose what was staged earlier.
shortlog: remove "[PATCH]" prefix from shortlog output
shortlog: fix segfault on empty authorname
diff --numstat: show binary with '-' to match "apply --numstat"
add test case for recursive merge
git-push: document removal of remote ref with :<dst> pathspec
git merge: reword failure message.
spurious .sp in manpages
git-push: accept tag <tag> as advertised.
send-pack: tighten checks for remote names
branch --color: change default color selection.
config documentation: group color items together.
Lars Hjemli (3):
git-branch: add options and tests for branch renaming
rename_ref: use lstat(2) when testing for symlink
git-branch: let caller specify logmsg
Martin Langhoff (1):
cvsserver: Avoid miscounting bytes in Perl v5.8.x
Michael Loeffler (1):
git-fetch: ignore dereferenced tags in expand_refs_wildcard
Nicolas Pitre (4):
builtin git-shortlog is broken
pack-objects: remove redundent status information
make 'git add' a first class user friendly interface to the index
change the unpack limit treshold to a saner value
Paul Mackerras (1):
gitk: Fix enabling/disabling of menu items on Mac OS X
René Scharfe (1):
shortlog: remove range check
Robin Rosenberg (1):
Make cvsexportcommit work with filenames with spaces and non-ascii characters.
Sean Estabrooks (1):
Update documentation to remove incorrect GIT_DIFF_OPTS example.
Shawn O. Pearce (17):
Teach git-completion.bash how to complete git-merge.
Hide plumbing/transport commands from bash completion.
Teach bash how to complete options for git-name-rev.
Add current branch in PS1 support to git-completion.bash.
Teach bash how to complete git-format-patch.
Teach bash how to complete git-cherry-pick.
Teach bash how to complete git-rebase.
Teach bash about git log/show/whatchanged options.
Support bash completion of refs/remote.
Teach bash about git-repo-config.
Support --strategy=x completion in addition to --strategy x.
Cache the list of merge strategies and available commands during load.
Teach bash about git-am/git-apply and their whitespace options.
Teach bash how to complete long options for git-commit.
Fix broken bash completion of local refs.
Make sure the empty tree exists when needed in merge-recursive.
Remove uncontested renamed files during merge.
Uwe Zeisberger (1):
Fix documentation copy&paste typo
^ permalink raw reply [relevance 3%]
* What's in git.git (stable)
@ 2006-12-06 21:18 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2006-12-06 21:18 UTC (permalink / raw)
To: git; +Cc: linux-kernel
* The 'maint' branch has produced a new release 1.4.4.2
* In the 'master' branch:
- we now officially favor 'remotes' information to be in
$GIT_DIR/config, and 'git clone' records origin in there,
not in $GIT_DIR/remotes/origin (thanks to Andy Parkins).
- "git send-pack $URL :refs/heads/$branch" can be used to
delete a remote branch (so does "git push $URL :$ref" over
git native protocols).
- built-in shortlog lets you directly say "git shortlog
v2.6.18..master", instead of piping an output from the
corresponding "git log v2.6.18..master" into it.
- git-svn updates
- gitweb updates
- gitk updates
- bash completion updates
The shortlog since the last announcement for 'master' is:
Alex Riesen (2):
git-blame: fix rev parameter handling.
Make perl/ build procedure ActiveState friendly.
Andreas Ericsson (2):
ls-files: Give hints when errors happen.
git-diff: Introduce --index and deprecate --cached.
Andy Parkins (3):
Use .git/config for storing "origin" shortcut repository
Document git-repo-config --bool/--int options.
De-emphasise the symbolic link documentation.
David Miller (1):
Pass -M to diff in request-pull
Eric Wong (10):
git-svn: use ~/.subversion config files when using SVN:: libraries
git-svn: enable delta transfers during fetches when using SVN:: libs
git-svn: update tests for recent changes
git-svn: error out when the SVN connection fails during a fetch
git-svn: fix output reporting from the delta fetcher
git-svn: color support for the log command
git-svn: documentation updates
git-svn: fix multi-init
git-svn: avoid fetching files twice in the same revision
git-svn: avoid network timeouts for long-running fetches
Han-Wen Nienhuys (1):
ident.c: Trim hint printed when gecos is empty.
J. Bruce Fields (1):
cvs-migration: improved section titles, better push/commit explanation
Jakub Narebski (4):
gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
git-clone: Rename --use-immingled-remote option to --no-separate-remote
Document git-diff whitespace flags -b and -w
gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
Jim Meyering (1):
Set permissions of each new file before "cvs add"ing it.
Johannes Schindelin (10):
Build in shortlog
shortlog: do not crash on parsing "[PATCH"
shortlog: read mailmap from ./.mailmap again
shortlog: handle email addresses case-insensitively
shortlog: fix "-n"
shortlog: use pager
sha1_object_info(): be consistent with read_sha1_file()
git-mv: search more precisely for source directory in index
diff -b: ignore whitespace at end of line
cvs-migration document: make the need for "push" more obvious
Junio C Hamano (24):
Store peeled refs in packed-refs file.
remove merge-recursive-old
git-merge: make it usable as the first class UI
merge: allow merging into a yet-to-be-born branch.
Store peeled refs in packed-refs (take 2).
git-fetch: reuse ls-remote result.
git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
git-fetch: allow glob pattern in refspec
Allow git push to delete remote ref.
git-shortlog: fix common repository prefix abbreviation.
git-shortlog: make common repository prefix configurable with .mailmap
git-fetch: allow forcing glob pattern in refspec
fetch-pack: do not barf when duplicate re patterns are given
git-merge: tighten error checking.
git-merge: do not leak rev-parse output used for checking internally.
cvsimport: style fixup.
git blame -C: fix output format tweaks when crossing file boundary.
tutorial: talk about user.name early and don't start with commit -a
git-merge: fix confusion between tag and branch
receive-pack: do not insist on fast-forward outside refs/heads/
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
git-reset to remove "$GIT_DIR/MERGE_MSG"
git-merge: squelch needless error message.
git-merge: fix "fix confusion between tag and branch" for real
Michael Loeffler (1):
git-fetch: ignore dereferenced tags in expand_refs_wildcard
Nicolas Pitre (2):
builtin git-shortlog is broken
pack-objects: remove redundent status information
Paul Mackerras (1):
gitk: Fix enabling/disabling of menu items on Mac OS X
René Scharfe (1):
shortlog: remove range check
Sean Estabrooks (1):
Update documentation to remove incorrect GIT_DIFF_OPTS example.
Shawn O. Pearce (15):
Teach git-completion.bash how to complete git-merge.
Hide plumbing/transport commands from bash completion.
Teach bash how to complete options for git-name-rev.
Add current branch in PS1 support to git-completion.bash.
Teach bash how to complete git-format-patch.
Teach bash how to complete git-cherry-pick.
Teach bash how to complete git-rebase.
Teach bash about git log/show/whatchanged options.
Support bash completion of refs/remote.
Teach bash about git-repo-config.
Support --strategy=x completion in addition to --strategy x.
Cache the list of merge strategies and available commands during load.
Teach bash about git-am/git-apply and their whitespace options.
Teach bash how to complete long options for git-commit.
Fix broken bash completion of local refs.
^ permalink raw reply [relevance 3%]
* Re: Merging five months of Linux kernel history
2006-10-29 20:34 2% ` Junio C Hamano
@ 2006-10-30 7:50 0% ` Jan-Benedict Glaw
0 siblings, 0 replies; 58+ results
From: Jan-Benedict Glaw @ 2006-10-30 7:50 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 1818 bytes --]
On Sun, 2006-10-29 12:34:53 -0800, Junio C Hamano <junkio@cox.net> wrote:
> Jan-Benedict Glaw <jbglaw@lug-owl.de> writes:
> > Due to a move to a new flat and other reasons, I wasn't able to
> > do daily merges from Linus's tree into our vax-linux tree.
> > My time situation has improved and I want to merge all the new
> > and shiny stuff, but it seems a straight "git pull" isn't the
> > best way to do that.
> >
> > What I'd actually love to do is to go through all commits since the
> > last merge and pull/accept/cherry-pick then one by one. That way I'll
> > learn about new stuff. I'll specifically see generic changes that
> > imply arch-specific stuff, things I'll need to implement later on.
> >
> > Is there any sane way to cluse such a large gap? I don't mind looking
> > through tenthousands of commits, as long as I get a chance to spot
> > "important" ones.
>
> I think the best way is:
>
> git pull
> git log ORIG_HEAD..
>
> The latter would give your ten thousands of commits to inspect.
>
> If the pull results in a conflict, then
>
> git pull
> git log --merge
>
> ... fix conflicts ...
> git commit
> git log ORIG_HEAD..
That's the point--I don't really expect any conflicts, or only a very
little number of them. Basically, only the Makefiles and the Kconfig
files do have a chance to conflict. It's no more than a new arch/
directory and some drivers.
The hard part will be to figure out all the needed changes in arch
code, like the IRQ handling rework etc :)
MfG, JBG
--
Jan-Benedict Glaw jbglaw@lug-owl.de +49-172-7608481
Signature of: Ich hatte in letzter Zeit ein bißchen viel Realitycheck.
the second : Langsam möchte ich mal wieder weiterträumen können.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [relevance 0%]
* Re: Merging five months of Linux kernel history
@ 2006-10-29 20:34 2% ` Junio C Hamano
2006-10-30 7:50 0% ` Jan-Benedict Glaw
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2006-10-29 20:34 UTC (permalink / raw)
To: Jan-Benedict Glaw; +Cc: git
Jan-Benedict Glaw <jbglaw@lug-owl.de> writes:
> Hi!
>
> Due to a move to a new flat and other reasons, I wasn't able to
> do daily merges from Linus's tree into our vax-linux tree.
> My time situation has improved and I want to merge all the new
> and shiny stuff, but it seems a straight "git pull" isn't the
> best way to do that.
>
> What I'd actually love to do is to go through all commits since the
> last merge and pull/accept/cherry-pick then one by one. That way I'll
> learn about new stuff. I'll specifically see generic changes that
> imply arch-specific stuff, things I'll need to implement later on.
>
> Is there any sane way to cluse such a large gap? I don't mind looking
> through tenthousands of commits, as long as I get a chance to spot
> "important" ones.
I think the best way is:
git pull
git log ORIG_HEAD..
The latter would give your ten thousands of commits to inspect.
If the pull results in a conflict, then
git pull
git log --merge
... fix conflicts ...
git commit
git log ORIG_HEAD..
Since ORIG_HEAD is transient, and you probably would want to
revisit the list of these ten thousands of commits later, it
might make sense to do
git tag WHERE_WE_WERE
before "git pull" in either case.
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] GIT 1.4.1
@ 2006-07-02 6:33 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2006-07-02 6:33 UTC (permalink / raw)
To: git; +Cc: linux-kernel
The latest feature release GIT 1.4.1 is available at the usual
places:
http://www.kernel.org/pub/software/scm/git/
git-1.4.1.tar.{gz,bz2} (tarball)
git-htmldocs-1.4.1.tar.{gz,bz2} (preformatted docs)
git-manpages-1.4.1.tar.{gz,bz2} (preformatted docs)
RPMS/$arch/git-*-1.4.1-1.$arch.rpm (RPM)
As announced earlier, 1.4.1 is not just 1.4.0 plus bugfixes, but
also has enhancements from the "master" branch.
----------------------------------------------------------------
Changes since v1.4.0 are as follows:
Andre Noll:
object-refs: avoid division by zero
Andreas Ericsson:
git wrapper: fix command name in an error message.
David Woodhouse:
Log peer address when git-daemon called from inetd
Dennis Stosberg:
Make t4101-apply-nonl bring along its patches
Make t8001-annotate and t8002-blame more portable
Fix t8001-annotate and t8002-blame for ActiveState Perl
Solaris needs inclusion of signal.h for signal()
Fix pkt-line.h to compile with a non-GCC compiler
Fix expr usage for FreeBSD
Eric W. Biederman:
Don't parse any headers in the real body of an email message.
Fix git-format-patch -s
Check and document the options to prevent mistakes.
Eric Wong:
git-svn: t0000: add -f flag to checkout
git-svn: fix handling of filenames with embedded '@'
git-svn: eol_cp corner-case fixes
git-svn: restore original LC_ALL setting (or unset) for commit
git-svn: don't allow commit if svn tree is not current
git-svn: support -C<num> passing to git-diff-tree
git-svn: --branch-all-refs / -B support
git-svn: optimize --branch and --branch-all-ref
git-svn: support manually placed initial trees from fetch
git-svn: Move all git-svn-related paths into $GIT_DIR/svn
git-svn: minor cleanups, extra error-checking
git-svn: add --repack and --repack-flags= options
git-svn: add --shared and --template= options to pass to init-db
git-svn: add some functionality to better support branches in svn
git-svn: add UTF-8 message test
git-svn: add 'log' command, a facsimile of basic `svn log'
git-svn: add support for Perl SVN::* libraries
git-svn: make the $GIT_DIR/svn/*/revs directory obsolete
git-svn: avoid creating some small files
git-svn: fix several small bugs, enable branch optimization
git-svn: Eliminate temp file usage in libsvn_get_file()
git-svn: bugfix and optimize the 'log' command
git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale
git-svn: svn (command-line) 1.0.x compatibility
git-svn: rebuild convenience and bugfixes
git-svn: fix --rmdir when using SVN:: libraries
rebase: Allow merge strategies to be used when rebasing
rebase: error out for NO_PYTHON if they use recursive merge
git-svn: fix commit --edit flag when using SVN:: libraries
rebase: allow --merge option to handle patches merged upstream
rebase: cleanup rebasing with --merge
rebase: allow --skip to work with --merge
git-svn: SVN 1.1.x library compatibility
git-svn: several graft-branches improvements
git-svn: add the commit-diff command
git-svn: add --follow-parent and --no-metadata options to fetch
git-svn: be verbose by default on fetch/commit, add -q/--quiet option
rebase: get rid of outdated MRESOLVEMSG
rebase: check for errors from git-commit
git-svn: allow a local target directory to be specified for init
Florian Forster:
gitweb: Adding a `blame' interface.
gitweb: Make the `blame' interface in gitweb optional.
Remove ranges from switch statements.
Initialize FAMs using `FLEX_ARRAY'.
Don't instantiate structures with FAMs.
Cast pointers to `void *' when used in a format.
Don't use empty structure initializers.
Change types used in bitfields to be `int's.
Remove all void-pointer arithmetic.
Fredrik Kuivinen:
blame: Add --time to produce raw timestamps
Jakub Narebski:
Update gitweb README: gitweb is now included with git
Move gitweb style to gitweb.css
gitweb: safely output binary files for 'blob_plain' action
gitweb: text files for 'blob_plain' action without charset by default
Fix gitweb stylesheet
Make CSS file gitweb/gitweb.css more readable
gitweb: add type="text/css" to stylesheet link
Fix: Support for the standard mime.types map in gitweb
gitweb: A couple of page title tweaking
gitweb: style done with stylesheet
gitweb: whitespace cleanup
Add git version to gitweb output
Move $gitbin earlier in gitweb.cgi
gitweb: Make use of $PATH_INFO for project parameter
gitweb: whitespace cleanup around '='
Jeff King:
git-commit: allow -e option anywhere on command line
quote.c: silence compiler warnings from EMIT macro
Johannes Schindelin:
diff options: add --color
Initialize lock_file struct to all zero.
Fix setting config variables with an alternative GIT_CONFIG
Read configuration also from $HOME/.gitconfig
repo-config: Fix late-night bug
git_config: access() returns 0 on success, not > 0
patch-id: take "commit" prefix as well as "diff-tree" prefix
Teach diff about -b and -w flags
cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
add diff_flush_patch_id() to calculate the patch id
format-patch: introduce "--ignore-if-in-upstream"
t4014: fix for whitespace from "wc -l"
format-patch: use clear_commit_marks() instead of some ad-hockery
Save errno in handle_alias()
Junio C Hamano:
read-tree: --prefix=<path>/ option.
write-tree: --prefix=<path>
read-tree: reorganize bind_merge code.
fetch-pack: give up after getting too many "ack continue"
Fix earlier mismerges.
shared repository: optionally allow reading to "others".
gitk: rereadrefs needs listrefs
fix git alias
t5100: mailinfo and mailsplit tests.
mailinfo: ignore blanks after in-body headers.
fix rfc2047 formatter.
xdiff: minor changes to match libxdiff-0.21
Restore SIGCHLD to SIG_DFL where we care about waitpid().
checkout -f: do not leave untracked working tree files.
upload-pack: avoid sending an incomplete pack upon failure
upload-pack: prepare for sideband message support.
Retire git-clone-pack
upload-pack/fetch-pack: support side-band communication
Add renaming-rebase test.
daemon: send stderr to /dev/null instead of closing.
rebase --merge: fix for rebasing more than 7 commits.
Makefile: do not force unneeded recompilation upon GIT_VERSION changes
Makefile: do not recompile main programs when libraries have changed.
usage: minimum type fix.
git-pull: abort when fmt-merge-msg fails.
git-merge --squash
diff --color: use reset sequence when we mean reset.
repo-config: fix printing of bool
diff --color: use $GIT_DIR/config
git-repack: Be careful when updating the same pack as an existing one.
t4014: add format-patch --ignore-if-in-upstream test
combine-diff.c: type sanity
connect.c: remove unused parameters from tcp_connect and proxy_connect
connect.c: check the commit buffer boundary while parsing.
t/README: start testing porcelainish
checkout -m: fix read-tree invocation
t4014: fix test commit labels.
diff.c: fix get_patch_id()
Racy GIT (part #3)
upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
Linus Torvalds:
gitweb.cgi history not shown
Shrink "struct object" a bit
Move "void *util" from "struct object" into "struct commit"
Some more memory leak avoidance
Remove "refs" field from "struct object"
Add specialized object allocator
Add "named object array" concept
Fix grow_refs_hash()
Tweak diff colors
Do not try futile object pairs when repacking.
Abstract out accesses to object hash array
revision.c: --full-history fix.
git object hash cleanups
Lukas Sandström:
Make git-write-tree a builtin
Make git-mailsplit a builtin
Make git-mailinfo a builtin
Make git-stripspace a builtin
Make git-update-index a builtin
Make git-update-ref a builtin
Martin Langhoff:
cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
cvsimport: complete the cvsps run before starting the import
cvsimport: keep one index per branch during import
git-repack -- respect -q and be quiet
cvsimport: setup indexes correctly for ancestors and incremental imports
cvsimport - cleanup of the multi-indexes handling
Matthias Kestenholz:
add GIT-CFLAGS to .gitignore
Matthias Lederhofer:
correct documentation for git grep
Nicolas Pitre:
consider previous pack undeltified object state only when reusing delta data
don't load objects needlessly when repacking
Paul Eggert:
date.c: improve guess between timezone offset and year.
Paul Mackerras:
Fix PPC SHA1 routine for large input buffers
Peter Eriksen:
Implement safe_strncpy() as strlcpy() and use it more.
Rename safe_strncpy() to strlcpy().
Petr Baudis:
Support for extracting configuration from different files
Support for the standard mime.types map in gitweb
Customizable error handlers
Fix errno usage in connect.c
Rene Scharfe:
git-tar-tree: Simplify write_trailer()
git-tar-tree: documentation update
git-tar-tree: no more void pointer arithmetic
Make release tarballs friendlier to older tar versions
Robin Rosenberg:
Minor documentation fixup.
Sean Estabrooks:
Add a "--notags" option for git-p4import.
Sven Verdoolaege:
git-cvsexportcommit.perl: fix typo
Timo Hirvonen:
gitweb: Use $hash_base as $search_hash if possible
git-merge: Don't use -p when outputting summary
Clean up diff.c
Make some strings const
Uwe Zeisberger:
Fix possible out-of-bounds array access
Yakov Lerner:
auto-detect changed prefix and/or changed build flags
Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
Yann Dirson:
git-commit: filter out log message lines only when editor was run.
^ permalink raw reply [relevance 3%]
* Re: [PATCH] rebase --merge: fix for rebasing more than 7 commits.
2006-06-22 11:09 2% ` Eric Wong
@ 2006-06-24 7:09 2% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2006-06-24 7:09 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Eric Wong <normalperson@yhbt.net> writes:
> Junio C Hamano <junkio@cox.net> wrote:
>> Junio C Hamano <junkio@cox.net> writes:
>>
>> > * I wanted to raise my confidence level in the new rebase --merge
>> > code, so I did a little exercise which resulted in finding this
>> > buglet.
>> >...
>> > So the exercise went like this:
>> >...
>> > With this fix, the above works beautifully. I am reasonably
>> > happy with this shiny new toy. Good job, Eric! and thanks.
>
> :) Thanks for the extra QA and fix.
Another thing I noticed is while rebasing onto the mainline that
has accepted a few of the patches from the topic. The original
rebase with "git am -3" logic notices that the patch has already
been applied and drops that commit, which is rather nice, but
the new "rebase --merge" logic barfs when git-commit notices
there is nothing to commit. I think you could before calling
git-commit check if the git-merge-$strategy gave you the tree
identical to the HEAD tree, and simply skip it (maybe after
giving the user "patch already applied"message).
^ permalink raw reply [relevance 2%]
* What's in git.git and announcing v1.4.1-rc1
@ 2006-06-22 19:49 3% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2006-06-22 19:49 UTC (permalink / raw)
To: git; +Cc: linux-kernel
I've merged quite a bit of stuff and tagged the tip of "master"
as GIT 1.4.1-rc1.
As promised, 1.4.X series will be managed slightly differently,
and this is in preparation of the first installment of it. The
releases will come from the "master" branch to contain both
fixes and enhancements from now on. Hotfix releases when
necessary would have 1.4.X.Y revision numbers, but I am hoping
that we do not have to do that very often.
Since all the exciting and potentially risky developments are to
happen on the "next" branch and they are supposed to graduate to
"master" branch after they are reasonably well cooked, this
change will help the end-users to stay reasonably current
without hopefully not introducing unexpected problems. The
older scheme left out all the enhancements if people followed
packaged versions, and gave big surprises when upgrading from
version X.Y.Z to X.(Y+1).0 which was not so nice.
Notable improvements since v1.4.0 are:
- PPC SHA1 routine can grok more than half-gig of data (Paul
Mackerras)
- rev-list and object-layer in general is less (much less)
space hungry (Linus).
- the source is more friendly to stricter compilers such as
Sun's (Florian Forster).
- git rebase --merge (Eric Wong). This uses the usual 3-way
merge machinery while running rebase, and you can rebase
across renames if you use the recursive strategy which is the
default.
- gitweb updates -- mostly cleanups (Jakub Narebski with help
from Pasky and Timo Hirvonen).
- diff --color (Johannes).
- ~/.gitconfig and $ENV{GIT_CONFIG} (Pasky and Johannes).
- core.sharedrepository can take umask, group or world (Linus
and I)
- "git checkout -f" removes files that becomes untracked from
the working tree
- "git clone/fetch" from a corrupt repository does not
propagate brokenness to the downloaders.
- "git clone/fetch" over the network gives better progress
updates; this may also help TCP timeout problems for people
behind NAT.
- Many more commands are built-in (Lukas Sandström)
- git can now be used on Kiritimati (Paul Eggert)
----------------------------------------------------------------
* The 'master' branch has these since the last announcement.
Andre Noll:
object-refs: avoid division by zero
David Woodhouse:
Log peer address when git-daemon called from inetd
Dennis Stosberg:
Make t8001-annotate and t8002-blame more portable
Fix t8001-annotate and t8002-blame for ActiveState Perl
Eric W. Biederman:
Fix git-format-patch -s
Check and document the options to prevent mistakes.
Eric Wong:
git-svn: fix --rmdir when using SVN:: libraries
rebase: Allow merge strategies to be used when rebasing
rebase: error out for NO_PYTHON if they use recursive merge
git-svn: fix commit --edit flag when using SVN:: libraries
Florian Forster:
Remove ranges from switch statements.
Initialize FAMs using `FLEX_ARRAY'.
Don't instantiate structures with FAMs.
Cast pointers to `void *' when used in a format.
Don't use empty structure initializers.
Change types used in bitfields to be `int's.
Remove all void-pointer arithmetic.
Jakub Narebski:
Move gitweb style to gitweb.css
gitweb: safely output binary files for 'blob_plain' action
gitweb: text files for 'blob_plain' action without charset by default
Fix gitweb stylesheet
Make CSS file gitweb/gitweb.css more readable
gitweb: add type="text/css" to stylesheet link
Fix: Support for the standard mime.types map in gitweb
gitweb: A couple of page title tweaking
gitweb: style done with stylesheet
gitweb: whitespace cleanup
Add git version to gitweb output
Move $gitbin earlier in gitweb.cgi
gitweb: Make use of $PATH_INFO for project parameter
gitweb: whitespace cleanup around '='
Johannes Schindelin:
diff options: add --color
Initialize lock_file struct to all zero.
Fix setting config variables with an alternative GIT_CONFIG
Read configuration also from $HOME/.gitconfig
repo-config: Fix late-night bug
git_config: access() returns 0 on success, not > 0
Junio C Hamano:
read-tree: --prefix=<path>/ option.
write-tree: --prefix=<path>
read-tree: reorganize bind_merge code.
fetch-pack: give up after getting too many "ack continue"
shared repository: optionally allow reading to "others".
fix rfc2047 formatter.
xdiff: minor changes to match libxdiff-0.21
Restore SIGCHLD to SIG_DFL where we care about waitpid().
checkout -f: do not leave untracked working tree files.
upload-pack: avoid sending an incomplete pack upon failure
upload-pack: prepare for sideband message support.
Retire git-clone-pack
upload-pack/fetch-pack: support side-band communication
Add renaming-rebase test.
daemon: send stderr to /dev/null instead of closing.
rebase --merge: fix for rebasing more than 7 commits.
Makefile: do not force unneeded recompilation upon GIT_VERSION changes
Linus Torvalds:
Shrink "struct object" a bit
Move "void *util" from "struct object" into "struct commit"
Some more memory leak avoidance
Remove "refs" field from "struct object"
Add specialized object allocator
Add "named object array" concept
Fix grow_refs_hash()
Lukas Sandström:
Make git-write-tree a builtin
Make git-mailsplit a builtin
Make git-mailinfo a builtin
Make git-stripspace a builtin
Make git-update-index a builtin
Make git-update-ref a builtin
Paul Eggert:
date.c: improve guess between timezone offset and year.
Paul Mackerras:
Fix PPC SHA1 routine for large input buffers
Petr Baudis:
Support for extracting configuration from different files
Support for the standard mime.types map in gitweb
Rene Scharfe:
git-tar-tree: Simplify write_trailer()
git-tar-tree: documentation update
git-tar-tree: no more void pointer arithmetic
Make release tarballs friendlier to older tar versions
Timo Hirvonen:
gitweb: Use $hash_base as $search_hash if possible
Uwe Zeisberger:
Fix possible out-of-bounds array access
Yakov Lerner:
auto-detect changed prefix and/or changed build flags
Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
* The 'pu' branch, in addition, has these.
Johannes Schindelin:
Teach diff about -b and -w flags
Lukas Sandström:
Make it possible to call cmd_apply multiple times
Make git-am a builtin
^ permalink raw reply [relevance 3%]
* Re: [PATCH] rebase --merge: fix for rebasing more than 7 commits.
2006-06-22 8:54 2% ` Junio C Hamano
@ 2006-06-22 11:09 2% ` Eric Wong
2006-06-24 7:09 2% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Eric Wong @ 2006-06-22 11:09 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Junio C Hamano <junkio@cox.net> wrote:
> Junio C Hamano <junkio@cox.net> writes:
>
> > * I wanted to raise my confidence level in the new rebase --merge
> > code, so I did a little exercise which resulted in finding this
> > buglet.
> >...
> > So the exercise went like this:
> >...
> > With this fix, the above works beautifully. I am reasonably
> > happy with this shiny new toy. Good job, Eric! and thanks.
:) Thanks for the extra QA and fix.
> By the way, I do not quite understand the reasoning behind not
> moving the head being rebased until the finalization phase.
That's because my original patch that only used git-merge, which didn't
let me manually commit with all the information from a previous commit.
> Also I think --skip would be straightforward. What you look at
> in call_merge() is the current HEAD, the commit being rebased
> and its direct parent (actually what you are interested in are
> trees of these commits and not ancestry chains among them -- if
> we can tell git-merge-recursive not to try its own "recursive"
> merge base finding but just use what we give it as the base, I
> could sleep better. I think the current code could misbehave in
> funnier ancestry graph if we allow it to pick merge base on its
> own), so skipping is just a matter of, eh, skipping the commit.
Another consequence of relying on plain git-merge in my original
patch. --skip should be very doable now that we can specify
the correct base. I'll look into it more when I'm more awake.
--
Eric Wong
^ permalink raw reply [relevance 2%]
* Re: [PATCH] rebase --merge: fix for rebasing more than 7 commits.
2006-06-22 8:44 1% [PATCH] rebase --merge: fix for rebasing more than 7 commits Junio C Hamano
@ 2006-06-22 8:54 2% ` Junio C Hamano
2006-06-22 11:09 2% ` Eric Wong
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2006-06-22 8:54 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Junio C Hamano <junkio@cox.net> writes:
> * I wanted to raise my confidence level in the new rebase --merge
> code, so I did a little exercise which resulted in finding this
> buglet.
>...
> So the exercise went like this:
>...
> With this fix, the above works beautifully. I am reasonably
> happy with this shiny new toy. Good job, Eric! and thanks.
By the way, I do not quite understand the reasoning behind not
moving the head being rebased until the finalization phase.
Also I think --skip would be straightforward. What you look at
in call_merge() is the current HEAD, the commit being rebased
and its direct parent (actually what you are interested in are
trees of these commits and not ancestry chains among them -- if
we can tell git-merge-recursive not to try its own "recursive"
merge base finding but just use what we give it as the base, I
could sleep better. I think the current code could misbehave in
funnier ancestry graph if we allow it to pick merge base on its
own), so skipping is just a matter of, eh, skipping the commit.
^ permalink raw reply [relevance 2%]
* [PATCH] rebase --merge: fix for rebasing more than 7 commits.
@ 2006-06-22 8:44 1% Junio C Hamano
2006-06-22 8:54 2% ` Junio C Hamano
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2006-06-22 8:44 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Instead of using 4-digit numbers to name commits being rebased,
just use "cmt.$msgnum" string, with $msgnum as a decimal number
without leading zero padding. This makes it possible to rebase
more than 9999 commits, but of more practical importance is that
the earlier code used "printf" to format already formatted
$msgnum and barfed when it counted up to 0008. In other words,
the old code was incapable of rebasing more than 7 commits, and
this fixes that problem.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* I wanted to raise my confidence level in the new rebase --merge
code, so I did a little exercise which resulted in finding this
buglet.
I did not have "read/write-tree --prefix" on the "master"
branch, when I received the patch series that begins with
"Make git-write-tree a builtin" from Lukas. Now, my policy
is to avoid starting a new topic based on "next" (because it
would make later pulling in the topic into "master" without
all the other uncooked stuff in "next" impossible), but the
series was based on "next" (which was actually nice, since
write-tree between "master" and "next" were somewhat diverged
back then), and I couldn't easily rebase Lukas's patch series
on top of "master" because we did not have "rebase --merge"
option. Now I can with the updated "rebase".
So the exercise went like this:
(1) Start from a clone of git.git, with "master" at 8c278ab
(where the "master" was before "read/write-tree --prefix"
was merged), and "ls/am" at ab195e1 (what applying
Lukas's series on top of "next" would have produced).
Use "reset --hard" as needed.
(2) "git rebase --merge --onto master ls/am~9" (ls/am~8 being
the first one of the series). This fails with a merge
conflict on builtin-write-tree.c (the "rebase --merge"
code did the right thing with the renamed path). Fix it
up and also fix builtin.h (signature of write_tree()
needs to be changed to drop prefix).
It was very helpful to view:
git diff :3:builtin-write-tree.c builtin-write-tree.c
during the hand resolution of the conflicts; it lets me
see what Lukas did, so I can adjust the patch by removing
parts that are specific to "next" and not applicable to
"master".
(3) "git update-index builtin-write-tree.c builtin.h" and then
"git rebase --continue". The bug manifests itself during
the finalization step, which this commit fixes.
With this fix, the above works beautifully. I am reasonably
happy with this shiny new toy. Good job, Eric! and thanks.
git-rebase.sh | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index b9ce112..9159477 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -67,16 +67,16 @@ continue_merge () {
prev_head=`git-rev-parse HEAD^0`
# save the resulting commit so we can read-tree on it later
- echo "$prev_head" > "$dotest/`printf %0${prec}d $msgnum`.result"
+ echo "$prev_head" > "$dotest/cmt.$msgnum.result"
echo "$prev_head" > "$dotest/prev_head"
# onto the next patch:
msgnum=$(($msgnum + 1))
- printf "%0${prec}d" "$msgnum" > "$dotest/msgnum"
+ echo "$msgnum" >"$dotest/msgnum"
}
call_merge () {
- cmt="$(cat $dotest/`printf %0${prec}d $1`)"
+ cmt="$(cat $dotest/cmt.$1)"
echo "$cmt" > "$dotest/current"
git-merge-$strategy "$cmt^" -- HEAD "$cmt"
rv=$?
@@ -108,15 +108,12 @@ finish_rb_merge () {
end="`cat $dotest/end`"
while test "$msgnum" -le "$end"
do
- msgnum=`printf "%0${prec}d" "$msgnum"`
- printf "%0${prec}d" "$msgnum" > "$dotest/msgnum"
-
- git-read-tree `cat "$dotest/$msgnum.result"`
+ git-read-tree `cat "$dotest/cmt.$msgnum.result"`
git-checkout-index -q -f -u -a
- git-commit -C "`cat $dotest/$msgnum`"
+ git-commit -C "`cat $dotest/cmt.$msgnum`"
- echo "Committed $msgnum"
- echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
+ printf "Committed %0${prec}d" $msgnum
+ echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
sed 's/^[a-f0-9]\+ //'`
msgnum=$(($msgnum + 1))
done
@@ -322,11 +319,11 @@ for cmt in `git-rev-list --no-merges "$u
| perl -e 'print reverse <>'`
do
msgnum=$(($msgnum + 1))
- echo "$cmt" > "$dotest/`printf "%0${prec}d" $msgnum`"
+ echo "$cmt" > "$dotest/cmt.$msgnum"
done
-printf "%0${prec}d" 1 > "$dotest/msgnum"
-printf "%0${prec}d" "$msgnum" > "$dotest/end"
+echo 1 >"$dotest/msgnum"
+echo $msgnum >"$dotest/end"
end=$msgnum
msgnum=1
--
1.4.0.gfba6
^ permalink raw reply related [relevance 1%]
* [ANNOUNCE] GIT 1.4.0
@ 2006-06-10 21:16 2% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2006-06-10 21:16 UTC (permalink / raw)
To: git; +Cc: linux-kernel
The latest feature release GIT 1.4.0 is available at the
usual places:
http://www.kernel.org/pub/software/scm/git/
git-1.4.0.tar.{gz,bz2} (tarball)
git-htmldocs-1.4.0.tar.{gz,bz2} (preformatted documentation)
git-manpages-1.4.0.tar.{gz,bz2} (preformatted documentation)
RPMS/$arch/git-*-1.4.0-1.$arch.rpm (RPM)
This is a significant update since v1.3.0 (and v1.3.3 which is
the same codebase with bugfixes-only). User visible changes
are:
- Many commands are now coded in C instead of implemented as
shell scripts.
- Checkout is more careful not to clobber untracked files.
- You can "alias" git commands with leading arguments in your
configuration file.
- Documentation set, especially the tutorial, has been reworked.
- Comes with the latest gitk, gitweb, and contributed software.
----------------------------------------------------------------
Changes since v1.3.0 are as follows:
Alex Riesen:
make update-index --chmod work with multiple files and --stdin
remove superflous "const"
Aneesh Kumar K.V:
gitview: Add key binding for F5.
gitview: Move the console error messages to message dialog
gitview: Add some useful keybindings.
Ben Clifford:
include header to define uint32_t, necessary on Mac OS X
Björn Engelmann:
remove the artificial restriction tagsize < 8kb
add more informative error messages to git-mktag
Catalin Marinas:
Add a test-case for git-apply trying to add an ending line
Christian Couder:
Builtin git-rev-parse.
Dennis Stosberg:
Fix git-pack-objects for 64-bit platforms
Fix compilation on newer NetBSD systems
git-write-tree writes garbage on sparc64
git-clean fails on files beginning with a dash
Update documentation for git-format-patch
Dmitry V. Levin:
Separate object name errors from usage errors
execv_git_cmd: Fix stack buffer overflow.
git_exec_path, execv_git_cmd: ignore empty environment variables
Elrond:
git-cvsimport: Handle "Removed" from pserver
Eric W. Biederman:
Implement git-quiltimport
Implement a --dry-run option to git-quiltimport
Make read_one_header_line return a flag not a length.
Move B and Q decoding into check header.
Refactor commit messge handling.
In handle_body only read a line if we don't already have one.
More accurately detect header lines in read_one_header_line
Allow in body headers beyond the in body header prefix.
Eric Wong:
git-svn: documentation updates
git-svn 1.0.0
apply: fix infinite loop with multiple patches with --index
send-email: address expansion for common mailers
Install git-send-email by default
send-email: allow sendmail binary to be used instead of SMTP
send-email: quiet some warnings, reject invalid addresses
Install git-send-email by default
commit: allow --pretty= args to be abbreviated
git-svn: starting a 1.1.0-pre development version
git-svn: ignore expansion of svn:keywords
t3300-funny-names: shell portability fixes
tests: Remove heredoc usage inside quotes
t5500-fetch-pack: remove local (bashism) usage.
t6000lib: workaround a possible dash bug
git-svn: t0001: workaround a heredoc bug in old versions of dash
git-svn: remove assertion that broke with older versions of svn
Florian Forster:
git-svnimport: Improved detection of merges.
Francis Daly:
Some doc typo fixes
config.txt grammar, typo, and asciidoc fixes
git-cvsserver asciidoc formatting tweaks
Fredrik Kuivinen:
blame: Fix path pruning
Update the documentation for git-merge-base
Horst H. von Brand:
Documentation: Spelling fixes
Cleanup git-send-email.perl:extract_valid_email
Add example xinetd(8) configuration to Documentation/everyday.txt
Fix Documentation/everyday.txt: Junio's workflow
Fix formatting of Documentation/git-clone.txt
Horst von Brand:
Fix some documentation typoes
Huw Davies:
git-format-patch: Use rfc2822 compliant date.
J. Bruce Fields:
tutorial: replace "whatchanged" by "log"
tutorial: expanded discussion of commit history
tutorial: add discussion of index file, object database
documentation: mention gitk font adjustment in tutorial
documentation: add brief mention of cat-file to tutorial part I
Documentation: retitle the git-core tutorial
Documentation: fix a tutorial-2 typo
Jeff King:
cvsimport: use git-update-index --index-info
cvsimport: cleanup commit function
cvsimport: set up commit environment in perl instead of using env
cat-file: document -p option
cvsimport: avoid "use" with :tag
handle concurrent pruning of packed objects
sha1_file: avoid re-preparing duplicate packs
Jim Meyering:
Don't write directly to a make target ($@).
Johannes Schindelin:
builtin-push: resurrect parsing of Push: lines
cache-tree: replace a sscanf() by two strtol() calls
builtin-push: also ask config for remote information
fetch, pull: ask config for remote information
repo-config: fix segfault with no argument.
repo-config: trim white-space before comment
repo-config: support --get-regexp
repo-config: deconvolute logics
fetch, pull: ask config for remote information
Add a conversion tool to migrate remote information into the config
builtin-push: --all and --tags _are_ explicit refspecs
Teach fmt-patch to write individual files.
fmt-patch: output file names to stdout
fmt-patch: implement -o <dir>
Teach fmt-patch about --numbered
Teach fmt-patch about --keep-subject
repo-config: trim white-space before comment
fmt-patch: understand old <his> notation
Fix users of prefix_path() to free() only when necessary
Fix users of prefix_path() to free() only when necessary
Fix crash when reading the empty tree
diff family: add --check option
fmt-patch: Support --attach
git-format-patch --start-number <n>
send-email: only 'require' instead of 'use' Net::SMTP
format-patch: resurrect extra headers from config
If you have a config containing something like this:
Jon Loeliger:
Alphabetize the glossary.
Added definitions for a few words:
Add a few more words to the glossary.
Refactor git_tcp_connect() functions a little.
Jonas Fonseca:
Fix filename scaling for binary files
Misc doc improvements
Document git-ls-tree --fullname
Josef Weidendorfer:
gitk: Add a visual tag for remote refs
Junio C Hamano:
Fix up default abbrev in setup_revisions() argument parser.
Fix up rev-list option parsing.
Split init_revisions() out of setup_revisions()
rev-list option parser fix.
Built-in git-whatchanged.
Do not fork PAGER=cat
Simplify common default options setup for built-in log family.
log/whatchanged/show - log formatting cleanup.
rev-list --header: output format fix
git.c: LOGSIZE is unused after log printing cleanup.
combine-diff: show diffstat with the first parent.
Fix "git log --stat": make sure to set recursive with --stat.
Tentative built-in format-patch.
sha1_name.c: prepare to make get_tree_entry() reusable from others.
sha1_name.c: no need to include diff.h; tree-walk.h will do.
get_tree_entry(): make it available from tree-walk
Minor tweak on subject line in --pretty=email
git-merge: a bit more readable user guidance.
pre-commit hook: complain about conflict markers.
diff: move diff.c to diff-lib.c to make room.
Add git-unresolve <paths>...
diff --stat: do not drop rename information.
git-update-index --unresolve
git-commit --amend: two fixes.
rename internal format-patch wip
pack-objects: do not stop at object that is "too small"
mailinfo: decode underscore used in "Q" encoding properly.
Makefile: dependency for builtin-help.o
Add colordiff for git to contrib/colordiff.
Fix "git show --stat"
Libify diff-files.
Libify diff-index.
git-fmt-patch: thinkofix to show properly.
Libified diff-index: backward compatibility fix.
read-cache/write-cache: optionally return cache checksum SHA1.
Add cache-tree.
Update write-tree to use cache-tree.
Invalidate cache-tree entries for touched paths in git-apply.
Use cache-tree in update-index.
Add test-dump-cache-tree
cache-tree: protect against "git prune".
index: make the index file format extensible.
Teach fsck-objects about cache-tree.
cache-tree: sort the subtree entries.
test-dump-cache-tree: report number of subtrees.
Makefile: remove and create libgit.a from scratch.
diff --stat: show complete rewrites consistently.
git-cvsserver: typofixes
t0000-basic: Add ls-tree recursive test back.
Makefile: remove and create xdiff library from scratch.
commit-tree: allow generic object name for the tree as well.
rebase: typofix.
commit-tree.c: check_valid() microoptimization.
revision parsing: make "rev -- paths" checks stronger.
t0000-basic: more commit-tree tests.
update-index: when --unresolve, smudge the relevant cache-tree entries.
read-tree: teach 1 and 2 way merges about cache-tree.
read-tree: teach 1-way merege and plain read to prime cache-tree.
diff-index: fix compilation warnings.
verify-pack: check integrity in a saner order.
cache_tree_update: give an option to update cache-tree only.
test-dump-cache-tree: validate the cached data as well.
pack-objects: update size heuristucs.
built-in count-objects.
cache-tree.c: typefix
git-am --resolved: more usable error message.
built-in diff.
built-in diff: assorted updates.
builtin-diff.c: die() formatting type fix.
Fix builtin-push to honor Push: lines in remotes file.
Extended SHA1 -- "rev^@" syntax to mean "all parents"
get_sha1(): :path and :[0-3]:path to extract from index.
built-in "git grep"
Use RFC2822 dates from "git fmt-patch".
builtin-grep: wildcard pathspec fixes
builtin-grep: support '-l' option.
builtin-grep: do not use setup_revisions()
fsck-objects: mark objects reachable from cache-tree
builtin-count-objects: make it official.
builtin-diff: call it "git-diff", really.
builtin-log/whatchanged/show: make them official.
show-branch: omit uninteresting merges.
builtin-push: make it official.
builtin-grep: printf %.*s length is int, not ptrdiff_t.
Revert "fetch, pull: ask config for remote information"
builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
builtin-grep: allow more than one patterns.
builtin-grep: support -c (--count).
builtin-grep: support -w (--word-regexp).
builtin-grep: tighten path wildcard vs tree traversal.
core.prefersymlinkrefs: use symlinks for .git/HEAD
repo-config: readability fixups.
builtin-count-objects: open packs when running -v
Fix test-dump-cache-tree in one-tree disappeared case.
read-tree: invalidate cache-tree entry when a new index entry is added.
cache-tree: a bit more debugging support.
builtin-grep: terminate correctly at EOF
builtin-grep: binary files -a and -I
fsck-objects: do not segfault on missing tree in cache-tree
builtin-grep: -L (--files-without-match).
Makefile: do not link rev-list any specially.
delta: stricter constness
core.prefersymlinkrefs: use symlinks for .git/HEAD
pack-object: squelch eye-candy on non-tty
binary patch.
binary diff: further updates.
update-index --unresolve: work from a subdirectory.
checkout-index: plug memory leak from prefix_path()
update-index: plug memory leak from prefix_path()
update-index --again
update-index --again: take optional pathspecs
binary diff and apply: testsuite.
repo-config: document what value_regexp does a bit more clearly.
Fix repo-config set-multivar error return path.
Teach -f <file> option to builtin-grep.
builtin-grep: documentation
Documentation: {caret} fixes (git-rev-list.txt)
get_sha1() - fix infinite loop on nonexistent stage.
Teach git-clean optional <paths>... parameters.
builtin-grep: tighten argument parsing.
builtin-grep: typofix
builtin-grep: -w fix
builtin-grep: -F (--fixed-strings)
checkout: use --aggressive when running a 3-way merge (-m).
checkout: use --aggressive when running a 3-way merge (-m).
diffstat rename squashing fix.
read-tree -u one-way merge fix to check out locally modified paths.
apply --numstat: show new name, not old name.
Fix pack-index issue on 64-bit platforms a bit more portably.
builtin-grep: unparse more command line options.
apply --cached: apply a patch without using working tree.
git-am: use apply --cached
builtin-diff: fix comparison between two blobs.
merge-base: Clarify the comments on post processing.
read-tree -m -u: do not overwrite or remove untracked working tree files.
builtin-grep: workaround for non GNU grep.
Revert "builtin-grep: workaround for non GNU grep."
apply --cached: do not check newly added file in the working tree
builtin-add: fix unmatched pathspec warnings.
builtin-diff: do not say files are renamed when blob and file are given
Fix build procedure for builtin-init-db
built-in tar-tree and remote tar-tree
git-format-patch: now built-in.
checkdiff_consume: strtol parameter fix.
git-rebase: use canonical A..B syntax to format-patch
tutorial-2: typofix in examples.
mailinfo: skip bogus UNIX From line inside body
CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
builtin format-patch: squelch content-type for 7-bit ASCII
diff: minor option combination fix.
fetch-pack: output refs in the order they were given on the command line.
Tutorial #2: broken link fix.
builtin-rm: squelch compiler warnings.
cvsimport: do not barf on creation of an empty file.
apply: force matching at the beginning.
fetch.c: remove an unused variable and dead code.
ls-remote: fix rsync:// to report HEAD
mailinfo: More carefully parse header lines in read_one_header_line()
gitk: start-up bugfix
built-in format-patch: various fixups.
format-patch: -n and -k are mutually exclusive.
Let git-clone to pass --template=dir option to git-init-db.
git-fetch: avoid using "case ... in (arm)"
adjust to the rebased series by Linus.
send-email: do not pass bogus address to local sendmail binary
format-patch --signoff
fetch.c: do not pass uninitialized lock to unlock_ref().
fetch.c: do not call process_tree() from process_tree().
fetch: do not report "same" unless -verbose.
read-tree --reset: update working tree file for conflicted paths.
git alias: try alias last.
rev-parse: tighten constness properly.
send-email: be more lenient and just catch obvious mistakes.
send-email: a bit more careful domain regexp.
git-format-patch: add --output-directory long option again
HTTP cleanup
Make index file locking code reusable to others.
refs.c: convert it to use lockfile interface.
ref-log: style fixes.
Documentation: add missing docs make check-docs found.
make clean: remove dist-doc targets.
Documentation: git-ls-tree (typofix)
Documentation: add another example to git-ls-files
git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
git-rm: honor -n flag.
builtin-init-db: spell the in-program configuration variable in lowercase.
shared repository - add a few missing calls to adjust_shared_perm().
git-clone: fix --bare over dumb-http
GIT 1.4.0
Linus Torvalds:
Common option parsing for "git log --diff" and friends
Tentative built-in "git show"
Fixes for option parsing
Log message printout cleanups
Log message printout cleanups (#2)
Log message printout cleanups (#3): fix --pretty=oneline
Fix uninteresting tags in new revision parsing
get_sha1() shorthands for blob/tree objects
Allow "git repack" users to specify repacking window/depth
git log: don't do merge diffs by default
git-log produces no output
Split up builtin commands into separate files from git.c
Fix filename verification when in a subdirectory
Fix "git help -a" terminal autosizing
git builtin "push"
Fix "git-log --parents" breakage post v1.3.0
sha1_to_hex() usage cleanup
Fix "git diff --stat" with long filenames
revert/cherry-pick: use aggressive merge.
git config syntax updates
git diff: support "-U" and "--unified" options properly
Allow one-way tree merge to remove old files
Simplify "git reset --hard"
builtin-grep: use external grep when we can take advantage of it
read-tree --reset -u fix.
Fix silly typo in new builtin grep
Remove old "git-grep.sh" remnants
libify git-ls-files directory traversal
Clean up git-ls-file directory walking library interface
Do "git add" as a builtin
builtin-add: warn on unmatched pathspecs
builtin-grep: workaround for non GNU grep.
Remove old "git-add.sh" remnants
Prevent bogus paths from being added to the index.
Make "git rev-list" be a builtin
Libify the index refresh logic
Move pathspec matching from builtin-add.c into dir.c
Add builtin "git rm" command
cvsimport: repack every kilo-commits.
apply: treat EOF as proper context.
Clean up sha1 file writing
bogus "fatal: Not a git repository"
t1002: use -U0 instead of --unified=0
Fix "--abbrev=xyz" for revision listing
Fix memory leak in "git rev-list --objects"
Don't use "sscanf()" for tree mode scanning
Add raw tree buffer info to "struct tree"
Make "tree_entry" have a SHA1 instead of a union of object pointers
Switch "read_tree_recursive()" over to tree-walk functionality
Remove "tree->entries" tree-entry list from tree parser
Make "struct tree" contain the pointer to the tree buffer
Make "tree_entry" have a SHA1 instead of a union of object pointers
Switch "read_tree_recursive()" over to tree-walk functionality
builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
Remove "tree->entries" tree-entry list from tree parser
fsck-objects: avoid unnecessary tree_entry_list usage
Remove unused "zeropad" entry from tree_list_entry
Convert "mark_tree_uninteresting()" to raw tree walker
Convert fetch.c: process_tree() to raw tree walker
Remove last vestiges of generic tree_entry_list
tree_entry(): new tree-walking helper function
read-tree: fix eye-candy.
Fix typo in tutorial-2.txt
rev-list: fix process_tree() conversion.
pack-objects: improve path grouping heuristics.
Lukas Sandström:
Make git-check-format-ref a builtin.
SubmittingPatches: The download location of External Editor has moved
Martin Langhoff:
git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
git-send-email: fix version string to be valid perl
cvsserver: use git-rev-list instead of git-log
cvsserver: use git-rev-list instead of git-log
cvsimport: minor fixups
cvsimport: replace anonymous sub ref with a normal sub
cvsimport: introduce -L<imit> option to workaround memory leaks
cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
Martin Waitz:
clone: keep --reference even with -l -s
repack: honor -d even when no new pack was created
Transitively read alternatives
test case for transitive info/alternates
clone: don't clone the info/alternates file
git help: remove whatchanged from list of common commands
Documentation/Makefile: remove extra /
Add instructions to commit template.
Martyn Smith:
Added logged warnings for CVS error returns
Many fixes for most operations in Eclipse.
Change to allow subdir updates from Eclipse
Matthias Kestenholz:
annotate: fix warning about uninitialized scalar
annotate: display usage information if no filename was given
fix various typos in documentation
add documentation for update-index --unresolve
Matthias Lederhofer:
core-tutorial.txt: escape asterisk
git status: skip empty directories, and add -u to show all untracked files
Nick Hengeveld:
git-fetch: resolve remote symrefs for HTTP transport
http: prevent segfault during curl handle reuse
builtin-push: don't pass --thin to HTTP transport
HTTP cleanup
http-fetch: fix possible segfault
Nicolas Pitre:
fix pack-object buffer size
split the diff-delta interface
use delta index data when finding best delta matches
replace adler32 with Rabin's polynomial in diff-delta
tiny optimization to diff-delta
improve diff-delta with sparse and/or repetitive data
improve base85 generated assembly code
fix diff-delta bad memory access
simple euristic for further free packing improvements
pack-object: slightly more efficient
improve depth heuristic for maximum delta size
Paul Mackerras:
gitk: Implement multiple views
gitk: Make File->Update work properly again
gitk: Fix various bugs in the view support
gitk: Don't reread git-rev-list output from scratch on view switch
gitk: Remember the view in the history list
gitk: Let git-rev-list do the argument list parsing
gitk: Use git-rev-parse only to identify file/dir names on cmd line
rev-parse: better error message for ambiguous arguments
gitk: Implement "permanent" views (stored in ~/.gitk)
gitk: add menu item for editing the current view
gitk: Use a text widget for the file list
gitk: Add a tree-browsing mode
gitk: Basic support for highlighting one view within another
gitk: Fix file list display when files are renamed
gitk: Allow view to specify arbitrary arguments to git-rev-list
gitk: Fix display of "(...)" for parents/children we haven't drawn
Provide a way to flush git-diff-tree's output
gitk: Make a row of controls for controlling highlighting
gitk: Fix bug where page-up/down wouldn't always work properly
gitk: Highlight entries in the file list as well
gitk: Highlight paths of interest in tree view as well
gitk: First cut at a search function in the patch/file display window
gitk: Improve the text window search function
gitk: Move "pickaxe" find function to highlight facility
gitk: Fix bug in highlight stuff when no line is selected
gitk: show_error fix
gitk: Provide ability to highlight based on relationship to selected commit
Make git-diff-tree indicate when it flushes
gitk: Add a goto next/previous highlighted commit function
gitk: Show nearby tags
gitk: Show branch name(s) as well, if "show nearby tags" is enabled
gitk: Re-read the descendent/ancestor tag & head info on update
Paul T Darga:
check for error return from fork()
Pavel Roskin:
Release config lock if the regex is invalid
Peter Eriksen:
Add git-quiltimport to .gitignore.
Builtin git-ls-files.
Builtin git-ls-tree.
Builtin git-tar-tree.
Builtin git-read-tree.
Builtin git-commit-tree.
Builtin git-apply.
Builtin git-show-branch.
Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
Peter Hagervall:
Sparse fix for builtin-diff
Petr Baudis:
Document git-var -l listing also configuration variables
Document the configuration file
git-repo-config --list support
Deprecate usage of git-var -l for getting config vars list
Call builtin ls-tree in git-cat-file -p
Document git aliases support
Documentation: git aliases
Rene Scharfe:
Off-by-one error in get_path_prefix(), found by Valgrind
Built-in git-get-tar-commit-id
Robert Fitzsimons:
builtin-grep: pass ignore case option to external grep
Robert Shearman:
Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
Ryan Anderson:
git-send-email: Add References: headers to emails, in addition to In-Reply-To:
Add support for --bcc to git-send-email.
Fix a bug in email extraction used in git-send-email.
Add a basic test case for git send-email, and fix some real bugs discovered.
Salikh Zakirov:
Fixed Cygwin CR-munging problem in mailsplit
Santi:
Document that "git add" only adds non-ignored files.
Santi_Béjar:
Reintroduce svn pools to solve the memory leak.
Sean Estabrooks:
Add --continue and --abort options to git-rebase.
Update the git-branch man page to include the "-r" option,
Fix up remaining man pages that use asciidoc "callouts".
Properly render asciidoc "callouts" in git man pages.
Fix trivial typo in git-log man page.
Several trivial documentation touch ups.
Fix up docs where "--" isn't displayed correctly.
Update git-unpack-objects documentation.
Clarify git-cherry documentation.
Fix for config file section parsing.
Another config file parsing fix.
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.
Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
Ensure author & committer before asking for commit message.
Make git rebase interactive help match documentation.
Add "--summary" option to git diff.
Convert some "apply --summary" users to "diff --summary".
Strip useless "tags/" prefix from git-tag -l output
Allow pickaxe and diff-filter options to be used by git log.
Avoid segfault in diff --stat rename output.
Change GIT-VERSION-GEN to call git commands with "git" not "git-".
Install git builtins into gitexecdir rather than bindir.
Remove possible segfault in http-fetch.
--summary output should print immediately after stats.
A Perforce importer for git.
Serge E. Hallyn:
socksetup: don't return on set_reuse_addr() error
socksetup: don't return on set_reuse_addr() error
Sergey Vlasov:
gitk: Display commit messages with word wrap
Shawn Pearce:
Document git-clone --reference
Remove unnecessary local in get_ref_sha1.
Improve abstraction of ref lock/write.
Convert update-ref to use ref_lock API.
Log ref updates to logs/refs/<ref>
Support 'master@2 hours ago' syntax
Fix ref log parsing so it works properly.
General ref log reading improvements.
Added logs/ directory to repository layout.
Force writing ref if it doesn't exist.
Log ref updates made by fetch.
Change 'master@noon' syntax to 'master@{noon}'.
Correct force_write bug in refs.c
Change order of -m option to update-ref.
Include ref log detail in commit, reset, etc.
Create/delete branch ref logs.
Enable ref log creation in git checkout -b.
Reference git-check-ref-format in git-branch.
Elaborate on why ':' is a bad idea in a ref name.
Built git-upload-tar should be ignored.
Verify git-commit provides a reflog message.
Test that git-branch -l works.
Remove unnecessary output from t3600-rm.
Improved pack format documentation.
Allow multiple -m options to git-commit.
Tilman Sauerbeck:
Documentation/Makefile: create tarballs for the man pages and html files
Timo Hirvonen:
Builtin git-init-db
Builtin git-cat-file
gitk: Replace "git-" commands with "git "
Uwe Zeisberger:
Document git-clone --use-separate-remote
Yakov Lerner:
read-cache.c: use xcalloc() not calloc()
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
Problem: 'trap...exit' causes error message when /bin/sh is ash.
Yann Dirson:
Do not call 'cmp' with non-existant -q flag.
Document current cvsexportcommit limitations.
Make cvsexportcommit create parent directories as needed.
^ permalink raw reply [relevance 2%]
* Re: Simplify "git reset --hard"
2006-05-15 7:46 2% ` Junio C Hamano
@ 2006-05-15 14:55 0% ` Linus Torvalds
0 siblings, 0 replies; 58+ results
From: Linus Torvalds @ 2006-05-15 14:55 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Mon, 15 May 2006, Junio C Hamano wrote:
>
> read-tree -u one-way merge fix to check out locally modified paths.
>
> The "-u" flag means "update the working tree files", but to
> other types of merges, it also implies "I want to keep my local
> changes" -- because they prevent local changes from getting lost
> by using verify_uptodate. The one-way merge is different from
> other merges in that its purpose is opposite of doing something
> else while keeping unrelated local changes. The point of
> one-way merge is to nuke local changes. So while it feels
> somewhat wrong that this actively loses local changes, it is the
> right thing to do.
Ack. On the other hand, I wonder if it might not make sense to have this
part potentially depend on the "--reset" flag.
That way you wouldn't even have to apologize for it.
Linus
^ permalink raw reply [relevance 0%]
* Re: Simplify "git reset --hard"
@ 2006-05-15 7:46 2% ` Junio C Hamano
2006-05-15 14:55 0% ` Linus Torvalds
0 siblings, 1 reply; 58+ results
From: Junio C Hamano @ 2006-05-15 7:46 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
Junio C Hamano <junkio@cox.net> writes:
> Junio C Hamano <junkio@cox.net> writes:
>
>>> Instead, just pass in "-u" to git-read-tree when we do a hard reset, and
>>> depend on git-read-tree to update the working tree appropriately.
>>
>> Well, this is wrong. Local modifications remain after your
>> version of "git-reset --hard HEAD". which is not what we want
>> from a hard reset.
>
> ... and attempting to paper it over in git-reset.sh is also
> wrong. Keep your "--hard is noop" change in git-reset.sh and
> replace it with this would be the right fix.
-- >8 --
read-tree -u one-way merge fix to check out locally modified paths.
The "-u" flag means "update the working tree files", but to
other types of merges, it also implies "I want to keep my local
changes" -- because they prevent local changes from getting lost
by using verify_uptodate. The one-way merge is different from
other merges in that its purpose is opposite of doing something
else while keeping unrelated local changes. The point of
one-way merge is to nuke local changes. So while it feels
somewhat wrong that this actively loses local changes, it is the
right thing to do.
The earlier one marked old->ce_flags to be updated
unconditionally, but that would cause 18,000 paths to be updated
when you have only a few paths different from the HEAD you are
switching to, which is far worse than what we used to do in
git-reset by hand.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* Third time lucky ;-)
diff --git a/read-tree.c b/read-tree.c
index 11157f4..d847c6f 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -686,6 +698,9 @@ static int oneway_merge(struct cache_ent
if (!a)
return deleted_entry(old, NULL);
if (old && same(old, a)) {
+ struct stat st;
+ if (lstat(old->name, &st) || ce_match_stat(old, &st, 1))
+ old->ce_flags |= htons(CE_UPDATE);
return keep_entry(old);
}
return merged_entry(a, NULL);
^ permalink raw reply related [relevance 2%]
* Re: Why would merge fail on a one-line addition?
@ 2006-03-26 1:32 2% ` Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2006-03-26 1:32 UTC (permalink / raw)
To: Marc Singer; +Cc: git
Marc Singer <elf@buici.com> writes:
> One of the unmerged files leaves this trail.
>
> elf@florence ~...git/linux-2.6 > git-ls-files --unmerged
> 100644 6262d449120cdcde5db1b079806dcc0d9b5e6b7c 1 arch/arm/mach-lh7a40x/irq-lpd7a40x.c
> 100644 dcb4e17b941990eabe8992680c9aa9b67afb6fd4 3 arch/arm/mach-lh7a40x/irq-lpd7a40x.c
> Why would git have a problem with this?
Your change and the change in the other branch are conflicting
and git is helping you notice that.
The index has different #1 and #3 with #2 missing. This means
the common ancestor (#1) had it, you (#2) _removed_ it, while
the other branch (#3) modified it. Should it carry forward the
modification (one line addition) made by the other branch and
then remove the file to match yours, or should it remove it to
match yours and ignore what the other branch did?
If you do not want to have that file in the result, record the
path as such and make a commit. Since there is no #2, your
working tree probably do not have that path, so:
$ git update-index --remove arch/arm/mach-lh7a40x/irq-lpa7a40x.c
to resolve the path, resolve other conflicts if you have any and
then commit the result.
However, this _might_ be a case where your line of development
somewhere between the common ancestor and your tip moved that
file somewhere else in which case you may want to do three-way
merge between 6262d4 blob, your tip and dcb4e1 blob _and_ commit
the result at the path you have. I do not know if that is the
case and even if so I do not know where you have the
corresponding file in your tree, but just as an example if you
have it in arch/arm/mach-foo/irq-lpd7a40x.c, you would:
$ cd arch/arm/mach-foo/
$ common=$(git unpack-file 6262d4)
$ his=$(git unpack-file dcb4e1)
$ merge irq-lpd7a40x.c $common $his
$ rm -f $common $his
And then eyeball the result of the merge, fix it up as
necessary, and then:
$ git update-index --remove arch/arm/mach-lh7a40x/irq-lpa7a40x.c
$ git update-index arch/arm/mach-foo/irq-lpd7a40x.c
before committing.
^ permalink raw reply [relevance 2%]
* Re: [PATCH] new tutorial
@ 2006-01-23 4:57 6% ` J. Bruce Fields
0 siblings, 0 replies; 58+ results
From: J. Bruce Fields @ 2006-01-23 4:57 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Sun, Jan 15, 2006 at 03:26:53PM -0800, Junio C Hamano wrote:
> I have a mixed feeling on this one. I tend to recommend --soft
> instead --mixed to people, but both have their pros and cons:
Yeah. My goal here is to pare this down to the minimum of text required
to get people up and running and having fun. To that end, I'd rather
just not explain what the index file is or how it's used. And really
git-reset could probably be left out entirely. So I've cut most of this
out, and left just one mention of git-reset --hard.
> If this is intended to be a beginner documentation, I'd prefer
> if it did not talk about cat-file, nor how commit objects are
> internally represented.
Fair enough. I was trying to find a way to show the structure of the
commit graph. But that was probably overkill.
So I've cut that out. I've also left out discussion of the SHA1's
entirely, though we might want to add that back in at some point. For
now it seems you can do enough without paying attention to them.
> These days by default "git fetch" (and "git pull") fetches the
> tags that refer to the commits you fetch as part of regular
> updates, so this part is mostly redundant.
Got it.
> BTW^2, it might be interesting to do
>
> $ git format-patch -C origin..master
>
> the next time around.
Here's take two.--b.
The current Documentation/tutorial.txt concentrates on the lower-level
git interfaces. So it's useful to people developing alternative
porcelains, to advanced users, etc., but not so much to beginning users.
I think it makes sense for the main tutorial to address those
beginnning users, so with this patch I'm proposing that we move
Documentation/tutorial.txt to Documentation/core-tutorial.txt and
replace it by a new tutorial.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---
Documentation/core-tutorial.txt | 0
Documentation/tutorial.txt | 2023 ++++++---------------------------------
2 files changed, 303 insertions(+), 1720 deletions(-)
copy Documentation/{tutorial.txt => core-tutorial.txt} (100%)
99f6a432f3a4da666d3f535e78cba04085aa1b46
diff --git a/Documentation/tutorial.txt b/Documentation/core-tutorial.txt
similarity index 100%
copy from Documentation/tutorial.txt
copy to Documentation/core-tutorial.txt
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index b8fa299..a09bbea 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -1,1821 +1,404 @@
-A short git tutorial
-====================
+A tutorial introduction to git
+==============================
-Introduction
-------------
+This tutorial explains how to import a new project into git, make
+changes to it, and share changes with other developers.
-This is trying to be a short tutorial on setting up and using a git
-repository, mainly because being hands-on and using explicit examples is
-often the best way of explaining what is going on.
+First, note that you can get documentation for a command such as "git
+diff" with:
-In normal life, most people wouldn't use the "core" git programs
-directly, but rather script around them to make them more palatable.
-Understanding the core git stuff may help some people get those scripts
-done, though, and it may also be instructive in helping people
-understand what it is that the higher-level helper scripts are actually
-doing.
+------------------------------------------------
+$ man git-diff
+------------------------------------------------
-The core git is often called "plumbing", with the prettier user
-interfaces on top of it called "porcelain". You may not want to use the
-plumbing directly very often, but it can be good to know what the
-plumbing does for when the porcelain isn't flushing.
+Importing a new project
+-----------------------
-The material presented here often goes deep describing how things
-work internally. If you are mostly interested in using git as a
-SCM, you can skip them during your first pass.
+Assume you have a tarball project.tar.gz with your initial work. You
+can place it under git revision control as follows.
-[NOTE]
-And those "too deep" descriptions are often marked as Note.
+------------------------------------------------
+$ tar -xzf project.tar.gz
+$ cd project
+$ git init-db
+------------------------------------------------
-[NOTE]
-If you are already familiar with another version control system,
-like CVS, you may want to take a look at
-link:everyday.html[Everyday GIT in 20 commands or so] first
-before reading this.
+Git will reply
+------------------------------------------------
+defaulting to local storage area
+------------------------------------------------
-Creating a git repository
--------------------------
+You've now initialized the working directory--you may notice a new
+directory created, named ".git". Tell git that you want it to track
+every file under the current directory with
-Creating a new git repository couldn't be easier: all git repositories start
-out empty, and the only thing you need to do is find yourself a
-subdirectory that you want to use as a working tree - either an empty
-one for a totally new project, or an existing working tree that you want
-to import into git.
+------------------------------------------------
+$ git add .
+------------------------------------------------
-For our first example, we're going to start a totally new repository from
-scratch, with no pre-existing files, and we'll call it `git-tutorial`.
-To start up, create a subdirectory for it, change into that
-subdirectory, and initialize the git infrastructure with `git-init-db`:
+Finally,
------------------------------------------------
-$ mkdir git-tutorial
-$ cd git-tutorial
-$ git-init-db
+$ git commit -a
------------------------------------------------
-to which git will reply
+will prompt you for a commit message, then record the current state
+of all the files to the repository.
-----------------
-defaulting to local storage area
-----------------
+Try modifying some files, then run
-which is just git's way of saying that you haven't been doing anything
-strange, and that it will have created a local `.git` directory setup for
-your new project. You will now have a `.git` directory, and you can
-inspect that with `ls`. For your new empty project, it should show you
-three entries, among other things:
-
- - a symlink called `HEAD`, pointing to `refs/heads/master` (if your
- platform does not have native symlinks, it is a file containing the
- line "ref: refs/heads/master")
-+
-Don't worry about the fact that the file that the `HEAD` link points to
-doesn't even exist yet -- you haven't created the commit that will
-start your `HEAD` development branch yet.
-
- - a subdirectory called `objects`, which will contain all the
- objects of your project. You should never have any real reason to
- look at the objects directly, but you might want to know that these
- objects are what contains all the real 'data' in your repository.
-
- - a subdirectory called `refs`, which contains references to objects.
-
-In particular, the `refs` subdirectory will contain two other
-subdirectories, named `heads` and `tags` respectively. They do
-exactly what their names imply: they contain references to any number
-of different 'heads' of development (aka 'branches'), and to any
-'tags' that you have created to name specific versions in your
-repository.
-
-One note: the special `master` head is the default branch, which is
-why the `.git/HEAD` file was created as a symlink to it even if it
-doesn't yet exist. Basically, the `HEAD` link is supposed to always
-point to the branch you are working on right now, and you always
-start out expecting to work on the `master` branch.
-
-However, this is only a convention, and you can name your branches
-anything you want, and don't have to ever even 'have' a `master`
-branch. A number of the git tools will assume that `.git/HEAD` is
-valid, though.
-
-[NOTE]
-An 'object' is identified by its 160-bit SHA1 hash, aka 'object name',
-and a reference to an object is always the 40-byte hex
-representation of that SHA1 name. The files in the `refs`
-subdirectory are expected to contain these hex references
-(usually with a final `\'\n\'` at the end), and you should thus
-expect to see a number of 41-byte files containing these
-references in these `refs` subdirectories when you actually start
-populating your tree.
-
-[NOTE]
-An advanced user may want to take a look at the
-link:repository-layout.html[repository layout] document
-after finishing this tutorial.
+------------------------------------------------
+$ git diff
+------------------------------------------------
-You have now created your first git repository. Of course, since it's
-empty, that's not very useful, so let's start populating it with data.
+to review your changes. When you're done,
+------------------------------------------------
+$ git commit -a
+------------------------------------------------
-Populating a git repository
----------------------------
+will again prompt your for a message describing the change, and then
+record the new versions of the modified files.
-We'll keep this simple and stupid, so we'll start off with populating a
-few trivial files just to get a feel for it.
+A note on commit messages: Though not required, it's a good idea to
+begin the commit message with a single short (less than 50 character)
+line summarizing the change, followed by a blank line and then a more
+thorough description. Tools that turn commits into email, for
+example, use the first line on the Subject line and the rest of the
+commit in the body.
-Start off with just creating any random files that you want to maintain
-in your git repository. We'll start off with a few bad examples, just to
-get a feel for how this works:
+To add a new file, first create the file, then
------------------------------------------------
-$ echo "Hello World" >hello
-$ echo "Silly example" >example
+$ git add path/to/new/file
------------------------------------------------
-you have now created two files in your working tree (aka 'working directory'), but to
-actually check in your hard work, you will have to go through two steps:
+then commit as usual. No special command is required when removing a
+file; just remove it, then commit.
- - fill in the 'index' file (aka 'cache') with the information about your
- working tree state.
+At any point you can view the history of your changes using
- - commit that index file as an object.
+------------------------------------------------
+$ git whatchanged
+------------------------------------------------
-The first step is trivial: when you want to tell git about any changes
-to your working tree, you use the `git-update-index` program. That
-program normally just takes a list of filenames you want to update, but
-to avoid trivial mistakes, it refuses to add new entries to the index
-(or remove existing ones) unless you explicitly tell it that you're
-adding a new entry with the `\--add` flag (or removing an entry with the
-`\--remove`) flag.
+If you also want to see complete diffs at each step, use
-So to populate the index with the two files you just created, you can do
+------------------------------------------------
+$ git whatchanged -p
+------------------------------------------------
+
+Managing branches
+-----------------
+
+A single git repository can maintain multiple branches of
+development. To create a new branch named "experimental", use
------------------------------------------------
-$ git-update-index --add hello example
+$ git branch experimental
------------------------------------------------
-and you have now told git to track those two files.
+If you now run
-In fact, as you did that, if you now look into your object directory,
-you'll notice that git will have added two new objects to the object
-database. If you did exactly the steps above, you should now be able to do
+------------------------------------------------
+$ git branch
+------------------------------------------------
+you'll get a list of all existing branches:
-----------------
-$ ls .git/objects/??/*
-----------------
+------------------------------------------------
+ experimental
+* master
+------------------------------------------------
-and see two files:
+The "experimental" branch is the one you just created, and the
+"master" branch is a default branch that was created for you
+automatically. The asterisk marks the branch you are currently on;
+type
-----------------
-.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
-.git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962
-----------------
+------------------------------------------------
+$ git checkout experimental
+------------------------------------------------
-which correspond with the objects with names of 557db... and f24c7..
-respectively.
+to switch to the experimental branch. Now edit a file, commit the
+change, and switch back to the master branch:
-If you want to, you can use `git-cat-file` to look at those objects, but
-you'll have to use the object name, not the filename of the object:
+------------------------------------------------
+(edit file)
+$ git commit -a
+$ git checkout master
+------------------------------------------------
-----------------
-$ git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238
-----------------
+Check that the change you made is no longer visible, since it was
+made on the experimental branch and you're back on the master branch.
-where the `-t` tells `git-cat-file` to tell you what the "type" of the
-object is. git will tell you that you have a "blob" object (ie just a
-regular file), and you can see the contents with
+You can make a different change on the master branch:
-----------------
-$ git-cat-file "blob" 557db03
-----------------
+------------------------------------------------
+(edit file)
+$ git commit -a
+------------------------------------------------
-which will print out "Hello World". The object 557db03 is nothing
-more than the contents of your file `hello`.
+at this point the two branches have diverged, with different changes
+made in each. To merge the changes made in the two branches, run
-[NOTE]
-Don't confuse that object with the file `hello` itself. The
-object is literally just those specific *contents* of the file, and
-however much you later change the contents in file `hello`, the object
-we just looked at will never change. Objects are immutable.
+------------------------------------------------
+$ git pull . experimental
+------------------------------------------------
-[NOTE]
-The second example demonstrates that you can
-abbreviate the object name to only the first several
-hexadecimal digits in most places.
+If the changes don't conflict, you're done. If there are conflicts,
+markers will be left in the problematic files showing the conflict;
-Anyway, as we mentioned previously, you normally never actually take a
-look at the objects themselves, and typing long 40-character hex
-names is not something you'd normally want to do. The above digression
-was just to show that `git-update-index` did something magical, and
-actually saved away the contents of your files into the git object
-database.
+------------------------------------------------
+$ git diff
+------------------------------------------------
-Updating the index did something else too: it created a `.git/index`
-file. This is the index that describes your current working tree, and
-something you should be very aware of. Again, you normally never worry
-about the index file itself, but you should be aware of the fact that
-you have not actually really "checked in" your files into git so far,
-you've only *told* git about them.
+will show this. Once you've edited the files to resolve the
+conflicts,
-However, since git knows about them, you can now start using some of the
-most basic git commands to manipulate the files or look at their status.
+------------------------------------------------
+$ git commit -a
+------------------------------------------------
-In particular, let's not even check in the two files into git yet, we'll
-start off by adding another line to `hello` first:
+will commit the result of the merge. Finally,
------------------------------------------------
-$ echo "It's a new day for git" >>hello
+$ gitk
------------------------------------------------
-and you can now, since you told git about the previous state of `hello`, ask
-git what has changed in the tree compared to your old index, using the
-`git-diff-files` command:
+will show a nice graphical representation of the resulting history.
-------------
-$ git-diff-files
-------------
+If you develop on a branch crazy-idea, then regret it, you can always
+delete the branch with
-Oops. That wasn't very readable. It just spit out its own internal
-version of a `diff`, but that internal version really just tells you
-that it has noticed that "hello" has been modified, and that the old object
-contents it had have been replaced with something else.
+-------------------------------------
+$ git branch -D crazy-idea
+-------------------------------------
-To make it readable, we can tell git-diff-files to output the
-differences as a patch, using the `-p` flag:
+Branches are cheap and easy, so this is a good way to try something
+out.
-------------
-$ git-diff-files -p
-diff --git a/hello b/hello
-index 557db03..263414f 100644
---- a/hello
-+++ b/hello
-@@ -1 +1,2 @@
- Hello World
-+It's a new day for git
-----
+Using git for collaboration
+---------------------------
-i.e. the diff of the change we caused by adding another line to `hello`.
+Suppose that Alice has started a new project with a git repository in
+/home/alice/project, and that Bob, who has a home directory on the
+same machine, wants to contribute.
-In other words, `git-diff-files` always shows us the difference between
-what is recorded in the index, and what is currently in the working
-tree. That's very useful.
+Bob begins with:
-A common shorthand for `git-diff-files -p` is to just write `git
-diff`, which will do the same thing.
+------------------------------------------------
+$ git clone /home/alice/project myrepo
+------------------------------------------------
-------------
-$ git diff
-diff --git a/hello b/hello
-index 557db03..263414f 100644
---- a/hello
-+++ b/hello
-@@ -1 +1,2 @@
- Hello World
-+It's a new day for git
-------------
-
-
-Committing git state
---------------------
-
-Now, we want to go to the next stage in git, which is to take the files
-that git knows about in the index, and commit them as a real tree. We do
-that in two phases: creating a 'tree' object, and committing that 'tree'
-object as a 'commit' object together with an explanation of what the
-tree was all about, along with information of how we came to that state.
-
-Creating a tree object is trivial, and is done with `git-write-tree`.
-There are no options or other input: git-write-tree will take the
-current index state, and write an object that describes that whole
-index. In other words, we're now tying together all the different
-filenames with their contents (and their permissions), and we're
-creating the equivalent of a git "directory" object:
-
-------------------------------------------------
-$ git-write-tree
-------------------------------------------------
-
-and this will just output the name of the resulting tree, in this case
-(if you have done exactly as I've described) it should be
-
-----------------
-8988da15d077d4829fc51d8544c097def6644dbb
-----------------
-
-which is another incomprehensible object name. Again, if you want to,
-you can use `git-cat-file -t 8988d\...` to see that this time the object
-is not a "blob" object, but a "tree" object (you can also use
-`git-cat-file` to actually output the raw object contents, but you'll see
-mainly a binary mess, so that's less interesting).
-
-However -- normally you'd never use `git-write-tree` on its own, because
-normally you always commit a tree into a commit object using the
-`git-commit-tree` command. In fact, it's easier to not actually use
-`git-write-tree` on its own at all, but to just pass its result in as an
-argument to `git-commit-tree`.
-
-`git-commit-tree` normally takes several arguments -- it wants to know
-what the 'parent' of a commit was, but since this is the first commit
-ever in this new repository, and it has no parents, we only need to pass in
-the object name of the tree. However, `git-commit-tree`
-also wants to get a commit message
-on its standard input, and it will write out the resulting object name for the
-commit to its standard output.
-
-And this is where we create the `.git/refs/heads/master` file
-which is pointed at by `HEAD`. This file is supposed to contain
-the reference to the top-of-tree of the master branch, and since
-that's exactly what `git-commit-tree` spits out, we can do this
-all with a sequence of simple shell commands:
-
-------------------------------------------------
-$ tree=$(git-write-tree)
-$ commit=$(echo 'Initial commit' | git-commit-tree $tree)
-$ git-update-ref HEAD $commit
-------------------------------------------------
-
-which will say:
-
-----------------
-Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb
-----------------
-
-just to warn you about the fact that it created a totally new commit
-that is not related to anything else. Normally you do this only *once*
-for a project ever, and all later commits will be parented on top of an
-earlier commit, and you'll never see this "Committing initial tree"
-message ever again.
-
-Again, normally you'd never actually do this by hand. There is a
-helpful script called `git commit` that will do all of this for you. So
-you could have just written `git commit`
-instead, and it would have done the above magic scripting for you.
-
-
-Making a change
----------------
-
-Remember how we did the `git-update-index` on file `hello` and then we
-changed `hello` afterward, and could compare the new state of `hello` with the
-state we saved in the index file?
-
-Further, remember how I said that `git-write-tree` writes the contents
-of the *index* file to the tree, and thus what we just committed was in
-fact the *original* contents of the file `hello`, not the new ones. We did
-that on purpose, to show the difference between the index state, and the
-state in the working tree, and how they don't have to match, even
-when we commit things.
-
-As before, if we do `git-diff-files -p` in our git-tutorial project,
-we'll still see the same difference we saw last time: the index file
-hasn't changed by the act of committing anything. However, now that we
-have committed something, we can also learn to use a new command:
-`git-diff-index`.
-
-Unlike `git-diff-files`, which showed the difference between the index
-file and the working tree, `git-diff-index` shows the differences
-between a committed *tree* and either the index file or the working
-tree. In other words, `git-diff-index` wants a tree to be diffed
-against, and before we did the commit, we couldn't do that, because we
-didn't have anything to diff against.
-
-But now we can do
-
-----------------
-$ git-diff-index -p HEAD
-----------------
-
-(where `-p` has the same meaning as it did in `git-diff-files`), and it
-will show us the same difference, but for a totally different reason.
-Now we're comparing the working tree not against the index file,
-but against the tree we just wrote. It just so happens that those two
-are obviously the same, so we get the same result.
-
-Again, because this is a common operation, you can also just shorthand
-it with
-
-----------------
-$ git diff HEAD
-----------------
-
-which ends up doing the above for you.
-
-In other words, `git-diff-index` normally compares a tree against the
-working tree, but when given the `\--cached` flag, it is told to
-instead compare against just the index cache contents, and ignore the
-current working tree state entirely. Since we just wrote the index
-file to HEAD, doing `git-diff-index \--cached -p HEAD` should thus return
-an empty set of differences, and that's exactly what it does.
-
-[NOTE]
-================
-`git-diff-index` really always uses the index for its
-comparisons, and saying that it compares a tree against the working
-tree is thus not strictly accurate. In particular, the list of
-files to compare (the "meta-data") *always* comes from the index file,
-regardless of whether the `\--cached` flag is used or not. The `\--cached`
-flag really only determines whether the file *contents* to be compared
-come from the working tree or not.
-
-This is not hard to understand, as soon as you realize that git simply
-never knows (or cares) about files that it is not told about
-explicitly. git will never go *looking* for files to compare, it
-expects you to tell it what the files are, and that's what the index
-is there for.
-================
-
-However, our next step is to commit the *change* we did, and again, to
-understand what's going on, keep in mind the difference between "working
-tree contents", "index file" and "committed tree". We have changes
-in the working tree that we want to commit, and we always have to
-work through the index file, so the first thing we need to do is to
-update the index cache:
-
-------------------------------------------------
-$ git-update-index hello
-------------------------------------------------
-
-(note how we didn't need the `\--add` flag this time, since git knew
-about the file already).
-
-Note what happens to the different `git-diff-\*` versions here. After
-we've updated `hello` in the index, `git-diff-files -p` now shows no
-differences, but `git-diff-index -p HEAD` still *does* show that the
-current state is different from the state we committed. In fact, now
-`git-diff-index` shows the same difference whether we use the `--cached`
-flag or not, since now the index is coherent with the working tree.
-
-Now, since we've updated `hello` in the index, we can commit the new
-version. We could do it by writing the tree by hand again, and
-committing the tree (this time we'd have to use the `-p HEAD` flag to
-tell commit that the HEAD was the *parent* of the new commit, and that
-this wasn't an initial commit any more), but you've done that once
-already, so let's just use the helpful script this time:
-
-------------------------------------------------
-$ git commit
-------------------------------------------------
-
-which starts an editor for you to write the commit message and tells you
-a bit about what you have done.
-
-Write whatever message you want, and all the lines that start with '#'
-will be pruned out, and the rest will be used as the commit message for
-the change. If you decide you don't want to commit anything after all at
-this point (you can continue to edit things and update the index), you
-can just leave an empty message. Otherwise `git commit` will commit
-the change for you.
-
-You've now made your first real git commit. And if you're interested in
-looking at what `git commit` really does, feel free to investigate:
-it's a few very simple shell scripts to generate the helpful (?) commit
-message headers, and a few one-liners that actually do the
-commit itself (`git-commit`).
-
-
-Inspecting Changes
-------------------
-
-While creating changes is useful, it's even more useful if you can tell
-later what changed. The most useful command for this is another of the
-`diff` family, namely `git-diff-tree`.
-
-`git-diff-tree` can be given two arbitrary trees, and it will tell you the
-differences between them. Perhaps even more commonly, though, you can
-give it just a single commit object, and it will figure out the parent
-of that commit itself, and show the difference directly. Thus, to get
-the same diff that we've already seen several times, we can now do
-
-----------------
-$ git-diff-tree -p HEAD
-----------------
-
-(again, `-p` means to show the difference as a human-readable patch),
-and it will show what the last commit (in `HEAD`) actually changed.
-
-[NOTE]
-============
-Here is an ASCII art by Jon Loeliger that illustrates how
-various diff-\* commands compare things.
-
- diff-tree
- +----+
- | |
- | |
- V V
- +-----------+
- | Object DB |
- | Backing |
- | Store |
- +-----------+
- ^ ^
- | |
- | | diff-index --cached
- | |
- diff-index | V
- | +-----------+
- | | Index |
- | | "cache" |
- | +-----------+
- | ^
- | |
- | | diff-files
- | |
- V V
- +-----------+
- | Working |
- | Directory |
- +-----------+
-============
-
-More interestingly, you can also give `git-diff-tree` the `-v` flag, which
-tells it to also show the commit message and author and date of the
-commit, and you can tell it to show a whole series of diffs.
-Alternatively, you can tell it to be "silent", and not show the diffs at
-all, but just show the actual commit message.
-
-In fact, together with the `git-rev-list` program (which generates a
-list of revisions), `git-diff-tree` ends up being a veritable fount of
-changes. A trivial (but very useful) script called `git-whatchanged` is
-included with git which does exactly this, and shows a log of recent
-activities.
-
-To see the whole history of our pitiful little git-tutorial project, you
-can do
-
-----------------
-$ git log
-----------------
-
-which shows just the log messages, or if we want to see the log together
-with the associated patches use the more complex (and much more
-powerful)
-
-----------------
-$ git-whatchanged -p --root
-----------------
-
-and you will see exactly what has changed in the repository over its
-short history.
-
-[NOTE]
-The `\--root` flag is a flag to `git-diff-tree` to tell it to
-show the initial aka 'root' commit too. Normally you'd probably not
-want to see the initial import diff, but since the tutorial project
-was started from scratch and is so small, we use it to make the result
-a bit more interesting.
-
-With that, you should now be having some inkling of what git does, and
-can explore on your own.
-
-[NOTE]
-Most likely, you are not directly using the core
-git Plumbing commands, but using Porcelain like Cogito on top
-of it. Cogito works a bit differently and you usually do not
-have to run `git-update-index` yourself for changed files (you
-do tell underlying git about additions and removals via
-`cg-add` and `cg-rm` commands). Just before you make a commit
-with `cg-commit`, Cogito figures out which files you modified,
-and runs `git-update-index` on them for you.
+This creates a new directory "myrepo" containing a clone of Alice's
+repository. The clone is on an equal footing with the original
+project, posessing its own copy of the original project's history.
+Bob then makes some changes and commits them:
-Tagging a version
------------------
+------------------------------------------------
+(edit files)
+$ git commit -a
+(repeat as necessary)
+------------------------------------------------
+
+When he's ready, he tells Alice to pull changes from the repository
+at /home/bob/myrepo. She does this with:
+
+------------------------------------------------
+$ cd /home/alice/project
+$ git pull /home/bob/myrepo
+------------------------------------------------
+
+This actually pulls changes from the branch in Bob's repository named
+"master". Alice could request a different branch by adding the name
+of the branch to the end of the git pull command line.
+
+This merges Bob's changes into her repository; "git whatchanged" will
+now show the new commits. If Alice has made her own changes in the
+meantime, then Bob's changes will be merged in, and she will need to
+manually fix any conflicts.
-In git, there are two kinds of tags, a "light" one, and an "annotated tag".
+A more cautious Alice might wish to examine Bob's changes before
+pulling them. She can do this by creating a temporary branch just
+for the purpose of studying Bob's changes:
-A "light" tag is technically nothing more than a branch, except we put
-it in the `.git/refs/tags/` subdirectory instead of calling it a `head`.
-So the simplest form of tag involves nothing more than
-
-------------------------------------------------
-$ git tag my-first-tag
-------------------------------------------------
-
-which just writes the current `HEAD` into the `.git/refs/tags/my-first-tag`
-file, after which point you can then use this symbolic name for that
-particular state. You can, for example, do
-
-----------------
-$ git diff my-first-tag
-----------------
-
-to diff your current state against that tag (which at this point will
-obviously be an empty diff, but if you continue to develop and commit
-stuff, you can use your tag as an "anchor-point" to see what has changed
-since you tagged it.
-
-An "annotated tag" is actually a real git object, and contains not only a
-pointer to the state you want to tag, but also a small tag name and
-message, along with optionally a PGP signature that says that yes,
-you really did
-that tag. You create these annotated tags with either the `-a` or
-`-s` flag to `git tag`:
-
-----------------
-$ git tag -s <tagname>
-----------------
-
-which will sign the current `HEAD` (but you can also give it another
-argument that specifies the thing to tag, ie you could have tagged the
-current `mybranch` point by using `git tag <tagname> mybranch`).
-
-You normally only do signed tags for major releases or things
-like that, while the light-weight tags are useful for any marking you
-want to do -- any time you decide that you want to remember a certain
-point, just create a private tag for it, and you have a nice symbolic
-name for the state at that point.
-
-
-Copying repositories
---------------------
-
-git repositories are normally totally self-sufficient and relocatable
-Unlike CVS, for example, there is no separate notion of
-"repository" and "working tree". A git repository normally *is* the
-working tree, with the local git information hidden in the `.git`
-subdirectory. There is nothing else. What you see is what you got.
-
-[NOTE]
-You can tell git to split the git internal information from
-the directory that it tracks, but we'll ignore that for now: it's not
-how normal projects work, and it's really only meant for special uses.
-So the mental model of "the git information is always tied directly to
-the working tree that it describes" may not be technically 100%
-accurate, but it's a good model for all normal use.
-
-This has two implications:
-
- - if you grow bored with the tutorial repository you created (or you've
- made a mistake and want to start all over), you can just do simple
-+
-----------------
-$ rm -rf git-tutorial
-----------------
-+
-and it will be gone. There's no external repository, and there's no
-history outside the project you created.
-
- - if you want to move or duplicate a git repository, you can do so. There
- is `git clone` command, but if all you want to do is just to
- create a copy of your repository (with all the full history that
- went along with it), you can do so with a regular
- `cp -a git-tutorial new-git-tutorial`.
-+
-Note that when you've moved or copied a git repository, your git index
-file (which caches various information, notably some of the "stat"
-information for the files involved) will likely need to be refreshed.
-So after you do a `cp -a` to create a new copy, you'll want to do
-+
-----------------
-$ git-update-index --refresh
-----------------
-+
-in the new repository to make sure that the index file is up-to-date.
-
-Note that the second point is true even across machines. You can
-duplicate a remote git repository with *any* regular copy mechanism, be it
-`scp`, `rsync` or `wget`.
-
-When copying a remote repository, you'll want to at a minimum update the
-index cache when you do this, and especially with other peoples'
-repositories you often want to make sure that the index cache is in some
-known state (you don't know *what* they've done and not yet checked in),
-so usually you'll precede the `git-update-index` with a
-
-----------------
-$ git-read-tree --reset HEAD
-$ git-update-index --refresh
-----------------
-
-which will force a total index re-build from the tree pointed to by `HEAD`.
-It resets the index contents to `HEAD`, and then the `git-update-index`
-makes sure to match up all index entries with the checked-out files.
-If the original repository had uncommitted changes in its
-working tree, `git-update-index --refresh` notices them and
-tells you they need to be updated.
-
-The above can also be written as simply
-
-----------------
-$ git reset
-----------------
-
-and in fact a lot of the common git command combinations can be scripted
-with the `git xyz` interfaces. You can learn things by just looking
-at what the various git scripts do. For example, `git reset` is the
-above two lines implemented in `git-reset`, but some things like
-`git status` and `git commit` are slightly more complex scripts around
-the basic git commands.
-
-Many (most?) public remote repositories will not contain any of
-the checked out files or even an index file, and will *only* contain the
-actual core git files. Such a repository usually doesn't even have the
-`.git` subdirectory, but has all the git files directly in the
-repository.
-
-To create your own local live copy of such a "raw" git repository, you'd
-first create your own subdirectory for the project, and then copy the
-raw repository contents into the `.git` directory. For example, to
-create your own copy of the git repository, you'd do the following
-
-----------------
-$ mkdir my-git
-$ cd my-git
-$ rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git
-----------------
-
-followed by
-
-----------------
-$ git-read-tree HEAD
-----------------
-
-to populate the index. However, now you have populated the index, and
-you have all the git internal files, but you will notice that you don't
-actually have any of the working tree files to work on. To get
-those, you'd check them out with
-
-----------------
-$ git-checkout-index -u -a
-----------------
-
-where the `-u` flag means that you want the checkout to keep the index
-up-to-date (so that you don't have to refresh it afterward), and the
-`-a` flag means "check out all files" (if you have a stale copy or an
-older version of a checked out tree you may also need to add the `-f`
-flag first, to tell git-checkout-index to *force* overwriting of any old
-files).
-
-Again, this can all be simplified with
-
-----------------
-$ git clone rsync://rsync.kernel.org/pub/scm/git/git.git/ my-git
-$ cd my-git
-$ git checkout
-----------------
-
-which will end up doing all of the above for you.
-
-You have now successfully copied somebody else's (mine) remote
-repository, and checked it out.
-
-
-Creating a new branch
----------------------
-
-Branches in git are really nothing more than pointers into the git
-object database from within the `.git/refs/` subdirectory, and as we
-already discussed, the `HEAD` branch is nothing but a symlink to one of
-these object pointers.
-
-You can at any time create a new branch by just picking an arbitrary
-point in the project history, and just writing the SHA1 name of that
-object into a file under `.git/refs/heads/`. You can use any filename you
-want (and indeed, subdirectories), but the convention is that the
-"normal" branch is called `master`. That's just a convention, though,
-and nothing enforces it.
-
-To show that as an example, let's go back to the git-tutorial repository we
-used earlier, and create a branch in it. You do that by simply just
-saying that you want to check out a new branch:
-
-------------
-$ git checkout -b mybranch
-------------
-
-will create a new branch based at the current `HEAD` position, and switch
-to it.
-
-[NOTE]
-================================================
-If you make the decision to start your new branch at some
-other point in the history than the current `HEAD`, you can do so by
-just telling `git checkout` what the base of the checkout would be.
-In other words, if you have an earlier tag or branch, you'd just do
-
-------------
-$ git checkout -b mybranch earlier-commit
-------------
-
-and it would create the new branch `mybranch` at the earlier commit,
-and check out the state at that time.
-================================================
+-------------------------------------
+$ git fetch /home/bob/myrepo master:bob-incoming
+-------------------------------------
+
+which fetches the changes from Bob's master branch into a new branch
+named bob-incoming. (Unlike git pull, git fetch just fetches a copy
+of Bob's line of development without doing any merging). Then
+
+-------------------------------------
+$ git whatchanged -p master..bob-incoming
+-------------------------------------
-You can always just jump back to your original `master` branch by doing
+shows a list of all the changes that Bob made since he branched from
+Alice's master branch.
-------------
+After examing those changes, and possibly fixing things, Alice can
+pull the changes into her master branch:
+
+-------------------------------------
$ git checkout master
-------------
+$ git pull . bob-incoming
+-------------------------------------
-(or any other branch-name, for that matter) and if you forget which
-branch you happen to be on, a simple
+The last command is a pull from the "bob-incoming" branch in Alice's
+own repository.
-------------
-$ ls -l .git/HEAD
-------------
+Later, Bob can update his repo with Alice's latest changes using
-will tell you where it's pointing (Note that on platforms with bad or no
-symlink support, you have to execute
+-------------------------------------
+$ git pull
+-------------------------------------
-------------
-$ cat .git/HEAD
-------------
+Note that he doesn't need to give the path to Alice's repository;
+when Bob cloned Alice's repository, git stored the location of her
+repository in the file .git/remotes/origin, and that location is used
+as the default for pulls.
-instead). To get the list of branches you have, you can say
+Bob may also notice a branch in his repository that he didn't create:
-------------
+-------------------------------------
$ git branch
-------------
+* master
+ origin
+-------------------------------------
-which is nothing more than a simple script around `ls .git/refs/heads`.
-There will be asterisk in front of the branch you are currently on.
+The "origin" branch, which was created automatically by "git clone",
+is a pristine copy of Alice's master branch; Bob should never commit
+to it.
-Sometimes you may wish to create a new branch _without_ actually
-checking it out and switching to it. If so, just use the command
+If Bob later decides to work from a different host, he can still
+perform clones and pulls using the ssh protocol:
-------------
-$ git branch <branchname> [startingpoint]
-------------
+-------------------------------------
+$ git clone alice.org:/home/alice/project myrepo
+-------------------------------------
-which will simply _create_ the branch, but will not do anything further.
-You can then later -- once you decide that you want to actually develop
-on that branch -- switch to that branch with a regular `git checkout`
-with the branchname as the argument.
+Alternatively, git has a native protocol, or can use rsync or http;
+see gitlink:git-pull[1] for details.
+Git can also be used in a CVS-like mode, with a central repository
+that various users push changes to; see gitlink:git-push[1] and
+link:cvs-migration.html[git for CVS users].
-Merging two branches
---------------------
+Keeping track of history
+------------------------
-One of the ideas of having a branch is that you do some (possibly
-experimental) work in it, and eventually merge it back to the main
-branch. So assuming you created the above `mybranch` that started out
-being the same as the original `master` branch, let's make sure we're in
-that branch, and do some work there.
+Git history is represented as a series of interrelated commits. The
+most recent commit in the currently checked-out branch can always be
+referred to as HEAD, and the "parent" of any commit can always be
+referred to by appending a caret, "^", to the end of the name of the
+commit. So, for example,
-------------------------------------------------
-$ git checkout mybranch
-$ echo "Work, work, work" >>hello
-$ git commit -m 'Some work.' hello
-------------------------------------------------
+-------------------------------------
+git diff HEAD^ HEAD
+-------------------------------------
-Here, we just added another line to `hello`, and we used a shorthand for
-doing both `git-update-index hello` and `git commit` by just giving the
-filename directly to `git commit`. The `-m` flag is to give the
-commit log message from the command line.
+shows the difference between the most-recently checked-in state of
+the tree and the previous state, and
-Now, to make it a bit more interesting, let's assume that somebody else
-does some work in the original branch, and simulate that by going back
-to the master branch, and editing the same file differently there:
+-------------------------------------
+git diff HEAD^^ HEAD^
+-------------------------------------
-------------
-$ git checkout master
-------------
+shows the difference between that previous state and the state two
+commits ago. Also, HEAD~5 can be used as a shorthand for HEAD^^^^^,
+and more generally HEAD~n can refer to the nth previous commit.
+Commits representing merges have more than one parent, and you can
+specify which parent to follow in that case; see
+gitlink:git-rev-parse[1].
-Here, take a moment to look at the contents of `hello`, and notice how they
-don't contain the work we just did in `mybranch` -- because that work
-hasn't happened in the `master` branch at all. Then do
-
-------------
-$ echo "Play, play, play" >>hello
-$ echo "Lots of fun" >>example
-$ git commit -m 'Some fun.' hello example
-------------
-
-since the master branch is obviously in a much better mood.
-
-Now, you've got two branches, and you decide that you want to merge the
-work done. Before we do that, let's introduce a cool graphical tool that
-helps you view what's going on:
-
-----------------
-$ gitk --all
-----------------
-
-will show you graphically both of your branches (that's what the `\--all`
-means: normally it will just show you your current `HEAD`) and their
-histories. You can also see exactly how they came to be from a common
-source.
-
-Anyway, let's exit `gitk` (`^Q` or the File menu), and decide that we want
-to merge the work we did on the `mybranch` branch into the `master`
-branch (which is currently our `HEAD` too). To do that, there's a nice
-script called `git merge`, which wants to know which branches you want
-to resolve and what the merge is all about:
-
-------------
-$ git merge "Merge work in mybranch" HEAD mybranch
-------------
-
-where the first argument is going to be used as the commit message if
-the merge can be resolved automatically.
-
-Now, in this case we've intentionally created a situation where the
-merge will need to be fixed up by hand, though, so git will do as much
-of it as it can automatically (which in this case is just merge the `example`
-file, which had no differences in the `mybranch` branch), and say:
-
-----------------
- Trying really trivial in-index merge...
- fatal: Merge requires file-level merging
- Nope.
- ...
- Auto-merging hello
- CONFLICT (content): Merge conflict in hello
- Automatic merge failed/prevented; fix up by hand
-----------------
-
-which is way too verbose, but it basically tells you that it failed the
-really trivial merge ("Simple merge") and did an "Automatic merge"
-instead, but that too failed due to conflicts in `hello`.
-
-Not to worry. It left the (trivial) conflict in `hello` in the same form you
-should already be well used to if you've ever used CVS, so let's just
-open `hello` in our editor (whatever that may be), and fix it up somehow.
-I'd suggest just making it so that `hello` contains all four lines:
-
-------------
-Hello World
-It's a new day for git
-Play, play, play
-Work, work, work
-------------
-
-and once you're happy with your manual merge, just do a
-
-------------
-$ git commit hello
-------------
-
-which will very loudly warn you that you're now committing a merge
-(which is correct, so never mind), and you can write a small merge
-message about your adventures in git-merge-land.
-
-After you're done, start up `gitk \--all` to see graphically what the
-history looks like. Notice that `mybranch` still exists, and you can
-switch to it, and continue to work with it if you want to. The
-`mybranch` branch will not contain the merge, but next time you merge it
-from the `master` branch, git will know how you merged it, so you'll not
-have to do _that_ merge again.
-
-Another useful tool, especially if you do not always work in X-Window
-environment, is `git show-branch`.
-
-------------------------------------------------
-$ git show-branch master mybranch
-* [master] Merge work in mybranch
- ! [mybranch] Some work.
---
-- [master] Merge work in mybranch
-*+ [mybranch] Some work.
-------------------------------------------------
-
-The first two lines indicate that it is showing the two branches
-and the first line of the commit log message from their
-top-of-the-tree commits, you are currently on `master` branch
-(notice the asterisk `*` character), and the first column for
-the later output lines is used to show commits contained in the
-`master` branch, and the second column for the `mybranch`
-branch. Three commits are shown along with their log messages.
-All of them have non blank characters in the first column (`*`
-shows an ordinary commit on the current branch, `.` is a merge commit), which
-means they are now part of the `master` branch. Only the "Some
-work" commit has the plus `+` character in the second column,
-because `mybranch` has not been merged to incorporate these
-commits from the master branch. The string inside brackets
-before the commit log message is a short name you can use to
-name the commit. In the above example, 'master' and 'mybranch'
-are branch heads. 'master~1' is the first parent of 'master'
-branch head. Please see 'git-rev-parse' documentation if you
-see more complex cases.
-
-Now, let's pretend you are the one who did all the work in
-`mybranch`, and the fruit of your hard work has finally been merged
-to the `master` branch. Let's go back to `mybranch`, and run
-resolve to get the "upstream changes" back to your branch.
-
-------------
-$ git checkout mybranch
-$ git merge "Merge upstream changes." HEAD master
-------------
-
-This outputs something like this (the actual commit object names
-would be different)
-
-----------------
-Updating from ae3a2da... to a80b4aa....
- example | 1 +
- hello | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-----------------
-
-Because your branch did not contain anything more than what are
-already merged into the `master` branch, the resolve operation did
-not actually do a merge. Instead, it just updated the top of
-the tree of your branch to that of the `master` branch. This is
-often called 'fast forward' merge.
-
-You can run `gitk \--all` again to see how the commit ancestry
-looks like, or run `show-branch`, which tells you this.
-
-------------------------------------------------
-$ git show-branch master mybranch
-! [master] Merge work in mybranch
- * [mybranch] Merge work in mybranch
---
--- [master] Merge work in mybranch
-------------------------------------------------
-
-
-Merging external work
----------------------
-
-It's usually much more common that you merge with somebody else than
-merging with your own branches, so it's worth pointing out that git
-makes that very easy too, and in fact, it's not that different from
-doing a `git merge`. In fact, a remote merge ends up being nothing
-more than "fetch the work from a remote repository into a temporary tag"
-followed by a `git merge`.
-
-Fetching from a remote repository is done by, unsurprisingly,
-`git fetch`:
-
-----------------
-$ git fetch <remote-repository>
-----------------
-
-One of the following transports can be used to name the
-repository to download from:
-
-Rsync::
- `rsync://remote.machine/path/to/repo.git/`
-+
-Rsync transport is usable for both uploading and downloading,
-but is completely unaware of what git does, and can produce
-unexpected results when you download from the public repository
-while the repository owner is uploading into it via `rsync`
-transport. Most notably, it could update the files under
-`refs/` which holds the object name of the topmost commits
-before uploading the files in `objects/` -- the downloader would
-obtain head commit object name while that object itself is still
-not available in the repository. For this reason, it is
-considered deprecated.
-
-SSH::
- `remote.machine:/path/to/repo.git/` or
-+
-`ssh://remote.machine/path/to/repo.git/`
-+
-This transport can be used for both uploading and downloading,
-and requires you to have a log-in privilege over `ssh` to the
-remote machine. It finds out the set of objects the other side
-lacks by exchanging the head commits both ends have and
-transfers (close to) minimum set of objects. It is by far the
-most efficient way to exchange git objects between repositories.
-
-Local directory::
- `/path/to/repo.git/`
-+
-This transport is the same as SSH transport but uses `sh` to run
-both ends on the local machine instead of running other end on
-the remote machine via `ssh`.
-
-git Native::
- `git://remote.machine/path/to/repo.git/`
-+
-This transport was designed for anonymous downloading. Like SSH
-transport, it finds out the set of objects the downstream side
-lacks and transfers (close to) minimum set of objects.
-
-HTTP(S)::
- `http://remote.machine/path/to/repo.git/`
-+
-Downloader from http and https URL
-first obtains the topmost commit object name from the remote site
-by looking at the specified refname under `repo.git/refs/` directory,
-and then tries to obtain the
-commit object by downloading from `repo.git/objects/xx/xxx\...`
-using the object name of that commit object. Then it reads the
-commit object to find out its parent commits and the associate
-tree object; it repeats this process until it gets all the
-necessary objects. Because of this behaviour, they are
-sometimes also called 'commit walkers'.
-+
-The 'commit walkers' are sometimes also called 'dumb
-transports', because they do not require any git aware smart
-server like git Native transport does. Any stock HTTP server
-that does not even support directory index would suffice. But
-you must prepare your repository with `git-update-server-info`
-to help dumb transport downloaders.
-+
-There are (confusingly enough) `git-ssh-fetch` and `git-ssh-upload`
-programs, which are 'commit walkers'; they outlived their
-usefulness when git Native and SSH transports were introduced,
-and not used by `git pull` or `git push` scripts.
-
-Once you fetch from the remote repository, you `resolve` that
-with your current branch.
-
-However -- it's such a common thing to `fetch` and then
-immediately `resolve`, that it's called `git pull`, and you can
-simply do
-
-----------------
-$ git pull <remote-repository>
-----------------
-
-and optionally give a branch-name for the remote end as a second
-argument.
-
-[NOTE]
-You could do without using any branches at all, by
-keeping as many local repositories as you would like to have
-branches, and merging between them with `git pull`, just like
-you merge between branches. The advantage of this approach is
-that it lets you keep set of files for each `branch` checked
-out and you may find it easier to switch back and forth if you
-juggle multiple lines of development simultaneously. Of
-course, you will pay the price of more disk usage to hold
-multiple working trees, but disk space is cheap these days.
-
-[NOTE]
-You could even pull from your own repository by
-giving '.' as <remote-repository> parameter to `git pull`. This
-is useful when you want to merge a local branch (or more, if you
-are making an Octopus) into the current branch.
-
-It is likely that you will be pulling from the same remote
-repository from time to time. As a short hand, you can store
-the remote repository URL in a file under .git/remotes/
-directory, like this:
-
-------------------------------------------------
-$ mkdir -p .git/remotes/
-$ cat >.git/remotes/linus <<\EOF
-URL: http://www.kernel.org/pub/scm/git/git.git/
-EOF
-------------------------------------------------
-
-and use the filename to `git pull` instead of the full URL.
-The URL specified in such file can even be a prefix
-of a full URL, like this:
-
-------------------------------------------------
-$ cat >.git/remotes/jgarzik <<\EOF
-URL: http://www.kernel.org/pub/scm/linux/git/jgarzik/
-EOF
-------------------------------------------------
-
-
-Examples.
-
-. `git pull linus`
-. `git pull linus tag v0.99.1`
-. `git pull jgarzik/netdev-2.6.git/ e100`
-
-the above are equivalent to:
-
-. `git pull http://www.kernel.org/pub/scm/git/git.git/ HEAD`
-. `git pull http://www.kernel.org/pub/scm/git/git.git/ tag v0.99.1`
-. `git pull http://www.kernel.org/pub/.../jgarzik/netdev-2.6.git e100`
+The name of a branch can also be used to refer to the most recent
+commit on that branch; so you can also say things like
+-------------------------------------
+git diff HEAD experimental
+-------------------------------------
-How does the merge work?
-------------------------
+to see the difference between the most-recently committed tree in
+the current branch and the most-recently committed tree in the
+experimental branch.
-We said this tutorial shows what plumbing does to help you cope
-with the porcelain that isn't flushing, but we so far did not
-talk about how the merge really works. If you are following
-this tutorial the first time, I'd suggest to skip to "Publishing
-your work" section and come back here later.
-
-OK, still with me? To give us an example to look at, let's go
-back to the earlier repository with "hello" and "example" file,
-and bring ourselves back to the pre-merge state:
-
-------------
-$ git show-branch --more=3 master mybranch
-! [master] Merge work in mybranch
- * [mybranch] Merge work in mybranch
---
--- [master] Merge work in mybranch
-+* [master^2] Some work.
-+* [master^] Some fun.
-------------
-
-Remember, before running `git merge`, our `master` head was at
-"Some fun." commit, while our `mybranch` head was at "Some
-work." commit.
-
-------------
-$ git checkout mybranch
-$ git reset --hard master^2
-$ git checkout master
-$ git reset --hard master^
-------------
+But you may find it more useful to see the list of commits made in
+the experimental branch but not in the current branch, and
-After rewinding, the commit structure should look like this:
+-------------------------------------
+git whatchanged HEAD..experimental
+-------------------------------------
-------------
-$ git show-branch
-* [master] Some fun.
- ! [mybranch] Some work.
---
- + [mybranch] Some work.
-* [master] Some fun.
-*+ [mybranch^] New day.
-------------
-
-Now we are ready to experiment with the merge by hand.
-
-`git merge` command, when merging two branches, uses 3-way merge
-algorithm. First, it finds the common ancestor between them.
-The command it uses is `git-merge-base`:
-
-------------
-$ mb=$(git-merge-base HEAD mybranch)
-------------
-
-The command writes the commit object name of the common ancestor
-to the standard output, so we captured its output to a variable,
-because we will be using it in the next step. BTW, the common
-ancestor commit is the "New day." commit in this case. You can
-tell it by:
-
-------------
-$ git-name-rev $mb
-my-first-tag
-------------
-
-After finding out a common ancestor commit, the second step is
-this:
-
-------------
-$ git-read-tree -m -u $mb HEAD mybranch
-------------
-
-This is the same `git-read-tree` command we have already seen,
-but it takes three trees, unlike previous examples. This reads
-the contents of each tree into different 'stage' in the index
-file (the first tree goes to stage 1, the second stage 2,
-etc.). After reading three trees into three stages, the paths
-that are the same in all three stages are 'collapsed' into stage
-0. Also paths that are the same in two of three stages are
-collapsed into stage 0, taking the SHA1 from either stage 2 or
-stage 3, whichever is different from stage 1 (i.e. only one side
-changed from the common ancestor).
-
-After 'collapsing' operation, paths that are different in three
-trees are left in non-zero stages. At this point, you can
-inspect the index file with this command:
-
-------------
-$ git-ls-files --stage
-100644 7f8b141b65fdcee47321e399a2598a235a032422 0 example
-100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1 hello
-100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello
-100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
-------------
-
-In our example of only two files, we did not have unchanged
-files so only 'example' resulted in collapsing, but in real-life
-large projects, only small number of files change in one commit,
-and this 'collapsing' tends to trivially merge most of the paths
-fairly quickly, leaving only a handful the real changes in non-zero
-stages.
-
-To look at only non-zero stages, use `\--unmerged` flag:
-
-------------
-$ git-ls-files --unmerged
-100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1 hello
-100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello
-100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
-------------
-
-The next step of merging is to merge these three versions of the
-file, using 3-way merge. This is done by giving
-`git-merge-one-file` command as one of the arguments to
-`git-merge-index` command:
-
-------------
-$ git-merge-index git-merge-one-file hello
-Auto-merging hello.
-merge: warning: conflicts during merge
-ERROR: Merge conflict in hello.
-fatal: merge program failed
-------------
-
-`git-merge-one-file` script is called with parameters to
-describe those three versions, and is responsible to leave the
-merge results in the working tree.
-It is a fairly straightforward shell script, and
-eventually calls `merge` program from RCS suite to perform a
-file-level 3-way merge. In this case, `merge` detects
-conflicts, and the merge result with conflict marks is left in
-the working tree.. This can be seen if you run `ls-files
---stage` again at this point:
-
-------------
-$ git-ls-files --stage
-100644 7f8b141b65fdcee47321e399a2598a235a032422 0 example
-100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1 hello
-100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello
-100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
-------------
-
-This is the state of the index file and the working file after
-`git merge` returns control back to you, leaving the conflicting
-merge for you to resolve. Notice that the path `hello` is still
-unmerged, and what you see with `git diff` at this point is
-differences since stage 2 (i.e. your version).
-
-
-Publishing your work
---------------------
-
-So we can use somebody else's work from a remote repository; but
-how can *you* prepare a repository to let other people pull from
-it?
-
-Your do your real work in your working tree that has your
-primary repository hanging under it as its `.git` subdirectory.
-You *could* make that repository accessible remotely and ask
-people to pull from it, but in practice that is not the way
-things are usually done. A recommended way is to have a public
-repository, make it reachable by other people, and when the
-changes you made in your primary working tree are in good shape,
-update the public repository from it. This is often called
-'pushing'.
-
-[NOTE]
-This public repository could further be mirrored, and that is
-how git repositories at `kernel.org` are managed.
-
-Publishing the changes from your local (private) repository to
-your remote (public) repository requires a write privilege on
-the remote machine. You need to have an SSH account there to
-run a single command, `git-receive-pack`.
-
-First, you need to create an empty repository on the remote
-machine that will house your public repository. This empty
-repository will be populated and be kept up-to-date by pushing
-into it later. Obviously, this repository creation needs to be
-done only once.
-
-[NOTE]
-`git push` uses a pair of programs,
-`git-send-pack` on your local machine, and `git-receive-pack`
-on the remote machine. The communication between the two over
-the network internally uses an SSH connection.
-
-Your private repository's git directory is usually `.git`, but
-your public repository is often named after the project name,
-i.e. `<project>.git`. Let's create such a public repository for
-project `my-git`. After logging into the remote machine, create
-an empty directory:
-
-------------
-$ mkdir my-git.git
-------------
-
-Then, make that directory into a git repository by running
-`git init-db`, but this time, since its name is not the usual
-`.git`, we do things slightly differently:
-
-------------
-$ GIT_DIR=my-git.git git-init-db
-------------
-
-Make sure this directory is available for others you want your
-changes to be pulled by via the transport of your choice. Also
-you need to make sure that you have the `git-receive-pack`
-program on the `$PATH`.
-
-[NOTE]
-Many installations of sshd do not invoke your shell as the login
-shell when you directly run programs; what this means is that if
-your login shell is `bash`, only `.bashrc` is read and not
-`.bash_profile`. As a workaround, make sure `.bashrc` sets up
-`$PATH` so that you can run `git-receive-pack` program.
-
-[NOTE]
-If you plan to publish this repository to be accessed over http,
-you should do `chmod +x my-git.git/hooks/post-update` at this
-point. This makes sure that every time you push into this
-repository, `git-update-server-info` is run.
-
-Your "public repository" is now ready to accept your changes.
-Come back to the machine you have your private repository. From
-there, run this command:
-
-------------
-$ git push <public-host>:/path/to/my-git.git master
-------------
-
-This synchronizes your public repository to match the named
-branch head (i.e. `master` in this case) and objects reachable
-from them in your current repository.
-
-As a real example, this is how I update my public git
-repository. Kernel.org mirror network takes care of the
-propagation to other publicly visible machines:
-
-------------
-$ git push master.kernel.org:/pub/scm/git/git.git/
-------------
+will do that, just as
+-------------------------------------
+git whatchanged experimental..HEAD
+-------------------------------------
-Packing your repository
------------------------
+will show the list of commits made on the HEAD but not included in
+experimental.
+
+You can also give commits convenient names of your own: after running
+
+-------------------------------------
+$ git-tag v2.5 HEAD^^
+-------------------------------------
-Earlier, we saw that one file under `.git/objects/??/` directory
-is stored for each git object you create. This representation
-is efficient to create atomically and safely, but
-not so convenient to transport over the network. Since git objects are
-immutable once they are created, there is a way to optimize the
-storage by "packing them together". The command
-
-------------
-$ git repack
-------------
-
-will do it for you. If you followed the tutorial examples, you
-would have accumulated about 17 objects in `.git/objects/??/`
-directories by now. `git repack` tells you how many objects it
-packed, and stores the packed file in `.git/objects/pack`
-directory.
-
-[NOTE]
-You will see two files, `pack-\*.pack` and `pack-\*.idx`,
-in `.git/objects/pack` directory. They are closely related to
-each other, and if you ever copy them by hand to a different
-repository for whatever reason, you should make sure you copy
-them together. The former holds all the data from the objects
-in the pack, and the latter holds the index for random
-access.
-
-If you are paranoid, running `git-verify-pack` command would
-detect if you have a corrupt pack, but do not worry too much.
-Our programs are always perfect ;-).
-
-Once you have packed objects, you do not need to leave the
-unpacked objects that are contained in the pack file anymore.
-
-------------
-$ git prune-packed
-------------
-
-would remove them for you.
-
-You can try running `find .git/objects -type f` before and after
-you run `git prune-packed` if you are curious. Also `git
-count-objects` would tell you how many unpacked objects are in
-your repository and how much space they are consuming.
-
-[NOTE]
-`git pull` is slightly cumbersome for HTTP transport, as a
-packed repository may contain relatively few objects in a
-relatively large pack. If you expect many HTTP pulls from your
-public repository you might want to repack & prune often, or
-never.
-
-If you run `git repack` again at this point, it will say
-"Nothing to pack". Once you continue your development and
-accumulate the changes, running `git repack` again will create a
-new pack, that contains objects created since you packed your
-repository the last time. We recommend that you pack your project
-soon after the initial import (unless you are starting your
-project from scratch), and then run `git repack` every once in a
-while, depending on how active your project is.
-
-When a repository is synchronized via `git push` and `git pull`
-objects packed in the source repository are usually stored
-unpacked in the destination, unless rsync transport is used.
-While this allows you to use different packing strategies on
-both ends, it also means you may need to repack both
-repositories every once in a while.
-
-
-Working with Others
--------------------
-
-Although git is a truly distributed system, it is often
-convenient to organize your project with an informal hierarchy
-of developers. Linux kernel development is run this way. There
-is a nice illustration (page 17, "Merges to Mainline") in Randy
-Dunlap's presentation (`http://tinyurl.com/a2jdg`).
-
-It should be stressed that this hierarchy is purely *informal*.
-There is nothing fundamental in git that enforces the "chain of
-patch flow" this hierarchy implies. You do not have to pull
-from only one remote repository.
-
-A recommended workflow for a "project lead" goes like this:
-
-1. Prepare your primary repository on your local machine. Your
- work is done there.
-
-2. Prepare a public repository accessible to others.
-+
-If other people are pulling from your repository over dumb
-transport protocols (HTTP), you need to keep this repository
-'dumb transport friendly'. After `git init-db`,
-`$GIT_DIR/hooks/post-update` copied from the standard templates
-would contain a call to `git-update-server-info` but the
-`post-update` hook itself is disabled by default -- enable it
-with `chmod +x post-update`. This makes sure `git-update-server-info`
-keeps the necessary files up-to-date.
-
-3. Push into the public repository from your primary
- repository.
-
-4. `git repack` the public repository. This establishes a big
- pack that contains the initial set of objects as the
- baseline, and possibly `git prune` if the transport
- used for pulling from your repository supports packed
- repositories.
-
-5. Keep working in your primary repository. Your changes
- include modifications of your own, patches you receive via
- e-mails, and merges resulting from pulling the "public"
- repositories of your "subsystem maintainers".
-+
-You can repack this private repository whenever you feel like.
-
-6. Push your changes to the public repository, and announce it
- to the public.
-
-7. Every once in a while, "git repack" the public repository.
- Go back to step 5. and continue working.
-
-
-A recommended work cycle for a "subsystem maintainer" who works
-on that project and has an own "public repository" goes like this:
-
-1. Prepare your work repository, by `git clone` the public
- repository of the "project lead". The URL used for the
- initial cloning is stored in `.git/remotes/origin`.
-
-2. Prepare a public repository accessible to others, just like
- the "project lead" person does.
-
-3. Copy over the packed files from "project lead" public
- repository to your public repository, unless the "project
- lead" repository lives on the same machine as yours. In the
- latter case, you can use `objects/info/alternates` file to
- point at the repository you are borrowing from.
-
-4. Push into the public repository from your primary
- repository. Run `git repack`, and possibly `git prune` if the
- transport used for pulling from your repository supports
- packed repositories.
-
-5. Keep working in your primary repository. Your changes
- include modifications of your own, patches you receive via
- e-mails, and merges resulting from pulling the "public"
- repositories of your "project lead" and possibly your
- "sub-subsystem maintainers".
-+
-You can repack this private repository whenever you feel
-like.
-
-6. Push your changes to your public repository, and ask your
- "project lead" and possibly your "sub-subsystem
- maintainers" to pull from it.
-
-7. Every once in a while, `git repack` the public repository.
- Go back to step 5. and continue working.
-
-
-A recommended work cycle for an "individual developer" who does
-not have a "public" repository is somewhat different. It goes
-like this:
-
-1. Prepare your work repository, by `git clone` the public
- repository of the "project lead" (or a "subsystem
- maintainer", if you work on a subsystem). The URL used for
- the initial cloning is stored in `.git/remotes/origin`.
-
-2. Do your work in your repository on 'master' branch.
-
-3. Run `git fetch origin` from the public repository of your
- upstream every once in a while. This does only the first
- half of `git pull` but does not merge. The head of the
- public repository is stored in `.git/refs/heads/origin`.
-
-4. Use `git cherry origin` to see which ones of your patches
- were accepted, and/or use `git rebase origin` to port your
- unmerged changes forward to the updated upstream.
-
-5. Use `git format-patch origin` to prepare patches for e-mail
- submission to your upstream and send it out. Go back to
- step 2. and continue.
-
-
-Working with Others, Shared Repository Style
---------------------------------------------
-
-If you are coming from CVS background, the style of cooperation
-suggested in the previous section may be new to you. You do not
-have to worry. git supports "shared public repository" style of
-cooperation you are probably more familiar with as well.
-
-For this, set up a public repository on a machine that is
-reachable via SSH by people with "commit privileges". Put the
-committers in the same user group and make the repository
-writable by that group. Make sure their umasks are set up to
-allow group members to write into directories other members
-have created.
-
-You, as an individual committer, then:
-
-- First clone the shared repository to a local repository:
-------------------------------------------------
-$ git clone repo.shared.xz:/pub/scm/project.git/ my-project
-$ cd my-project
-$ hack away
-------------------------------------------------
-
-- Merge the work others might have done while you were hacking
- away:
-------------------------------------------------
-$ git pull origin
-$ test the merge result
-------------------------------------------------
-[NOTE]
-================================
-The first `git clone` would have placed the following in
-`my-project/.git/remotes/origin` file, and that's why this and
-the next step work.
-------------
-URL: repo.shared.xz:/pub/scm/project.git/ my-project
-Pull: master:origin
-------------
-================================
-
-- push your work as the new head of the shared
- repository.
-------------------------------------------------
-$ git push origin master
-------------------------------------------------
-If somebody else pushed into the same shared repository while
-you were working locally, `git push` in the last step would
-complain, telling you that the remote `master` head does not
-fast forward. You need to pull and merge those other changes
-back before you push your work when it happens.
-
-
-Advanced Shared Repository Management
--------------------------------------
-
-Being able to push into a shared repository means being able to
-write into it. If your developers are coming over the network,
-this means you, as the repository administrator, need to give
-each of them an SSH access to the shared repository machine.
-
-In some cases, though, you may not want to give a normal shell
-account to them, but want to restrict them to be able to only
-do `git push` into the repository and nothing else.
-
-You can achieve this by setting the login shell of your
-developers on the shared repository host to `git-shell` program.
-
-[NOTE]
-Most likely you would also need to list `git-shell` program in
-`/etc/shells` file.
-
-This restricts the set of commands that can be run from incoming
-SSH connection for these users to only `receive-pack` and
-`upload-pack`, so the only thing they can do are `git fetch` and
-`git push`.
-
-You still need to create UNIX user accounts for each developer,
-and put them in the same group. Make sure that the repository
-shared among these developers is writable by that group.
-
-. Initializing the shared repository with `git-init-db --shared`
-helps somewhat.
-
-. Run the following in the shared repository:
-+
-------------
-$ chgrp -R $group repo.git
-$ find repo.git -type d -print | xargs chmod ug+rwx,g+s
-$ GIT_DIR=repo.git git repo-config core.sharedrepository true
-------------
-
-The above measures make sure that directories lazily created in
-`$GIT_DIR` are writable by group members. You, as the
-repository administrator, are still responsible to make sure
-your developers belong to that shared repository group and set
-their umask to a value no stricter than 027 (i.e. at least allow
-reading and searching by group members).
-
-You can implement finer grained branch policies using update
-hooks. There is a document ("control access to branches") in
-Documentation/howto by Carl Baldwin and JC outlining how to (1)
-limit access to branch per user, (2) forbid overwriting existing
-tags.
+you can refer to HEAD^^ by the name "v2.5". If you intend to share
+this name with other people (for example, to identify a release
+version), you should create a "tag" object, and perhaps sign it; see
+gitlink:git-tag[1] for details.
+You can revisit the old state of a tree, and make further
+modifications if you wish, using git branch: the command
-Bundling your work together
----------------------------
+-------------------------------------
+$ git branch stable-release v2.5
+-------------------------------------
+
+will create a new branch named "stable-release" starting from the
+commit which you tagged with the name v2.5.
-It is likely that you will be working on more than one thing at
-a time. It is easy to manage those more-or-less independent tasks
-using branches with git.
-
-We have already seen how branches work previously,
-with "fun and work" example using two branches. The idea is the
-same if there are more than two branches. Let's say you started
-out from "master" head, and have some new code in the "master"
-branch, and two independent fixes in the "commit-fix" and
-"diff-fix" branches:
-
-------------
-$ git show-branch
-! [commit-fix] Fix commit message normalization.
- ! [diff-fix] Fix rename detection.
- * [master] Release candidate #1
----
- + [diff-fix] Fix rename detection.
- + [diff-fix~1] Better common substring algorithm.
-+ [commit-fix] Fix commit message normalization.
- * [master] Release candidate #1
-++* [diff-fix~2] Pretty-print messages.
-------------
-
-Both fixes are tested well, and at this point, you want to merge
-in both of them. You could merge in 'diff-fix' first and then
-'commit-fix' next, like this:
-
-------------
-$ git merge 'Merge fix in diff-fix' master diff-fix
-$ git merge 'Merge fix in commit-fix' master commit-fix
-------------
-
-Which would result in:
-
-------------
-$ git show-branch
-! [commit-fix] Fix commit message normalization.
- ! [diff-fix] Fix rename detection.
- * [master] Merge fix in commit-fix
----
- - [master] Merge fix in commit-fix
-+ * [commit-fix] Fix commit message normalization.
- - [master~1] Merge fix in diff-fix
- +* [diff-fix] Fix rename detection.
- +* [diff-fix~1] Better common substring algorithm.
- * [master~2] Release candidate #1
-++* [master~3] Pretty-print messages.
-------------
-
-However, there is no particular reason to merge in one branch
-first and the other next, when what you have are a set of truly
-independent changes (if the order mattered, then they are not
-independent by definition). You could instead merge those two
-branches into the current branch at once. First let's undo what
-we just did and start over. We would want to get the master
-branch before these two merges by resetting it to 'master~2':
-
-------------
-$ git reset --hard master~2
-------------
-
-You can make sure 'git show-branch' matches the state before
-those two 'git merge' you just did. Then, instead of running
-two 'git merge' commands in a row, you would pull these two
-branch heads (this is known as 'making an Octopus'):
-
-------------
-$ git pull . commit-fix diff-fix
-$ git show-branch
-! [commit-fix] Fix commit message normalization.
- ! [diff-fix] Fix rename detection.
- * [master] Octopus merge of branches 'diff-fix' and 'commit-fix'
----
- - [master] Octopus merge of branches 'diff-fix' and 'commit-fix'
-+ * [commit-fix] Fix commit message normalization.
- +* [diff-fix] Fix rename detection.
- +* [diff-fix~1] Better common substring algorithm.
- * [master~1] Release candidate #1
-++* [master~2] Pretty-print messages.
-------------
-
-Note that you should not do Octopus because you can. An octopus
-is a valid thing to do and often makes it easier to view the
-commit history if you are pulling more than two independent
-changes at the same time. However, if you have merge conflicts
-with any of the branches you are merging in and need to hand
-resolve, that is an indication that the development happened in
-those branches were not independent after all, and you should
-merge two at a time, documenting how you resolved the conflicts,
-and the reason why you preferred changes made in one side over
-the other. Otherwise it would make the project history harder
-to follow, not easier.
+You can reset the state of any branch to an earlier commit at any
+time with
+
+-------------------------------------
+$ git reset --hard v2.5
+-------------------------------------
-[ to be continued.. cvsimports ]
+This will remove all later commits from this branch and reset the
+working tree to the state it had when the given commit was made. If
+this branch is the only branch containing the later commits, those
+later changes will be lost. Don't use "git reset" on a
+publicly-visible branch that other developers pull from, as git will
+be confused by history that disappears in this way.
+
+Next Steps
+----------
+
+Some good commands to explore next:
+
+ * gitlink:git-diff[1]: This flexible command does much more than
+ we've seen in the few examples above.
+
+ * gitlink:git-format-patch[1], gitlink:git-am[1]: These convert
+ series of git commits into emailed patches, and vice versa,
+ useful for projects such as the linux kernel which rely heavily
+ on emailed patches.
+
+ * gitlink:git-bisect[1]: When there is a regression in your
+ project, one way to track down the bug is by searching through
+ the history to find the exact commit that's to blame. Git bisect
+ can help you perform a binary search for that commit. It is
+ smart enough to perform a close-to-optimal search even in the
+ case of complex non-linear history with lots of merged branches.
+
+Other good starting points include link:everyday.html[Everday GIT
+with 20 Commands Or So] and link:cvs-migration.html[git for CVS
+users]. Also, link:core-tutorial.html[A short git tutorial] gives an
+introduction to lower-level git commands for advanced users and
+developers.
--
0.99.8b-g58e3
^ permalink raw reply related [relevance 6%]
* [PATCH] show-branch: make the current branch stand out.
@ 2006-01-12 0:05 21% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2006-01-12 0:05 UTC (permalink / raw)
To: git
This changes the character used to mark the commits that is on the
branch from '+' to '*' for the current branch, to make it stand out.
When you have a handful branches with relatively long diversion, it
is easier to see which one is the current branch this way.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* Currently in "pu".
Documentation/git-show-branch.txt | 6 ++-
Documentation/howto/revert-branch-rebase.txt | 24 +++++++-------
Documentation/tutorial.txt | 46 +++++++++++++-------------
show-branch.c | 5 ++-
t/t1200-tutorial.sh | 6 ++-
5 files changed, 45 insertions(+), 42 deletions(-)
825abb210cb5fd776a120589a1da41f6a06db191
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 90e2a5c..a2b8eb9 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -103,7 +103,7 @@ and "mhf":
------------------------------------------------
$ git show-branch master fixes mhf
-! [master] Add 'git show-branch'.
+* [master] Add 'git show-branch'.
! [fixes] Introduce "reset type" flag to "git reset"
! [mhf] Allow "+remote:local" refspec to cause --force when fetching.
---
@@ -117,13 +117,13 @@ $ git show-branch master fixes mhf
+ [mhf~6] Retire git-parse-remote.
+ [mhf~7] Multi-head fetch.
+ [mhf~8] Start adding the $GIT_DIR/remotes/ support.
-+++ [master] Add 'git show-branch'.
+*++ [master] Add 'git show-branch'.
------------------------------------------------
These three branches all forked from a common commit, [master],
whose commit message is "Add 'git show-branch'. "fixes" branch
adds one commit 'Introduce "reset type"'. "mhf" branch has many
-other commits.
+other commits. The current branch is "master".
EXAMPLE
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index 5a7e0cf..a83ce1c 100644
--- a/Documentation/howto/revert-branch-rebase.txt
+++ b/Documentation/howto/revert-branch-rebase.txt
@@ -32,16 +32,16 @@ merge introduced 5 commits or so:
------------------------------------------------
$ git show-branch --more=4 master master^2 | head
-! [master] Merge refs/heads/portable from http://www.cs.berkeley....
+* [master] Merge refs/heads/portable from http://www.cs.berkeley....
! [master^2] Replace C99 array initializers with code.
--
-+ [master] Merge refs/heads/portable from http://www.cs.berkeley....
-++ [master^2] Replace C99 array initializers with code.
-++ [master^2~1] Replace unsetenv() and setenv() with older putenv().
-++ [master^2~2] Include sys/time.h in daemon.c.
-++ [master^2~3] Fix ?: statements.
-++ [master^2~4] Replace zero-length array decls with [].
-+ [master~1] tutorial note about git branch
+* [master] Merge refs/heads/portable from http://www.cs.berkeley....
+*+ [master^2] Replace C99 array initializers with code.
+*+ [master^2~1] Replace unsetenv() and setenv() with older putenv().
+*+ [master^2~2] Include sys/time.h in daemon.c.
+*+ [master^2~3] Fix ?: statements.
+*+ [master^2~4] Replace zero-length array decls with [].
+* [master~1] tutorial note about git branch
------------------------------------------------
The '--more=4' above means "after we reach the merge base of refs,
@@ -193,8 +193,8 @@ $ git show-branch --more=1 master pu rc
+ [pu~4] Document "git cherry-pick" and "git revert"
+ [pu~5] Remove git-apply-patch-script.
+ [pu~6] Redo "revert" using three-way merge machinery.
- + [rc] Merge refs/heads/master from .
-+++ [master] Revert "Replace zero-length array decls with []."
- + [rc~1] Merge refs/heads/master from .
-+++ [master~1] Merge refs/heads/portable from http://www.cs.berkeley....
+ * [rc] Merge refs/heads/master from .
+++* [master] Revert "Replace zero-length array decls with []."
+ * [rc~1] Merge refs/heads/master from .
+++* [master~1] Merge refs/heads/portable from http://www.cs.berkeley....
------------------------------------------------
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index edd91cb..43a1975 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -968,8 +968,8 @@ $ git show-branch master mybranch
* [master] Merge work in mybranch
! [mybranch] Some work.
--
-+ [master] Merge work in mybranch
-++ [mybranch] Some work.
+* [master] Merge work in mybranch
+*+ [mybranch] Some work.
------------------------------------------------
The first two lines indicate that it is showing the two branches
@@ -1024,7 +1024,7 @@ $ git show-branch master mybranch
! [master] Merge work in mybranch
* [mybranch] Merge work in mybranch
--
-++ [master] Merge work in mybranch
++* [master] Merge work in mybranch
------------------------------------------------
@@ -1199,9 +1199,9 @@ $ git show-branch --more=3 master mybran
! [master] Merge work in mybranch
* [mybranch] Merge work in mybranch
--
-++ [master] Merge work in mybranch
-++ [master^2] Some work.
-++ [master^] Some fun.
++* [master] Merge work in mybranch
++* [master^2] Some work.
++* [master^] Some fun.
------------
Remember, before running `git merge`, our `master` head was at
@@ -1223,8 +1223,8 @@ $ git show-branch
! [mybranch] Some work.
--
+ [mybranch] Some work.
-+ [master] Some fun.
-++ [mybranch^] New day.
+* [master] Some fun.
+*+ [mybranch^] New day.
------------
Now we are ready to experiment with the merge by hand.
@@ -1743,8 +1743,8 @@ $ git show-branch
+ [diff-fix] Fix rename detection.
+ [diff-fix~1] Better common substring algorithm.
+ [commit-fix] Fix commit message normalization.
- + [master] Release candidate #1
-+++ [diff-fix~2] Pretty-print messages.
+ * [master] Release candidate #1
+++* [diff-fix~2] Pretty-print messages.
------------
Both fixes are tested well, and at this point, you want to merge
@@ -1764,13 +1764,13 @@ $ git show-branch
! [diff-fix] Fix rename detection.
* [master] Merge fix in commit-fix
---
- + [master] Merge fix in commit-fix
-+ + [commit-fix] Fix commit message normalization.
- + [master~1] Merge fix in diff-fix
- ++ [diff-fix] Fix rename detection.
- ++ [diff-fix~1] Better common substring algorithm.
- + [master~2] Release candidate #1
-+++ [master~3] Pretty-print messages.
+ * [master] Merge fix in commit-fix
++ * [commit-fix] Fix commit message normalization.
+ * [master~1] Merge fix in diff-fix
+ +* [diff-fix] Fix rename detection.
+ +* [diff-fix~1] Better common substring algorithm.
+ * [master~2] Release candidate #1
+++* [master~3] Pretty-print messages.
------------
However, there is no particular reason to merge in one branch
@@ -1797,12 +1797,12 @@ $ git show-branch
! [diff-fix] Fix rename detection.
* [master] Octopus merge of branches 'diff-fix' and 'commit-fix'
---
- + [master] Octopus merge of branches 'diff-fix' and 'commit-fix'
-+ + [commit-fix] Fix commit message normalization.
- ++ [diff-fix] Fix rename detection.
- ++ [diff-fix~1] Better common substring algorithm.
- + [master~1] Release candidate #1
-+++ [master~2] Pretty-print messages.
+ * [master] Octopus merge of branches 'diff-fix' and 'commit-fix'
++ * [commit-fix] Fix commit message normalization.
+ +* [diff-fix] Fix rename detection.
+ +* [diff-fix~1] Better common substring algorithm.
+ * [master~1] Release candidate #1
+++* [master~2] Pretty-print messages.
------------
Note that you should not do Octopus because you can. An octopus
diff --git a/show-branch.c b/show-branch.c
index f296a87..03324aa 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -545,6 +545,7 @@ int main(int ac, char **av)
int sha1_name = 0;
int shown_merge_point = 0;
int no_current_branch = 0;
+ int head_at = -1;
git_config(git_show_branch_config);
setup_git_directory();
@@ -696,6 +697,8 @@ int main(int ac, char **av)
}
/* header lines never need name */
show_one_commit(rev[i], 1);
+ if (is_head)
+ head_at = i;
}
if (0 <= extra) {
for (i = 0; i < num_rev; i++)
@@ -725,7 +728,7 @@ int main(int ac, char **av)
if (1 < num_rev) {
for (i = 0; i < num_rev; i++)
putchar((this_flag & (1u << (i + REV_SHIFT)))
- ? '+' : ' ');
+ ? (i == head_at ? '*' : '+') : ' ');
putchar(' ');
}
show_one_commit(commit, no_name);
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index d7562e9..7879b49 100755
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -118,8 +118,8 @@ cat > show-branch.expect << EOF
* [master] Merged "mybranch" changes.
! [mybranch] Some work.
--
-+ [master] Merged "mybranch" changes.
-++ [mybranch] Some work.
+* [master] Merged "mybranch" changes.
+*+ [mybranch] Some work.
EOF
git show-branch --topo-order master mybranch > show-branch.output
@@ -142,7 +142,7 @@ cat > show-branch2.expect << EOF
! [master] Merged "mybranch" changes.
* [mybranch] Merged "mybranch" changes.
--
-++ [master] Merged "mybranch" changes.
++* [master] Merged "mybranch" changes.
EOF
git show-branch --topo-order master mybranch > show-branch2.output
--
1.1.1-g8ecb
^ permalink raw reply related [relevance 21%]
* GIT 0.99.7d, and end of week status.
@ 2005-09-25 8:36 2% Junio C Hamano
0 siblings, 0 replies; 58+ results
From: Junio C Hamano @ 2005-09-25 8:36 UTC (permalink / raw)
To: git
* The fourth minor fix release, GIT 0.99.7d, is available at the
usual places.
RPMs and Debs are found in http://kernel.org/pub/software/scm/
With git:
$ git fetch http://kernel.org/pub/scm/git/git.git tag v0.99.7d
$ git checkout -b <new-branch> v0.99.7d
Fixes since 0.99.7c are:
- Fix show-branch output that named commits incorrectly.
- Fix git-grep -e not passing -e to underlying grep.
* Recent updates to the master branch includes:
- The GIT_VERSION is now 0.99.7.GIT (thanks Pasky for the
idea).
- The symlinks for backward compatible names are not installed
anymore (but existing ones are not automatically removed).
- git-diff-* family acquired a new option, --name-status, to
show the status and name for changed files. Also -l<num>
option disables rename/copy detection when the number of
rename target candidates are more than <num> (idea by Linus
some time ago).
* Proposed updates, not yet graduated to the master branch
includes:
- git-merge fix, not to require a clean tree.
- Likewise for git-revert and git-cherry-pick fix, not to
require a clean tree.
- Use git-merge from git-pull, again.
- A couple of test fixes for further Solaris portability.
- update-index takes -z --stdin to read NUL terminated list of
paths from the standard input instead of from the command
line. This is to help platforms with xargs that cannot grok
-0. git-commit is updated to use this.
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Cogito-0.11.2
@ 2005-06-08 23:07 3% Petr Baudis
0 siblings, 0 replies; 58+ results
From: Petr Baudis @ 2005-06-08 23:07 UTC (permalink / raw)
To: git
Hello,
I'm happy to announce Cogito-0.11.2, next version of my SCMish layer
over Linus' GIT tree history storage tool. You can get it as usual on
kernel.org/pub/software/scm/cogito/
or by doing cg-update in your cogito.git repository.
The changes include especially some bugfixes and portability and
performance enhancements, as well as all the sweet stuff from Linus.
Note that I discovered a bug few minutes after releasing (as usual).
cg-log won't work correctly if ran with some files specified (the
"cg-log file" usage). I think it actually does not get used like this so
frequently, so I don't think it's worth another release by itself. But
expect new release as soon as some non-trivial amount of bugfixes piles
up (including core git bugfixes), quite soon hopefully.
Here's git-rev-list --pretty HEAD ^cogito-0.11.1 | git-shortlog
(BTW, Dan, what about another cg-log option for git-shortlog output? ;-):
C. Cooke:
Check whether the git repository is present before executing the command
Catalin Marinas:
cg-commit: Fix the log file readin from stdin
[PATCH Cogito] Add -f parameter also to cg-update
Chris Wedgwood:
cogitio: sh != bash
Christian Meder:
Miniscule correction of diff-format.txt
Dan Holmsand:
Make cg-add use xargs -0
Daniel Barkalow:
Document git-ssh-pull and git-ssh-push
-w support for git-ssh-pull/push
Generic support for pulling refs
rsh.c environment variable
Operations on refs
ssh-protocol version, command types, response code
Eugene Surovegin:
fix cg-commit new file handling
Jason McMullan:
Anal retentive 'const unsigned char *sha1'
Modify git-rev-list to linearise the commit history in merge order.
Jon Seymour:
three --merge-order bug fixes
Jonas Fonseca:
cg-commit: prefix pathspec argument with --
git-diff-cache: handle pathspec beginning with a dash
git-diff-cache: handle pathspec beginning with a dash
cg-log: cleanup line wrapping by using bash internals
Documentation improvements
Misc cg-log documentation fixes
Cleanup commit messages with git-stripspace
[PATCH 10/10] Add -s option to show log summary
[PATCH 9/10] Move file matching inside the loop.
[PATCH 8/10] Move the username matching inside the loop
[PATCH 7/10] Move log printing to separate function
[PATCH 6/10] Remove the catch all rule
[PATCH 5/10] Move printing of the commit info line inside the loop
[PATCH 4/10] First parse all commit header entries then print them
[PATCH 3/10] Separate handling of author and committer in commit headers
[PATCH 2/10] Separate handling of tree and parent in commit headers
[PATCH 1/10] Cleanup conversion to human readable date
cg-Xnormid: support revision ids specified by date
Junio C Hamano:
Tests: read-tree -m test updates.
Documentation: describe diff tweaking (fix).
Start cvs-migration documentation
read-tree: update documentation for 3-way merge.
read-tree: save more user hassles during fast-forward.
index locking like everybody else
3-way merge tests for new "git-read-tree -m"?
rename git-rpush and git-rpull to git-ssh-push and git-ssh-pull
Documentation: describe git extended diff headers.
Documentation: describe diff tweaking.
pull: gracefully recover from delta retrieval failure.
diffcore-break.c: various fixes.
diff.c: -B argument passing fix.
diff.c: locate_size_cache() fix.
diff: Update -B heuristics.
diff: Clean up diff_scoreopt_parse().
diff: Fix docs and add -O to diff-helper.
Tweak count-delta interface
Find size of SHA1 object without inflating everything.
Handle deltified object correctly in git-*-pull family.
Linus Torvalds:
Remove MERGE_HEAD after committing merge
Make "git commit" work correctly in the presense of a manual merge
cvs-migration: add more of a header to the "annotate" discussion
Leave merge failures in the filesystem
Fix SIGSEGV on unmerged files in git-diff-files -p
Make default merge messages denser.
git-apply: creatign empty files is nonfatal
Talk about "git cvsimport" in the cvs migration docs
git-read-tree: -u without -m is meaningless. Don't allow it.
git-read-tree: make one-way merge also honor the "update" flag
Add CVS import scripts and programs
git-ssh-push/pull: usability improvements
git-resolve-script: stop when the automated merge fails
Make fetch/pull scripts terminate cleanly on errors
git-resolve-script: don't wait for three seconds any more
git-read-tree: some "final" cleanups
git-read-tree: simplify merge loops enormously
Add "__noreturn__" attribute to die() and usage()
git-rev-list: make sure to link with ssl libraries
Fix off-by-one in new three-way-merge updates
Three-way merge: fix silly bug that made trivial merges not work
Fix entry.c dependency and compile problem
git-read-tree: fix up two-way merge
More work on merging with git-read-tree..
Make fiel checkout function available to the git library
git-read-tree: fix up three-way merge tests
git-read-tree: be a lot more careful about merging dirty trees
diff 'rename' format change.
git-apply: consider it an error to apply no changes
git-apply: fix rename header parsing
git-apply: actually apply patches and update the index
git-apply: fix apply of a new file
git-apply: find offset fragments, and really apply them
git-apply: first cut at actually checking fragment data
git-fsck-cache: complain if no default references found
pretty_print_commit: add different formats
git-shortlog: add name translations for 'sparse' repo
Add git-shortlog perl script
git-rev-list: allow arbitrary head selections, use git-rev-tree syntax
Clarify git-diff-cache semantics in the tutorial.
Mark Allen:
Modify cg-Xlib for non-GNU date.
Michal Rokos:
[cogito] Sync objects only when needed
[cogito] paged output for cg-diff
Abstracted out $PAGER invocation to a pager() function
Petr Baudis:
Fix cg-log called on specified files
cogito-0.11.2
Added trivial cg wrapper
Use portable sed stuff in cg-log Signed-off-by highlighting
showdate() now uses $(()) instead of $(expr)
Fixed cg-log -u
cg-merge now sometimes allows tree merge + local changes
Add the t6001 testcase which got missed out at the last merge.
Move commit line processing to process_commit_line
Improved cg-Xmergefile
Fix git-merge-one-file permissions auto-merging
Fix cg-patch reverting file removal
Reindent print_commit_log() body
cg-log is now pure git-rev-list --pretty=raw frontend
Fix cg-commit doing shell expansion on -m arguments
Fix mismerged git-r* -> git-ssh-* rename in Makefile
Move print_commit_log() in cg-log
Fix an errorneous cg-clone example in the README
Make git-update-cache --force-remove regular
Portability sed fix in cg-commit
Improve git-rev-list --header output
Implement cg-rm -n for untracking files
Fixed cg-Xnormid " " call
cg-commit now updates cache separately for different change types
Pass revisions to commit-id, parent-id, tree-id and cg-Xnormid quoted
Do rm -f in make uninstall
make dist will now produce tarball with sensible name
Rene Scharfe:
git-tar-tree: do only basic tests in t/t5000-git-tar-tree.sh
git-tar-tree: fix write_trailer
git-tar-tree: add a test case
git-tar-tree: small doc update
git-tar-tree: cleanup write_trailer()
Sven Verdoolaege:
git-cvs2git: create tags
Timo Hirvonen:
Use ntohs instead of htons to convert ce_flags to host byte order
Have fun,
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..
^ permalink raw reply [relevance 3%]
Results 401-458 of 458 prev (newer) | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2005-06-08 23:07 3% [ANNOUNCE] Cogito-0.11.2 Petr Baudis
2005-09-25 8:36 2% GIT 0.99.7d, and end of week status Junio C Hamano
2006-01-11 23:47 merging initial part of a branch? Junio C Hamano
2006-01-12 0:55 ` J. Bruce Fields
2006-01-12 1:47 ` Junio C Hamano
2006-01-13 3:08 ` J. Bruce Fields
2006-01-13 4:00 ` Junio C Hamano
2006-01-13 15:10 ` J. Bruce Fields
2006-01-13 19:50 ` Junio C Hamano
2006-01-13 20:01 ` J. Bruce Fields
[not found] ` <20060115185458.GA3985@fieldses.org>
2006-01-15 23:26 ` [PATCH] new tutorial Junio C Hamano
2006-01-23 4:57 6% ` J. Bruce Fields
2006-01-12 0:05 21% [PATCH] show-branch: make the current branch stand out Junio C Hamano
2006-03-25 22:26 Why would merge fail on a one-line addition? Marc Singer
2006-03-26 1:32 2% ` Junio C Hamano
2006-05-14 17:43 Allow one-way tree merge to remove old files Linus Torvalds
2006-05-14 18:20 ` Simplify "git reset --hard" Linus Torvalds
2006-05-15 6:55 ` Junio C Hamano
2006-05-15 7:08 ` Junio C Hamano
2006-05-15 7:46 2% ` Junio C Hamano
2006-05-15 14:55 0% ` Linus Torvalds
2006-06-10 21:16 2% [ANNOUNCE] GIT 1.4.0 Junio C Hamano
2006-06-22 8:44 1% [PATCH] rebase --merge: fix for rebasing more than 7 commits Junio C Hamano
2006-06-22 8:54 2% ` Junio C Hamano
2006-06-22 11:09 2% ` Eric Wong
2006-06-24 7:09 2% ` Junio C Hamano
2006-06-22 19:49 3% What's in git.git and announcing v1.4.1-rc1 Junio C Hamano
2006-07-02 6:33 3% [ANNOUNCE] GIT 1.4.1 Junio C Hamano
2006-10-29 19:32 Merging five months of Linux kernel history Jan-Benedict Glaw
2006-10-29 20:34 2% ` Junio C Hamano
2006-10-30 7:50 0% ` Jan-Benedict Glaw
2006-12-06 21:18 3% What's in git.git (stable) Junio C Hamano
2006-12-13 21:35 3% Junio C Hamano
2007-02-05 11:34 14% [PATCH] core-tutorial: git-merge uses -m for commit messages Matthias Lederhofer
2007-04-16 1:27 What's in git.git (stable) Junio C Hamano
2007-04-18 23:58 ` Junio C Hamano
2007-04-22 6:22 3% ` Junio C Hamano
2007-05-20 9:08 3% [ANNOUNCE] GIT 1.5.2 Junio C Hamano
2007-09-06 8:52 What's cooking in git.git (topics) Junio C Hamano
[not found] ` <7v1wd1d0le.fsf@gitster.siamese.dyndns.org>
2007-09-26 20:05 3% ` Junio C Hamano
2007-09-26 21:44 0% ` Johannes Schindelin
2007-09-27 2:36 0% ` Jeff King
2007-10-02 5:53 2% ` Junio C Hamano
2007-09-23 22:51 2% [PATCH 0/6] per branch options for git-merge Lars Hjemli
2007-09-23 22:51 ` [PATCH 1/6] Add test-script for git-merge porcelain Lars Hjemli
2007-09-23 22:51 2% ` [PATCH 2/6] git-merge: fix faulty SQUASH_MSG Lars Hjemli
2007-10-30 19:54 14% [PATCH] core-tutorial: Use new syntax for git-merge Sergei Organov
2007-10-30 20:05 0% ` Junio C Hamano
2007-11-02 17:12 13% [PATCH] Documentation: quote commit messages consistently Sergei Organov
2007-12-06 4:49 When a merge turns into a conflict Anand Kumria
2007-12-06 5:51 2% ` Junio C Hamano
2008-01-12 22:46 performance problem: "git commit filename" Linus Torvalds
2008-01-13 1:46 ` Linus Torvalds
2008-01-13 4:04 ` Linus Torvalds
2008-01-13 8:12 ` Junio C Hamano
2008-01-13 10:33 ` Junio C Hamano
2008-01-13 11:09 2% ` Junio C Hamano
2008-03-09 10:46 What's cooking in git.git (topics) Junio C Hamano
2008-04-04 18:24 ` Junio C Hamano
2008-04-09 9:43 ` Junio C Hamano
2008-04-14 7:00 ` Junio C Hamano
2008-04-19 8:19 ` Junio C Hamano
2008-04-22 10:03 ` Junio C Hamano
2008-04-27 6:04 ` Junio C Hamano
2008-05-06 6:38 ` Junio C Hamano
2008-05-14 22:30 ` Junio C Hamano
2008-05-22 1:18 ` Junio C Hamano
2008-05-26 1:22 ` Junio C Hamano
2008-05-30 20:44 ` Junio C Hamano
2008-06-02 7:58 ` Junio C Hamano
2008-06-13 10:16 ` Junio C Hamano
2008-06-18 7:31 ` Junio C Hamano
2008-06-21 9:44 ` Junio C Hamano
2008-06-23 7:15 ` Junio C Hamano
2008-06-25 9:31 ` Junio C Hamano
2008-06-29 8:55 ` Junio C Hamano
2008-06-30 9:08 ` Junio C Hamano
2008-07-02 4:41 ` Junio C Hamano
2008-07-06 10:04 2% ` Junio C Hamano
2008-07-08 2:46 2% ` Junio C Hamano
2008-07-10 2:32 2% ` Junio C Hamano
2008-07-14 5:11 2% ` Junio C Hamano
2008-07-16 3:33 2% ` Junio C Hamano
2008-08-23 9:01 [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Junio C Hamano
2008-08-23 10:57 ` Miklos Vajna
2008-08-23 19:55 2% ` Junio C Hamano
2008-08-23 19:56 2% ` [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area Junio C Hamano
2008-08-24 1:58 3% ` Junio C Hamano
2008-08-24 3:38 3% What's cooking in git.git (Aug 2008, #07; Sat, 23) Junio C Hamano
2008-08-28 2:54 3% What's cooking in git.git (Aug 2008, #08; Wed, 27) Junio C Hamano
2008-08-28 3:01 3% What's in git.git (Aug 2008, #07; " Junio C Hamano
2008-09-25 0:58 having to pull twice Michael P. Soulier
2008-09-25 1:01 ` Shawn O. Pearce
2008-09-25 7:05 ` Thomas Rast
2008-09-25 23:25 2% ` Miklos Vajna
2008-09-27 14:16 0% ` Thomas Rast
2009-01-29 6:24 Something weird is happening H. Peter Anvin
2009-01-29 6:56 ` Junio C Hamano
[not found] ` <20090129113846.GA10645@elte.hu>
2009-01-29 12:05 ` Ingo Molnar
2009-01-31 14:39 2% ` [PATCH] merge: fix out-of-bounds memory access René Scharfe
2009-02-02 8:05 2% What's in git.git (Feb 2009, #01; Sun, 01) Junio C Hamano
2009-02-07 21:54 2% [ANNOUNCE] GIT 1.6.1.3 Junio C Hamano
2009-04-13 18:10 2% [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
2009-04-13 21:41 2% ` Allan Caffee
2009-04-13 23:12 2% ` Miklos Vajna
2009-04-27 15:41 2% ` Allan Caffee
2009-04-27 16:37 2% ` Junio C Hamano
2009-04-27 8:29 [ANNOUNCE] GIT 1.6.3.rc3 Junio C Hamano
2009-05-03 21:59 2% ` [ANNOUNCE] GIT 1.6.3.rc4 Junio C Hamano
2009-04-30 5:33 3% What's in git.git (Apr 2009, #02; Wed, 29) Junio C Hamano
2009-05-25 8:33 3% What's cooking in git.git (May 2009, #03; Mon, 25) Junio C Hamano
2009-06-01 1:24 2% What's cooking in git.git (May 2009, #04; Sun, 31) Junio C Hamano
2009-06-12 9:11 3% What's cooking in git.git (Jun 2009, #01; Fri, 12) Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).