* Re: [PATCH] git-branch --with=commit
From: Junio C Hamano @ 2007-11-08 8:13 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git
In-Reply-To: <4732BC6F.7070005@viscovery.net>
Johannes Sixt <j.sixt@viscovery.net> writes:
> Junio C Hamano schrieb:
>> $ git checkout -b xx/maint-fix-foo
>> $ git am -3 -s ,xx-maint-fix-foo.patch
>
> Is this comma a hidden feature?
No, just my personal convention to queue e-mails from my mailbox.
>> With this patch, I could do this to find out which topic
>> branches already contain the faulty commit:
>>
>> $ git branch --with=maint^ | grep /
>> xx/maint-fix-foo
>
> It'd be helpful if you could construct the example in this commit
> message such that you don't need the "grep /" here; otherwise, the
> reader doesn't know which part of the effect is hidden by the grep.
Yeah, in the example sequence, I think only maint itself and
xx/maint-fix-foo are shown, so there is no need for grep.
^ permalink raw reply
* Re: [PATCH MISC 1/1] Make gcc warning about empty if body go away.
From: Pierre Habouzit @ 2007-11-08 8:12 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vode57awg.fsf@gitster.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]
On Thu, Nov 08, 2007 at 02:01:51AM +0000, Junio C Hamano wrote:
> Pierre Habouzit <madcoder@debian.org> writes:
>
> > diff --git a/builtin-diff.c b/builtin-diff.c
> > index f77352b..80392a8 100644
> > --- a/builtin-diff.c
> > +++ b/builtin-diff.c
> > @@ -204,7 +204,7 @@ static void refresh_index_quietly(void)
> > if (write_cache(fd, active_cache, active_nr) ||
> > close(fd) ||
> > commit_locked_index(lock_file))
> > - ; /*
> > + (void)0; /*
> > * silently ignore it -- we haven't mucked
> > * with the real index.
> > */
>
> Wouldn't this be much easier to read, by the way?
>
> The point is that if we touched the active_cache, we try to
> write it out and make it the index file for later users to use
> by calling "commit", but we do not really care about the failure
> from this sequence because it is done purely as an optimization.
>
> The original code called three functions primarily for their
> side effects, which is admittedly a bad style.
Well all I care is that the warning goes away, it prevents me to build
in -Werror and it's bad :)
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* What's cooking in git.git (topics)
From: Junio C Hamano @ 2007-11-08 8:08 UTC (permalink / raw)
To: git
In-Reply-To: <7vr6j6ve90.fsf@gitster.siamese.dyndns.org>
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.
----------------------------------------------------------------
[Will merge to 'master' this weekend]
* js/parseopt-abbrev-fix (Mon Nov 5 13:15:21 2007 +0000) 1 commit
+ parse-options: abbreviation engine fix.
* js/reset (Sat Nov 3 15:21:21 2007 +0000) 2 commits
+ builtin-reset: avoid forking "update-index --refresh"
+ builtin-reset: do not call "ls-files --unmerged"
* js/upload-pack (Sun Nov 4 20:46:48 2007 +0100) 1 commit
+ upload-pack: Use finish_{command,async}() instead of waitpid().
----------------------------------------------------------------
[Will cook til next week and then merge to 'master']
* bg/format-patch-N (Tue Nov 6 10:04:24 2007 +1100) 3 commits
+ Rearrange git-format-patch synopsis to improve clarity.
+ format-patch: Test --[no-]numbered and format.numbered
+ format-patch: Add configuration and off switch for --numbered
* db/remote-builtin (Tue Nov 6 20:29:20 2007 -0500) 6 commits
+ Reteach builtin-ls-remote to understand remotes
+ Build in ls-remote
+ Use built-in send-pack.
+ Build-in send-pack, with an API for other programs to call.
+ Build-in peek-remote, using transport infrastructure.
+ Miscellaneous const changes and utilities
* jc/stash-create (Wed Nov 7 15:10:27 2007 -0600) 5 commits
+ git-stash: Fix listing stashes
+ git-merge: no reason to use cpio anymore
+ Revert "rebase: allow starting from a dirty tree."
+ rebase: allow starting from a dirty tree.
+ stash: implement "stash create"
* lt/rev-list-interactive (Mon Nov 5 13:22:34 2007 -0800) 4 commits
+ revision walker: mini clean-up
+ Enhance --early-output format
+ Add "--early-output" log flag for interactive GUI use
+ Simplify topo-sort logic
* jk/terse-push (Mon Nov 5 00:12:18 2007 -0500) 6 commits
+ send-pack: require --verbose to show update of tracking refs
+ receive-pack: don't mention successful updates
+ more terse push output
+ Build-in send-pack, with an API for other programs to call.
+ Build-in peek-remote, using transport infrastructure.
+ Miscellaneous const changes and utilities
* mh/retag (Sun Nov 4 01:11:15 2007 +0100) 2 commits
+ Add tests for git tag
+ Reuse previous annotation when overwriting a tag
* np/progress (Tue Nov 6 16:30:28 2007 -0500) 6 commits
+ make display of total transferred fully accurate
+ remove dead code from the csum-file interface
+ git-fetch: be even quieter.
+ make display of total transferred more accurate
+ sideband.c: ESC is spelled '\033' not '\e' for portability.
+ fix display overlap between remote and local progress
----------------------------------------------------------------
[Actively cooking]
* ph/parseopt-sh (Wed Nov 7 23:04:38 2007 -0800) 14 commits
+ git-sh-setup: fix parseopt `eval` string underquoting
+ Give git-am back the ability to add Signed-off-by lines.
+ git-rev-parse --parseopt
+ scripts: Add placeholders for OPTIONS_SPEC
+ Migrate git-repack.sh to use git-rev-parse --parseopt
+ Migrate git-quiltimport.sh to use git-rev-parse --parseopt
+ Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-
dashdash
+ Migrate git-instaweb.sh to use git-rev-parse --parseopt
+ Migrate git-merge.sh to use git-rev-parse --parseopt
+ Migrate git-am.sh to use git-rev-parse --parseopt
+ Migrate git-clone to use git-rev-parse --parseopt
+ Migrate git-clean.sh to use git-rev-parse --parseopt.
+ Update git-sh-setup(1) to allow transparent use of git-rev-parse -
-parseopt
+ Add a parseopt mode to git-rev-parse to bring parse-options to
shell scripts.
We are still finding breakages and applying fixes.
* rs/pretty (Wed Nov 7 00:17:14 2007 +0100) 1 commit
- pretty=format: Avoid some expensive calculations when not needed
The numbers are impressive and the code is reasonably clean, but
René seems to have further improvements to the API?
* sb/clean (Sun Nov 4 13:02:21 2007 -0600) 1 commit
- Make git-clean a builtin
I ran out of time to look at the replacement patch. Sorry.
* ss/dirty-rebase (Thu Nov 1 22:30:24 2007 +0100) 3 commits
- Make git-svn rebase --dirty pass along --dirty to git-rebase.
- Implement --dirty for git-rebase--interactive.
- Introduce --dirty option to git-rebase, allowing you to start from
a dirty state.
Really need to look at this series to merge to 'next'. Sorry.
* sp/push-refspec (Sun Oct 28 18:46:20 2007 +0100) 5 commits
- push: teach push to pass --verbose option to transport layer
- push: use same rules as git-rev-parse to resolve refspecs
- add ref_abbrev_matches_full_with_rev_parse_rules() comparing
abbrev with full ref name
- rename ref_matches_abbrev() to
ref_abbrev_matches_full_with_fetch_rules()
- push: support pushing HEAD to real branch name
Really need to look at this series to merge to 'next'. Sorry.
----------------------------------------------------------------
[Stalled]
* bs/maint-commit-options (Mon Nov 5 20:36:33 2007 +0100) 1 commit
- git-commit.sh: Fix usage checks regarding paths given when they do
not make sense
This is waiting for tests. Then merge to 'next', 'master' and
then to 'maint'.
* nd/maint-work-tree-fix (Sat Nov 3 20:18:06 2007 +0700) 1 commit
+ Add missing inside_work_tree setting in setup_git_directory_gently
This is waiting for tests. Then merge to 'next', 'master' and
then to 'maint'.
* rr/cvsexportcommit-w (Wed Oct 31 23:12:20 2007 +0100) 1 commit
+ cvsexportcommit: Add switch to specify CVS workdir
Need success stories, but pushing it out to 'master' may be the
only way to get users' attention.
* jc/spht (Fri Nov 2 17:46:55 2007 -0700) 3 commits
+ core.whitespace: add test for diff whitespace error highlighting
+ git-diff: complain about >=8 consecutive spaces in initial indent
+ War on whitespace: first, a bit of retreat.
Remaining tasks are:
1. teach "git-apply --whitespace=[warn|strip]" the same;
2. (possibly) use gitattributes instead of config.
* dz/color-addi (Mon Oct 22 16:08:01 2007 -0500) 2 commits
- Let git-add--interactive read colors from .gitconfig
- Added basic color support to git add --interactive
There was a RFH to avoid "require Term::ANSIColor" in Git.pm and
a suggestion in response to it, but I do not recall
anything happened afterwards. Stalled.
* js/reflog-delete (Wed Oct 17 02:50:45 2007 +0100) 1 commit
+ Teach "git reflog" a subcommand to delete single entries
This does not have a in-tree user yet.
* kh/commit (Fri Nov 2 11:33:09 2007 -0400) 3 commits
- Implement git commit and status as a builtin commands.
- Export launch_editor() and make it accept ':' as a no-op editor.
- Add testcase for ammending and fixing author in git commit.
This does not pass tests.
* sp/fetch-fix (Tue Nov 6 21:41:18 2007 -0500) 2 commits
- git-fetch: avoid local fetching from alternate (again)
- run-command: allow discarding the standard error output
This does not pass tests (breaks shallow clone deepening).
* jk/rename (Tue Oct 30 00:24:42 2007 -0400) 3 commits
- handle renames using similarity engine
- introduce generic similarity library
- change hash table calling conventions
This does not pass tests.
* jc/maint-format-patch-encoding (Fri Nov 2 17:55:31 2007 -0700) 2 commits
- test format-patch -s: make sure MIME content type is shown as
needed
- format-patch -s: add MIME encoding header if signer's name
requires so
This is already in 'master' but rebased for 'maint', just in
case we would want a maint release with this series.
* jc/branch-contains (Wed Nov 7 14:58:09 2007 -0800) 1 commit
- git-branch --with=commit
This was just for fun.
* 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.
My pet peeve. Completely stalled.
* jc/nu (Sun Oct 14 22:07:34 2007 -0700) 3 commits
- merge-nu: a new merge backend without using unpack_trees()
- read_tree: take an explicit index structure
- gcc 4.2.1 -Werror -Wall -ansi -pedantic -std=c99: minimum fix
Seriously stalled.
^ permalink raw reply
* What's in git.git (stable)
From: Junio C Hamano @ 2007-11-08 8:06 UTC (permalink / raw)
To: git
In-Reply-To: <7vpryqwtt7.fsf@gitster.siamese.dyndns.org>
On 'master' front:
- git-p4 in contrib/ has updates. As I cannot test it myself
and did not hear any success/failure stories from the list,
the only way to make sure is to push it out and see if
anybody screams.
- "git lost-found" is going to be deprecated (not removed) in
the next feature release.
- Unspecified clean.requireForce defaults to true; this would
make "git clean" require "-f" by default.
- "git send-email --suppress-from" does not CC yourself even
when your name is on S-o-b: or Cc: lines in the body of the
message.
----------------------------------------------------------------
* The 'maint' branch has these fixes since the last announcement.
Ask Bjørn Hansen (1):
When exec() fails include the failing command in the error message
David D Kilzer (2):
RelNotes-1.5.3.5: fix typo
RelNotes-1.5.3.5: fix another typo
Eric Wong (2):
git-svn: fix dcommit clobbering when committing a series of diffs
git-svn: t9114: verify merge commit message in test
Gerrit Pape (3):
git-diff.txt: add section "output format" describing the diff
formats
git-cvsimport: really convert underscores in branch names to dots
with -u
git-daemon: fix remote port number in log entry
Johannes Schindelin (1):
Add Documentation/CodingGuidelines
Junio C Hamano (1):
grep with unmerged index
Marco Costalba (1):
Remove a couple of duplicated include
Mike Hommey (1):
Delay pager setup in git blame
* The 'master' branch has these since the last announcement
in addition to the above.
Benoit Sigoure (1):
git-svn: sort the options in the --help message.
Brian Gernhardt (1):
t3502: Disambiguate between file and rev by adding --
Chris Pettitt (2):
git-p4: Add a helper function to parse the full git diff-tree
output.
git-p4: Detect changes to executable bit and include them in p4
submit.
Daniel Barkalow (1):
Use parseopts in builtin-push
David Symonds (1):
Improve accuracy of check for presence of deflateBound.
Gerrit Pape (4):
git-reset: add -q option to operate quietly
contrib/hooks/post-receive-email: fix typo
contrib/hooks/post-receive-email: reformat to wrap comments at 76
chars
contrib/hooks/post-receive-email: make subject prefix configurable
Heikki Orsila (1):
git-clone: honor "--" to end argument parsing
J. Bruce Fields (1):
errors: "strict subset" -> "ancestor"
Jakub Narebski (9):
gitweb: Always set 'from_file' and 'to_file' in
parse_difftree_raw_line
gitweb: Add 'status_str' to parse_difftree_raw_line output
gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb
test
gitweb: Easier adding/changing parameters to current URL
gitweb: Use href(-replay=>1, page=>...) to generate pagination
links
gitweb: Use href(-replay=>1, action=>...) to generate alternate
views
gitweb: Add tests for overriding gitweb config with repo config
gitweb: Read repo config using 'git config -z -l'
gitweb: Use config file for repository description and URLs
Johannes Schindelin (3):
git-reset: do not be confused if there is nothing to reset
Split off the pretty print stuff into its own file
Deprecate git-lost-found
Johannes Sixt (1):
Fix an infinite loop in sq_quote_buf().
Junio C Hamano (6):
revert/cherry-pick: work on merge commits as well
format-patch -s: add MIME encoding header if signer's name requires
so
cherry-pick/revert -m: add tests
test format-patch -s: make sure MIME content type is shown as
needed
clean: require -f to do damage by default
gc: --prune prunes unreferenced objects.
Mike Hommey (5):
Refactor working tree setup
Use setup_work_tree() in builtin-ls-files.c
Don't always require working tree for git-rm
Make git-blame fail when working tree is needed and we're not in
one
Small code readability improvement in show_reference() in
builtin-tag.c
Nicolas Pitre (4):
make the pack index version configurable
pack-objects: get rid of an ugly cast
git-fetch: more terse fetch output
restore fetching with thin-pack capability
Pierre Habouzit (1):
Some better parse-options documentation.
Ralf Wildenhues (1):
Fix minor nits in configure.ac
Shawn Bohrer (1):
Add more tests for git-clean
Simon Sasburg (1):
Make mailsplit and mailinfo strip whitespace from the start of the
input
Steffen Prohaska (1):
Fix comment in strbuf.h to use correct name strbuf_avail()
Steven Grimm (1):
builtin-fetch: Add "-q" as a synonym for "--quiet"
Uwe Kleine-König (1):
send-email: apply --suppress-from to S-o-b and cc-cmd
^ permalink raw reply
* Re: [PATCH] git-fetch: avoid local fetching from alternate (again)
From: Shawn O. Pearce @ 2007-11-08 8:04 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vsl3iefoj.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
>
> > Back in e3c6f240fd9c5bdeb33f2d47adc859f37935e2df Junio taught
> > git-fetch to avoid copying objects when we are fetching from
> > a repository that is already registered as an alternate object
> > database. In such a case there is no reason to copy any objects
> > as we can already obtain them through the alternate.
>
> The regression the patch fixes should be testable with a
> script. Please have a new test for it.
Hmmph. t5502-quickfetch should have covered this. It obviously
wasn't testing the right thing here. I'll figure out why and post
a patch to fix t5502.
--
Shawn.
^ permalink raw reply
* [PATCH 3/3] git-fetch: avoid local fetching from alternate (again)
From: Shawn O. Pearce @ 2007-11-08 8:00 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Back in e3c6f240fd9c5bdeb33f2d47adc859f37935e2df Junio taught
git-fetch to avoid copying objects when we are fetching from
a repository that is already registered as an alternate object
database. In such a case there is no reason to copy any objects
as we can already obtain them through the alternate.
However we need to ensure the objects are all reachable, so we
run `git rev-list --objects $theirs --not --all` to verify this.
If any object is missing or unreadable then we need to fetch/copy
the objects from the remote. When a missing object is detected
the git-rev-list process will exit with a non-zero exit status,
making this condition quite easy to detect.
Although git-fetch is currently a builtin (and so is rev-list)
we cannot invoke the traverse_objects() API at this point in the
transport code. The object walker within traverse_objects() calls
die() as soon as it finds an object it cannot read. If that happens
we want to resume the fetch process by calling do_fetch_pack().
To get aroaund this we spawn git-rev-list into a background process
to prevent a die() from killing the foreground fetch process,
thus allowing the fetch process to resume into do_fetch_pack()
if copying is necessary.
We aren't interested in the output of rev-list (a list of SHA-1
object names that are reachable) or its errors (a "spurious" error
about an object not being found as we need to copy it) so we redirect
both stdout and stderr to /dev/null.
We run this git-rev-list based check before any fetch as we may
already have the necessary objects local from a prior fetch. If we
don't then its very likely the first $theirs object listed on the
command line won't exist locally and git-rev-list will die very
quickly, allowing us to start the network transfer. This test even
on remote URLs may save bandwidth if someone runs `git pull origin`,
sees a merge conflict, resets out, then redoes the same pull just
a short time later. If the remote hasn't changed between the two
pulls and the local repository hasn't had git-gc run in it then
there is probably no need to perform network transfer as all of
the objects are local.
Documentation for the new fetch_local_nocopy function was suggested
and written by Junio, based on his original comment in git-fetch.sh.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
transport.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/transport.c b/transport.c
index f4577b7..d37864e 100644
--- a/transport.c
+++ b/transport.c
@@ -615,17 +615,76 @@ static struct ref *get_refs_via_connect(struct transport *transport)
return refs;
}
+/*
+ * We would want to bypass the object transfer altogether if
+ * everything we are going to fetch already exists and connected
+ * locally.
+ *
+ * The refs we are going to fetch are in to_fetch (nr_heads in
+ * total). If running
+ *
+ * $ git-rev-list --objects to_fetch[0] to_fetch[1] ... --not --all
+ *
+ * does not error out, that means everything reachable from the
+ * refs we are going to fetch exists and is connected to some of
+ * our existing refs.
+ */
+static int fetch_local_nocopy(struct transport *transport,
+ int nr_heads, struct ref **to_fetch)
+{
+ struct git_transport_data *data = transport->data;
+ struct child_process revlist;
+ char **argv;
+ int i, j, err;
+
+ /*
+ * If we are deepening a shallow clone we already have these
+ * objects reachable. Running rev-list here will return with
+ * a good (0) exit status and we'll bypass the fetch that we
+ * really need to perform. Claiming failure now will ensure
+ * we perform the network exchange to deepen our history.
+ */
+ if (data->depth)
+ return -1;
+
+ i = 0;
+ argv = xmalloc(sizeof(*argv) * (nr_heads + 6));
+ argv[i++] = xstrdup("rev-list");
+ argv[i++] = xstrdup("--no-output");
+ argv[i++] = xstrdup("--objects");
+ for (j = 0; j < nr_heads; j++)
+ argv[i++] = xstrdup(sha1_to_hex(to_fetch[j]->old_sha1));
+ argv[i++] = xstrdup("--not");
+ argv[i++] = xstrdup("--all");
+ argv[i++] = NULL;
+
+ memset(&revlist, 0, sizeof(revlist));
+ revlist.argv = (const char**)argv;
+ revlist.git_cmd = 1;
+ revlist.no_stdin = 1;
+ revlist.no_stdout = 1;
+ revlist.no_stderr = 1;
+ err = run_command(&revlist);
+
+ for (i = 0; argv[i]; i++)
+ free(argv[i]);
+ free(argv);
+ return err;
+}
+
static int fetch_refs_via_pack(struct transport *transport,
int nr_heads, struct ref **to_fetch)
{
struct git_transport_data *data = transport->data;
- char **heads = xmalloc(nr_heads * sizeof(*heads));
- char **origh = xmalloc(nr_heads * sizeof(*origh));
+ char **heads, **origh;
struct ref *refs;
- char *dest = xstrdup(transport->url);
+ char *dest;
struct fetch_pack_args args;
int i;
+ if (!fetch_local_nocopy(transport, nr_heads, to_fetch))
+ return 0;
+
memset(&args, 0, sizeof(args));
args.uploadpack = data->uploadpack;
args.keep_pack = data->keep;
@@ -634,6 +693,9 @@ static int fetch_refs_via_pack(struct transport *transport,
args.verbose = transport->verbose > 0;
args.depth = data->depth;
+ heads = xmalloc(nr_heads * sizeof(*heads));
+ origh = xmalloc(nr_heads * sizeof(*origh));
+ dest = xstrdup(transport->url);
for (i = 0; i < nr_heads; i++)
origh[i] = heads[i] = xstrdup(to_fetch[i]->name);
refs = fetch_pack(&args, dest, nr_heads, heads, &transport->pack_lockfile);
--
1.5.3.5.1590.gfadfad
^ permalink raw reply related
* [PATCH 2/3] rev-list: Introduce --no-output to avoid /dev/null redirects
From: Shawn O. Pearce @ 2007-11-08 8:00 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Some uses of git-rev-list are to run it with --objects to see if
a range of objects between two or more commits is fully connected
or not. In such a case the caller doesn't care about the actual
object names or hash hints so formatting this data only for it to
be dumped to /dev/null by a redirect is a waste of CPU time. If
all the caller needs is the exit status then --no-output can be
used to bypass the commit and object formatting.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
Documentation/git-rev-list.txt | 9 +++++++++
builtin-rev-list.c | 26 ++++++++++++++++++++++----
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 4852804..66ddbd3 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -20,6 +20,7 @@ SYNOPSIS
[ \--not ]
[ \--all ]
[ \--stdin ]
+ [ \--no-output ]
[ \--topo-order ]
[ \--parents ]
[ \--timestamp ]
@@ -270,6 +271,14 @@ limiting may be applied.
In addition to the '<commit>' listed on the command
line, read them from the standard input.
+--no-output::
+
+ Don't print anything to standard output. This form of
+ git-rev-list is primarly meant to allow the caller to
+ test the exit status to see if a range of objects is fully
+ connected (or not). It is faster than redirecting stdout
+ to /dev/null as the output does not have to be formatted.
+
--cherry-pick::
Omit any commit that introduces the same change as
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 2dec887..634b1f4 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -26,6 +26,7 @@ static const char rev_list_usage[] =
" --remove-empty\n"
" --all\n"
" --stdin\n"
+" --no-output\n"
" ordering output:\n"
" --topo-order\n"
" --date-order\n"
@@ -50,6 +51,7 @@ static int show_timestamp;
static int hdr_termination;
static const char *header_prefix;
+static void noshow_commit(struct commit *commit);
static void show_commit(struct commit *commit)
{
if (show_timestamp)
@@ -93,6 +95,11 @@ static void show_commit(struct commit *commit)
strbuf_release(&buf);
}
maybe_flush_or_die(stdout, "stdout");
+ noshow_commit(commit);
+}
+
+static void noshow_commit(struct commit *commit)
+{
if (commit->parents) {
free_commit_list(commit->parents);
commit->parents = NULL;
@@ -101,6 +108,12 @@ static void show_commit(struct commit *commit)
commit->buffer = NULL;
}
+static void noshow_object(struct object_array_entry *p)
+{
+ if (p->item->type == OBJ_BLOB && !has_sha1_file(p->item->sha1))
+ die("missing blob object '%s'", sha1_to_hex(p->item->sha1));
+}
+
static void show_object(struct object_array_entry *p)
{
/* An object with name "foo\n0000000..." can be used to
@@ -108,9 +121,7 @@ static void show_object(struct object_array_entry *p)
*/
const char *ep = strchr(p->name, '\n');
- if (p->item->type == OBJ_BLOB && !has_sha1_file(p->item->sha1))
- die("missing blob object '%s'", sha1_to_hex(p->item->sha1));
-
+ noshow_object(p);
if (ep) {
printf("%s %.*s\n", sha1_to_hex(p->item->sha1),
(int) (ep - p->name),
@@ -527,6 +538,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
int read_from_stdin = 0;
int bisect_show_vars = 0;
int bisect_find_all = 0;
+ int nooutput = 0;
git_config(git_default_config);
init_revisions(&revs, prefix);
@@ -565,6 +577,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
read_revisions_from_stdin(&revs);
continue;
}
+ if (!strcmp(arg, "--no-output")) {
+ nooutput = 1;
+ continue;
+ }
usage(rev_list_usage);
}
@@ -640,7 +656,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
}
}
- traverse_commit_list(&revs, show_commit, show_object);
+ traverse_commit_list(&revs,
+ nooutput ? noshow_commit : show_commit,
+ nooutput ? noshow_object : show_object);
return 0;
}
--
1.5.3.5.1590.gfadfad
^ permalink raw reply related
* [PATCH 1/3] run-command: Support sending stderr to /dev/null
From: Shawn O. Pearce @ 2007-11-08 8:00 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Some callers may wish to redirect stderr to /dev/null in some
contexts, such as if they are executing a command only to get
the exit status and don't want users to see whatever output it
may produce as a side-effect of computing that exit status.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
This series replaces my earlier single patch for git-fetch to bypass
copying objects from local alternates. It includes (I believe)
all comments made on the prior version.
run-command.c | 6 ++++--
run-command.h | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/run-command.c b/run-command.c
index d99a6c4..476d00c 100644
--- a/run-command.c
+++ b/run-command.c
@@ -41,7 +41,7 @@ int start_command(struct child_process *cmd)
cmd->close_out = 1;
}
- need_err = cmd->err < 0;
+ need_err = !cmd->no_stderr && cmd->err < 0;
if (need_err) {
if (pipe(fderr) < 0) {
if (need_in)
@@ -87,7 +87,9 @@ int start_command(struct child_process *cmd)
close(cmd->out);
}
- if (need_err) {
+ if (cmd->no_stderr)
+ dup_devnull(2);
+ else if (need_err) {
dup2(fderr[1], 2);
close_pair(fderr);
}
diff --git a/run-command.h b/run-command.h
index 94e1e9d..1fc781d 100644
--- a/run-command.h
+++ b/run-command.h
@@ -23,6 +23,7 @@ struct child_process {
unsigned close_out:1;
unsigned no_stdin:1;
unsigned no_stdout:1;
+ unsigned no_stderr:1;
unsigned git_cmd:1; /* if this is to be git sub-command */
unsigned stdout_to_stderr:1;
};
--
1.5.3.5.1590.gfadfad
^ permalink raw reply related
* git add -i fails to heed user's exclude settings
From: Miles Bader @ 2007-11-08 7:56 UTC (permalink / raw)
To: git
Inside git add -i, option 4 "add untracked", it doesn't seem to consider
the user's personal ignore patterns, which is _really_ annoying.
E.g., I have:
$ git config core.excludesfile
/home/miles/.gitignore
$ cat /home/miles/.gitignore
[+,#]*
*~
$ git status
# On branch master
nothing to commit (working directory clean)
$ git add -i
staged unstaged path
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now> 4
1: ,l
2: ,l.~1~
3: AUTHORS.~1~
4: Makefile.am.~1~
5: config.h.in~
6: configure.ac.~1~
...tons of other random backup files etc...
This makes it very hard to find files that actually need to be added!
Thanks,
-Miles
--
o The existentialist, not having a pillow, goes everywhere with the book by
Sullivan, _I am going to spit on your graves_.
^ permalink raw reply
* Problem with https and git-pull
From: Luke Diamand @ 2007-11-08 7:42 UTC (permalink / raw)
To: git
I'm finding that git-pull using https does not work in the way I would
expect.
I created a bare repository, test.git, available by https://
I then cloned it:
% git-clone https://host/git/test.git
So far, so good.
Then I made a change in a different clone and pushed it.
When I next did git-pull it just said:
% git-pull
Fetching refs/heads/master from https://host/git/test.git using https
Already up-to-date.
But it *isn't* up-to-date! If I do the same exercise with git:// or
ssh:// on the same repo then it pulls down my changes as expected.
Tried with:
git version 1.5.3.4 (debian testing)
git 1.5.3.5-dirty
curl is 7.16.4
The server access log shows the git-pull happening, and there are no
errors reported by the server.
Is there something obvious I'm missing?
Thanks
Luke
^ permalink raw reply
* Re: Problem with https and git-pull
From: Luke Diamand @ 2007-11-08 7:46 UTC (permalink / raw)
To: git
In-Reply-To: <4732BDE6.4020509@vidanti.com>
OK, I just read the FAQ.
Luke Diamand wrote:
> I'm finding that git-pull using https does not work in the way I would
> expect.
>
> I created a bare repository, test.git, available by https://
>
> I then cloned it:
>
> % git-clone https://host/git/test.git
>
> So far, so good.
>
> Then I made a change in a different clone and pushed it.
>
> When I next did git-pull it just said:
>
> % git-pull
> Fetching refs/heads/master from https://host/git/test.git using https
> Already up-to-date.
>
> But it *isn't* up-to-date! If I do the same exercise with git:// or
> ssh:// on the same repo then it pulls down my changes as expected.
>
> Tried with:
> git version 1.5.3.4 (debian testing)
> git 1.5.3.5-dirty
>
> curl is 7.16.4
>
> The server access log shows the git-pull happening, and there are no
> errors reported by the server.
>
> Is there something obvious I'm missing?
>
> Thanks
> Luke
>
>
^ permalink raw reply
* Re: [PATCH] git-branch --with=commit
From: Johannes Sixt @ 2007-11-08 7:36 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vpryl8x5t.fsf@gitster.siamese.dyndns.org>
Junio C Hamano schrieb:
> $ git checkout -b xx/maint-fix-foo
> $ git am -3 -s ,xx-maint-fix-foo.patch
Is this comma a hidden feature?
> With this patch, I could do this to find out which topic
> branches already contain the faulty commit:
>
> $ git branch --with=maint^ | grep /
> xx/maint-fix-foo
It'd be helpful if you could construct the example in this commit message
such that you don't need the "grep /" here; otherwise, the reader doesn't
know which part of the effect is hidden by the grep.
-- Hannes
^ permalink raw reply
* Re: [PATCH] git-fetch: avoid local fetching from alternate (again)
From: Shawn O. Pearce @ 2007-11-08 7:35 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vr6j1bxuf.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Well spotted. It would be a good idea to commit the big comment
> > from contrib/examples/git-fetch.sh to fetch_local_nocopy()
> > function, which would have made us realize that the patch does
> > not refrain from applying this optimization even when shallow
> > is in effect. But I think that is actually a good change.
>
> I take this back. This regresses badly.
>
> Why?
Whoops. Good catch. This is why you had a check for the shallow
history file in git-fetch.sh before you took this optimization path.
My fault for not including it in this patch.
> Because the optimization is useless when we are trying to deepen
> the shallow history. When you are trying to deepen a shallow
> history and the tips of remotes haven't moved since you fetched
> from there the last time, you have everything near the tip, and
> becuse your history is shallow, your ancestry chain is
> cauterized to make it appear that the history is complete. The
> rev-list reachability test would not fail as we expect.
What about just inserting a check to see if --depth was supplied
to git-fetch on the command line? If so then we are deepening the
history and we just bypass the rev-list "fast path" test.
I will be posting an updated patch (series now) shortly.
--
Shawn.
^ permalink raw reply
* Re: [PATCH amend] git-mailsplit: with maildirs not only process cur/, but also new/
From: Fernando J. Pereda @ 2007-11-08 7:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Alex Riesen, Gerrit Pape, git, Jakub Narebski, Jeff King
In-Reply-To: <7vfxzh7ajt.fsf@gitster.siamese.dyndns.org>
On Wed, Nov 07, 2007 at 06:09:26PM -0800, Junio C Hamano wrote:
> Gerrit Pape <pape@smarden.org> writes:
>
> > When saving patches to a maildir with e.g. mutt, the files are put into
> > the new/ subdirectory of the maildir, not cur/. This makes git-am state
> > "Nothing to do.". This patch lets git-mailsplit additional check new/
> > after reading cur/.
> >
> > This was reported by Joey Hess through
> > http://bugs.debian.org/447396
> >
> > Signed-off-by: Gerrit Pape <pape@smarden.org>
> > ---
> >
> > On Mon, Nov 05, 2007 at 01:58:50PM +0100, Jakub Narebski wrote:
> >> > + for (i = 0; i < 2; ++i) {
> >> Wouldn't it be better to use sizeof(sub)/sizeof(sub[0]) or it's macro
> >> equivalent ARRAY_SIZE(sub) instead of hardcoding 2 to avoid errors?
> > I made the array NULL-terminated.
> >
> > On Mon, Nov 05, 2007 at 04:26:24PM -0500, Jeff King wrote:
> >> Isn't the subject line now wrong?
> > Yes, thanks.
> >
> > On Mon, Nov 05, 2007 at 11:52:58PM +0100, Alex Riesen wrote:
> >> Why is missing "cur" (or "new", for that matter) a fatal error?
> >> Why is it error at all? How about just ignoring the fact?
> > As suggested by Jeff, I made it ignore the error on ENOENT.
>
> Looks good to me. Final acks please?
Fixed my concern too.
Acked-by: Fernando J. Pereda <ferdy@gentoo.org>
--
Fernando J. Pereda Garcimartín
20BB BDC3 761A 4781 E6ED ED0B 0A48 5B0C 60BD 28D4
^ permalink raw reply
* Re: [PATCH] Re: git-svn fetch doesn't like spaces in branch names
From: Alex Riesen @ 2007-11-08 7:29 UTC (permalink / raw)
To: Michael J. Cohen; +Cc: Git Mailing List
In-Reply-To: <B28A099B-1BC8-4CED-856A-5FFD7F6711FC@mac.com>
Michael J. Cohen, Thu, Nov 08, 2007 01:53:07 +0100:
>> mini:TextMateBundles mjc$ git-svn fetch
>> Found possible branch point:
>> http://macromates.com/svn/Bundles/trunk/Tools/Dialog PlugIn =>
>> http://macromates.com/svn/Bundles/branches/Dialog PlugIn Completion Menu,
>> 8089
>> Initializing parent: Dialog PlugIn Completion Menu@8089
>> Bad URL passed to RA layer: Malformed URL for repository at
>> /opt/local/bin/git-svn line 1607
>>
>> looks like that might need to be %20 ?
>
>
> Hacky, but it works.
>
> Signed-off-by: Michael J. Cohen <mjc@cruiseplanners.com>
>
> diff --git a/git-svn.perl b/git-svn.perl
> index dd93e32..5dc3b9c 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -1976,6 +1976,7 @@ sub find_parent_branch {
> my $r = $i->{copyfrom_rev};
> my $repos_root = $self->ra->{repos_root};
> my $url = $self->ra->{url};
> + $branch_from =~ s@([\s])@sprintf("%%%02X", ord($1))@seg;
You don't need "[" and "]".
^ permalink raw reply
* Re: [PATCH amend] git-mailsplit: with maildirs not only process cur/, but also new/
From: Alex Riesen @ 2007-11-08 7:24 UTC (permalink / raw)
To: Junio C Hamano
Cc: Gerrit Pape, Fernando J. Pereda, git, Jakub Narebski, Jeff King
In-Reply-To: <7vfxzh7ajt.fsf@gitster.siamese.dyndns.org>
Junio C Hamano, Thu, Nov 08, 2007 03:09:26 +0100:
> Gerrit Pape <pape@smarden.org> writes:
>
> > When saving patches to a maildir with e.g. mutt, the files are put into
> > the new/ subdirectory of the maildir, not cur/. This makes git-am state
> > "Nothing to do.". This patch lets git-mailsplit additional check new/
> > after reading cur/.
> >
> > This was reported by Joey Hess through
> > http://bugs.debian.org/447396
> >
> > Signed-off-by: Gerrit Pape <pape@smarden.org>
> > ---
> >
> > On Mon, Nov 05, 2007 at 01:58:50PM +0100, Jakub Narebski wrote:
> >> > + for (i = 0; i < 2; ++i) {
> >> Wouldn't it be better to use sizeof(sub)/sizeof(sub[0]) or it's macro
> >> equivalent ARRAY_SIZE(sub) instead of hardcoding 2 to avoid errors?
> > I made the array NULL-terminated.
> >
> > On Mon, Nov 05, 2007 at 04:26:24PM -0500, Jeff King wrote:
> >> Isn't the subject line now wrong?
> > Yes, thanks.
> >
> > On Mon, Nov 05, 2007 at 11:52:58PM +0100, Alex Riesen wrote:
> >> Why is missing "cur" (or "new", for that matter) a fatal error?
> >> Why is it error at all? How about just ignoring the fact?
> > As suggested by Jeff, I made it ignore the error on ENOENT.
Better.
> Looks good to me. Final acks please?
Acked-by: Alex Riesen <raa.lkml@gmail.com>
^ permalink raw reply
* Re: [PATCH v2] user-manual: add advanced topic "bisecting merges"
From: Johannes Sixt @ 2007-11-08 7:19 UTC (permalink / raw)
To: Steffen Prohaska; +Cc: gitster, Ralf.Wildenhues, tsuna, git
In-Reply-To: <11944722214046-git-send-email-prohaska@zib.de>
Steffen Prohaska schrieb:
> +If you linearize the history by rebasing the lower branch on
> +top of the upper, instead of merging, the bug becomes much easier to
> +find and understand. Your history would instead be:
At this point I'm missing the words
The solution is ...
I.e.:
The solution is to linearize the history by rebasing the lower branch on
top of the upper, instead of merging. Now the bug becomes much easier to
find and understand. Your history would instead be:
-- Hannes
^ permalink raw reply
* [PATCH] git-sh-setup: fix parseopt `eval`.
From: Junio C Hamano @ 2007-11-08 7:09 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git
The 'automagic parseopt' support corrupted non option parameters
that had IFS characters in them. The worst case can be seen
when it has a non option parameter like this:
$1=" * some string blech"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* I had "git pull -n . to/pic-branch" in Meta/PU which was
affected by this bug, expanding the " * " bullet before the
merge message that is passed from git-pull to git-merge.
I am a bit upset because I _knew_ that the eval was wrong
when I first saw it, but somehow I forgot about it when I
made it land on 'next'. My fault.
git-sh-setup.sh | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index e1cf885..f1c4839 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -21,11 +21,12 @@ if test -n "$OPTIONS_SPEC"; then
exec "$0" -h
}
- parseopt_extra=
- [ -n "$OPTIONS_KEEPDASHDASH" ] &&
- parseopt_extra="$parseopt_extra --keep-dashdash"
-
- eval `echo "$OPTIONS_SPEC" | git rev-parse --parseopt $parseopt_extra -- "$@" || echo exit $?`
+ [ -n "$OPTIONS_KEEPDASHDASH" ] && parseopt_extra="--keep-dashdash"
+ parsed=$(
+ echo "$OPTIONS_SPEC" |
+ git rev-parse --parseopt $parseopt_extra -- "$@"
+ ) &&
+ eval "$parsed" || exit
else
usage() {
die "Usage: $0 $USAGE"
--
1.5.3.5.1617.g65b5b
^ permalink raw reply related
* [PATCH] Do git reset --hard HEAD when using git rebase --skip
From: Mike Hommey @ 2007-11-08 7:03 UTC (permalink / raw)
To: git; +Cc: gitster
In-Reply-To: <20071107222105.GA31666@glandium.org>
When you have a merge conflict and want to bypass the commit causing it,
you don't want to care about the dirty state of the working tree.
Also, don't git reset --hard HEAD in the rebase-skip test, so that the
lack of support for this is detected.
Signed-off-by: Mike Hommey <mh@glandium.org>
---
git-rebase.sh | 1 +
t/t3403-rebase-skip.sh | 2 --
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index e3ad7de..8814be9 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -158,6 +158,7 @@ do
exit
;;
--skip)
+ git reset --hard HEAD || exit $?
if test -d "$dotest"
then
git rerere clear
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index eab053c..becabfc 100755
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -36,7 +36,6 @@ test_expect_failure 'rebase with git am -3 (default)' '
'
test_expect_success 'rebase --skip with am -3' '
- git reset --hard HEAD &&
git rebase --skip
'
test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
@@ -44,7 +43,6 @@ test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
test_expect_failure 'rebase with --merge' 'git rebase --merge master'
test_expect_success 'rebase --skip with --merge' '
- git reset --hard HEAD &&
git rebase --skip
'
--
1.5.3.5
^ permalink raw reply related
* Re: [PATCH v2] user-manual: add advanced topic "bisecting merges"
From: Steffen Prohaska @ 2007-11-08 6:40 UTC (permalink / raw)
To: Benoit Sigoure; +Cc: Junio C Hamano, Ralf.Wildenhues, Git Mailing List
In-Reply-To: <F783880C-A0F9-45D9-A23A-075600B31CEE@lrde.epita.fr>
On Nov 7, 2007, at 11:16 PM, Benoit Sigoure wrote:
> Hi Steffen,
>
> On Nov 7, 2007, at 10:50 PM, Steffen Prohaska wrote:
>
> Some more comments below. Sorry for not spotting these earlier.
I'll took all your suggestions except for ...
[...]
>> +later when you have a better understanding of git.
>> +
>> +[[bisect-merges]]
>> +Why bisecting merge commits can be harder than bisecting linear
>> history
>> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~
>> +The following text is based upon an email by Junio C. Hamano to
>> +the git mailing list
>> +(link:http://marc.info/?l=git&m=119403257315527&w=2[link:http://
>> marc.info/?l=git&m=119403257315527&w=2]).
>> +It was slightly adapted for this manual.
>> +
>> +Bisecting merges can be challenging due to the complexity of
>> +changes introduced at a merge. Bisecting through merges is not a
>
> s/at a merge/& point/ ?
I'll replace the first sentence with
Using gitlink:git-bisect[1] on a history with merges can be challenging.
The details are explained in the remainder of the paragraph.
[...]
>> +added a new calling site for that function at commit Y. The
>> +commits from Z leading to B all assume the old semantics of that
>> +function and the callers and the callee are consistent with each
>> +other. There is no bug at B, either.
>> +
>> +You merge to create C. There is no textual conflict with this
>> +three way merge, and the result merges cleanly. You bisect
>> +this, because you found D is bad and you know Z was good. Your
>> +bisect will find that C (merge) is broken. Understandably so,
>> +as at C, the new calling site of the function added by the lower
>> +branch is not converted to the new semantics, while all the
>> +other calling sites that already existed at Z would have been
>> +converted by the merge. The new calling site has semantic
>> +adjustment needed, but you do not know that yet. You need to
>
> s/adjustment/&s/
I'm not sure if plural is needed.
Steffen
--
Steffen Prohaska <prohaska@zib.de> <http://www.zib.de/prohaska/>
Zuse Institute Berlin, Takustraße 7, D-14195 Berlin-Dahlem, Germany
+49 (30) 841 85-337, fax -107
^ permalink raw reply
* Re: [PATCH DIFF-CLEANUP 1/2] Make the diff_options bitfields be an unsigned with explicit masks.
From: Junio C Hamano @ 2007-11-08 6:39 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git
In-Reply-To: <1194430832-6224-7-git-send-email-madcoder@debian.org>
Pierre Habouzit <madcoder@debian.org> writes:
> reverse_diff was a bit-value in disguise, it's merged in the flags now.
>
> Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Just my first impression, as I am in the middle of unrelated
bisect. I haven't read beyond diff-lib.c changes.
> diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
> index 0b591c8..e71841a 100644
> --- a/builtin-diff-tree.c
> +++ b/builtin-diff-tree.c
> @@ -118,12 +118,12 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
> }
>
> if (!read_stdin)
> - return opt->diffopt.exit_with_status ?
> - opt->diffopt.has_changes: 0;
> + return DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS)
> + && DIFF_OPT_TST(&opt->diffopt, HAS_CHANGES);
Had to think a bit about this, although it is correct.
> if (opt->diffopt.detect_rename)
> opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
> - DIFF_SETUP_USE_CACHE);
> + DIFF_SETUP_USE_CACHE);
I wonder what this is about.
> diff --git a/combine-diff.c b/combine-diff.c
> index fe5a2a1..3cab04b 100644
> --- a/combine-diff.c
> +++ b/combine-diff.c
> @@ -664,7 +664,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
> int mode_differs = 0;
> int i, show_hunks;
> int working_tree_file = is_null_sha1(elem->sha1);
> - int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV;
> + int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
Indent?
> diff --git a/diff-lib.c b/diff-lib.c
> index da55713..69b5dc9 100644
> --- a/diff-lib.c
> +++ b/diff-lib.c
> @@ -188,8 +188,7 @@ static int handle_diff_files_args(struct rev_info *revs,
> else if (!strcmp(argv[1], "-n") ||
> !strcmp(argv[1], "--no-index")) {
> revs->max_count = -2;
> - revs->diffopt.exit_with_status = 1;
> - revs->diffopt.no_index = 1;
> + revs->diffopt.flags |= DIFF_OPT_EXIT_WITH_STATUS | DIFF_OPT_NO_INDEX;
> }
Now this looks harder to read that everybody else uses
DIFF_OPT_SET() for this, without DIFF_OPT_ prefix for the
bitmask names.
^ permalink raw reply
* Re: [PATCH 0/5] some shell portability fixes
From: Ralf Wildenhues @ 2007-11-08 6:14 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Nguyen Thai Ngoc Duy, git
In-Reply-To: <7v3avhbxdq.fsf@gitster.siamese.dyndns.org>
* Junio C Hamano wrote on Wed, Nov 07, 2007 at 09:42:41PM CET:
> "Nguyen Thai Ngoc Duy" <pclouds@gmail.com> writes:
> >
> > Argh, should have made it clear, busybox sed is good enough.
>
> Thanks. And you can also happy grok Ralf's rewritten construct,
> right?
>
> That is, existing
>
> $ sed -e 's/foo/\n/' file
>
> will be rewritten by the patch [2/5] to
>
> $ sed -e 's/foo/\
> /' file
The original was something like
sed 's/[|]/\n/g'
Using instead
tr '|' '\n'
should work for the original construct, and AFAIK only /usr/ucb/tr on
Solaris fails to understand \n correctly. Would that be better for you?
Or even
tr '|' '\012'
which fails only on EBCDIC, which I don't think git targets.
I'll resend the patches tonight.
Cheers,
Ralf
^ permalink raw reply
* Re: stgit: cleaning up after using git branch delete commands
From: Karl Hasselström @ 2007-11-08 5:53 UTC (permalink / raw)
To: Jon Smirl; +Cc: Catalin Marinas, Git Mailing List
In-Reply-To: <9e4733910711070811y72f96a90i4db9acdf93aa765c@mail.gmail.com>
On 2007-11-07 11:11:42 -0500, Jon Smirl wrote:
> how about a 'stg gc' command that gets rid of all the inaccessible
> clutter?
"stg assimilate" already has the job of fixing up stuff after the user
has used git commands to move HEAD around. I think it would make sense
to teach it to do this too -- and then rename it "stg repair" or
something. That way, there's one command to fix every kind of "damage"
that git can do to stgit.
Alternatively, "stg branch --create" and "stg init" and whoever else
is bothered by the clutter could simply remove it themselves. That
would be even more user-friendly, I guess.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* [REPLACEMENT PATCH] git-checkout: Add a test case for relative paths use.
From: David Symonds @ 2007-11-08 5:43 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Johannes Schindelin, David Symonds
Signed-off-by: David Symonds <dsymonds@gmail.com>
---
These test cases also expose a bug in git-ls-files, where:
git-ls-files t/../
(with or without --full-name) returns no files.
t/t2008-checkout-subdir.sh | 47 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
create mode 100755 t/t2008-checkout-subdir.sh
diff --git a/t/t2008-checkout-subdir.sh b/t/t2008-checkout-subdir.sh
new file mode 100755
index 0000000..45833f3
--- /dev/null
+++ b/t/t2008-checkout-subdir.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# Copyright (c) 2007 David Symonds
+
+test_description='git checkout from subdirectories'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+
+ echo base > file0 &&
+ git add file0 &&
+ mkdir dir1 &&
+ echo hello > dir1/file1 &&
+ git add dir1/file1 &&
+ test_tick &&
+ mkdir dir2 &&
+ echo bonjour > dir2/file2 &&
+ git add dir2/file2 &&
+ git commit -m "populate tree"
+
+'
+
+test_expect_success 'remove and restore with relative path' '
+
+ cd dir1 &&
+ rm ../file0 &&
+ git checkout HEAD -- ../file0 && test -f ../file0 &&
+ rm ../dir2/file2 &&
+ git checkout HEAD -- ../dir2/file2 && test -f ../dir2/file2 &&
+ rm ../file0 ./file1 &&
+ git checkout HEAD -- .. && test -f ../file0 && test -f ./file1 &&
+ rm file1 &&
+ git checkout HEAD -- ../dir1/../dir1/file1 && test -f ./file1
+
+'
+
+test_expect_failure 'checkout with relative path outside tree should fail (1)' \
+ 'git checkout HEAD - ../file0'
+
+test_expect_failure 'checkout with relative path outside tree should fail (2)' \
+ 'cd dir1 && git checkout HEAD - ./file0'
+
+test_expect_failure 'checkout with relative path outside tree should fail (2)' \
+ 'cd dir1 && git checkout HEAD - ../../file0'
+
+test_done
--
1.5.3.1
^ permalink raw reply related
* Re: [PATCH] Make git-clean a builtin
From: Shawn Bohrer @ 2007-11-08 5:37 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, johannes.schindelin
In-Reply-To: <7vabppbxef.fsf@gitster.siamese.dyndns.org>
On Wed, Nov 07, 2007 at 12:42:16PM -0800, Junio C Hamano wrote:
>
> Having said that, I do not particularly agree with the way the
> new implementation resolves the existing inconsistencies.
>
> Wouldn't it be better to remove "dir" when the user explicitly
> told you to clean "dir", with or without the trailing slash?
> That's what the user asked you to do, isn't it?
Yes I suppose I agree. Of course I need to spend some more time staring
at the code to figure out how to do so. Perhaps I can figure out what
is causing the original inconsistency in git-ls-files while I'm at it.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox