user/sven/git.git/git-am.sh, branch v1.4.4.4

Fix git-am safety checks

2006-09-16T09:23:04Z

An earlier commit cbd64af added a check that prevents "git-am" to run without its standard input connected to a terminal while resuming operation. This was to catch a user error to try feeding a new patch from its standard input while recovery. The assumption of the check was that it is an indication that a new patch is being fed if the standard input is not connected to a terminal. It is however not quite correct (the standard input can be /dev/null if the user knows the operation does not need any input, for example). This broke t3403 when the test was run with its standard input connected to /dev/null. When git-am is given an explicit command such as --skip, there is no reason to insist that the standard input is a terminal; we are not going to read a new patch anyway. Credit goes to Gerrit Pape for noticing and reporting the problem with t3403-rebase-skip test. Signed-off-by: Junio C Hamano

git-am: give better diagnostics when the patch does not apply during --3way

2006-08-13T00:08:07Z

If the user tries to apply a patch that was hand-edited in such a way that it does not apply to the original file recorded on its "index" line anymore, we did detect the situation but did not issue an error message that is specific enough. Signed-off-by: Junio C Hamano

git-am: Don't accept an mbox on stdin of we already have a .dotest directory

2006-07-24T06:58:40Z

It makes no sense to accept an mbox via stdin when we won't accept it on the commandline. The patch helps the following scenario: # git init-db "add file1 with content" # git checkout -b apply "edit file1 && commit" # git checkout -b conflict master "edit file1 && commit" # git checkout -b ok master "add file2" # git checkout apply # git format-patch -k -3 master..conflict | git am -k -3 => git-am fails with a conflict message # git reset --hard # git format-patch -k -3 master..ok | git am -k -3 => git am fails with the same conflict message as above, => since it's trying to apply the old .dotest directory With the patch it complains about an old .dotest directory instead. Signed-off-by: Lukas Sandström Signed-off-by: Junio C Hamano

Record rebase changes as 'rebase' in the reflog.

2006-07-14T06:08:24Z

Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Fix more typos, primarily in the code

2006-07-10T07:36:44Z

The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano

Fix expr usage for FreeBSD

2006-06-27T17:56:05Z

Some implementations of "expr" (e.g. FreeBSD's) fail, if an argument starts with a dash. Signed-off-by: Dennis Stosberg Signed-off-by: Junio C Hamano

Merge branch 'sp/reflog' into next

2006-05-23T22:07:47Z

* sp/reflog: Enable ref log creation in git checkout -b. Create/delete branch ref logs. Include ref log detail in commit, reset, etc. Change order of -m option to update-ref. Correct force_write bug in refs.c Change 'master@noon' syntax to 'master@{noon}'. Log ref updates made by fetch. Force writing ref if it doesn't exist. Added logs/ directory to repository layout. General ref log reading improvements. Fix ref log parsing so it works properly. Support 'master@2 hours ago' syntax Log ref updates to logs/refs/ Convert update-ref to use ref_lock API. Improve abstraction of ref lock/write.

Include ref log detail in commit, reset, etc.

2006-05-19T22:03:21Z

When updating a ref at the direction of the user include a reason why head was changed as part of the ref log (assuming it was enabled). Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Merge branch 'jc/apply' into next

2006-05-16T00:58:02Z

* jc/apply: git-am: use apply --cached apply --cached: apply a patch without using working tree.

git-am: use apply --cached

2006-05-16T00:57:01Z

Now 'git apply' can apply patch without working tree, preparation of pristine preimage and postimage trees that are done when falling back on 3-way merge by "git am" can do so without temporary files. Signed-off-by: Junio C Hamano