Re: Unintended commit?

[Jan Engelhardt]

>
>I should make some modifications to my workflow so that I don't do
>this again when I need to make local unrelated changes in order to
>test the current tree.
>
>When I'm grinding out a patch actively in my tree I go "git diff >diff"
>and then I use a script called "mkcf" which runs diffstat on the
>diff and gives me a file list, it's ugly, but here it is:
>
>#!/bin/sh
>diffstat -p 1 $* | grep -v changed | awk ' { print $1 } '
>
>So I end up going:
>
>1) edit files
>2) git diff >diff
>3) read diff
>4) git commit $(mkcf diff)
>
>Usually step #3 catches local changes I'm not intending to commit
>and I just edit those out, and therefore they never end up being
>committed.
>
>Perhaps it would be cool if you could tell GIT "Look, I know I have
>a change to foo.c, but it's a local hack and please act like it's
>not there unless I try to do an operation where ignoring that change
>is impossible, such as a merge."

I prefer to explicitly commit all changes, i.e.:

  edit files
  `svn diff` or `svn diff | lsdiff` or both
  `svn ci -m foo a/b.c c/d.c` etc.

might be a little lot to type, but it usually helps committing the right stuff.

(Yes, it is intentional that I wrote svn instead of git.)


	-`J'
-- 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/