Re: [PATCH] [BUG FIXED 2] git-add (-a|-u) and -n support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thanks for the reply!

On 14 Oct 2007, at 9:25:03 AM, Matthieu Moy wrote:

Michael Witten <mfwitten@xxxxxxx> writes:

Subject: [PATCH] git-add now understands two kinds of update:

 	-u: update as before
 	-a: update all as in a true 'git commit -a'

I don't find the option set very intuitive. I'd prefer

  - git add -u . => update the current directory as before
  - git add -u   => update all files from the root.

But your solution has the advantage of being backward compatible, so,
no strong opinion here.

Here's compromise that is backwards compatible. For both git-add
and git-commit:
	
	-a dir [dir2 ...] => all changes in the given dirs.
	-a                => all changes from the root.

Then we can just leave -u in place for now, and mark it as deprecated.

In any case, the goal is to make the intuition solid between
git-commit and git-add.


(side note: also, while you're here, it would be nice to have a single
command to do "git add .; git add -u", i.e add all unknown files,
update all existing files, and actally remove all deleted files. In
one word, synchronize the index with the working tree completely.
Perhaps "-a" would be a good name for that, not sure)

We can couple the above with -f to do this.


 builtin-add.c |   69 +++++++++++++++++++++++++++++++++++++
+-------------------

Your patch is whitespace-damaged. I don't know how to fix that for
Apple Mail, but git-send-email can help.

I see that now; Apple's trying to be smart about blank lines, it would seem.

static const char builtin_add_usage[] =
 "git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--]
<filepattern>...";

You should document -a here, and in Documentation/git-add.txt if you
introduce it.

Let's get -a/-u squared away first.

Thanks again,
Michael Witten

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux